From: j8takagi <j8takagi@nifty.com> Date: Thu, 7 Jun 2018 12:56:34 +0000 (+0900) Subject: 基本情報処理試験のフォルダを変更し、2018年春の分を追加 X-Git-Tag: v0.3p4~1 X-Git-Url: https://www.j8takagi.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bce17a4fab0759bd0818c44bdf3cd17edb388267;p=YACASL2.git 基本情報処理試験のフォルダを変更し、2018年春の分を追加 --- diff --git a/as/fe_tests/2008_04/Q09/token.casl b/as/exam_fe/2008_04/Q09/token.casl similarity index 100% rename from as/fe_tests/2008_04/Q09/token.casl rename to as/exam_fe/2008_04/Q09/token.casl diff --git a/as/fe_tests/2008_04/Q09/token_call.casl b/as/exam_fe/2008_04/Q09/token_call.casl similarity index 100% rename from as/fe_tests/2008_04/Q09/token_call.casl rename to as/exam_fe/2008_04/Q09/token_call.casl diff --git a/as/fe_tests/2008_10/Q09/ptn1.casl b/as/exam_fe/2008_10/Q09/ptn1.casl similarity index 100% rename from as/fe_tests/2008_10/Q09/ptn1.casl rename to as/exam_fe/2008_10/Q09/ptn1.casl diff --git a/as/fe_tests/2008_10/Q09/ptn2.casl b/as/exam_fe/2008_10/Q09/ptn2.casl similarity index 100% rename from as/fe_tests/2008_10/Q09/ptn2.casl rename to as/exam_fe/2008_10/Q09/ptn2.casl diff --git a/as/fe_tests/2008_10/Q09/ptn3.casl b/as/exam_fe/2008_10/Q09/ptn3.casl similarity index 100% rename from as/fe_tests/2008_10/Q09/ptn3.casl rename to as/exam_fe/2008_10/Q09/ptn3.casl diff --git a/as/fe_tests/2008_10/Q09/ptn4.casl b/as/exam_fe/2008_10/Q09/ptn4.casl similarity index 100% rename from as/fe_tests/2008_10/Q09/ptn4.casl rename to as/exam_fe/2008_10/Q09/ptn4.casl diff --git a/as/fe_tests/2008_10/Q09/test_ptn1/0.txt b/as/exam_fe/2008_10/Q09/test_ptn1/0.txt similarity index 100% rename from as/fe_tests/2008_10/Q09/test_ptn1/0.txt rename to as/exam_fe/2008_10/Q09/test_ptn1/0.txt diff --git a/as/fe_tests/2008_10/Q09/test_ptn1/Makefile b/as/exam_fe/2008_10/Q09/test_ptn1/Makefile similarity index 100% rename from as/fe_tests/2008_10/Q09/test_ptn1/Makefile rename to as/exam_fe/2008_10/Q09/test_ptn1/Makefile diff --git a/as/fe_tests/2008_10/Q09/test_ptn1/test_ptn1.casl b/as/exam_fe/2008_10/Q09/test_ptn1/test_ptn1.casl similarity index 100% rename from as/fe_tests/2008_10/Q09/test_ptn1/test_ptn1.casl rename to as/exam_fe/2008_10/Q09/test_ptn1/test_ptn1.casl diff --git a/as/fe_tests/2008_10/Q09/test_ptn2/0.txt b/as/exam_fe/2008_10/Q09/test_ptn2/0.txt similarity index 100% rename from as/fe_tests/2008_10/Q09/test_ptn2/0.txt rename to as/exam_fe/2008_10/Q09/test_ptn2/0.txt diff --git a/as/fe_tests/2008_10/Q09/test_ptn2/Makefile b/as/exam_fe/2008_10/Q09/test_ptn2/Makefile similarity index 100% rename from as/fe_tests/2008_10/Q09/test_ptn2/Makefile rename to as/exam_fe/2008_10/Q09/test_ptn2/Makefile diff --git a/as/fe_tests/2008_10/Q09/test_ptn2/test_ptn2.casl b/as/exam_fe/2008_10/Q09/test_ptn2/test_ptn2.casl similarity index 100% rename from as/fe_tests/2008_10/Q09/test_ptn2/test_ptn2.casl rename to as/exam_fe/2008_10/Q09/test_ptn2/test_ptn2.casl diff --git a/as/fe_tests/2008_10/Q09/test_ptn3/0.txt b/as/exam_fe/2008_10/Q09/test_ptn3/0.txt similarity index 100% rename from as/fe_tests/2008_10/Q09/test_ptn3/0.txt rename to as/exam_fe/2008_10/Q09/test_ptn3/0.txt diff --git a/as/fe_tests/2008_10/Q09/test_ptn3/Makefile b/as/exam_fe/2008_10/Q09/test_ptn3/Makefile similarity index 100% rename from as/fe_tests/2008_10/Q09/test_ptn3/Makefile rename to as/exam_fe/2008_10/Q09/test_ptn3/Makefile diff --git a/as/fe_tests/2008_10/Q09/test_ptn3/test_ptn3.casl b/as/exam_fe/2008_10/Q09/test_ptn3/test_ptn3.casl similarity index 100% rename from as/fe_tests/2008_10/Q09/test_ptn3/test_ptn3.casl rename to as/exam_fe/2008_10/Q09/test_ptn3/test_ptn3.casl diff --git a/as/fe_tests/2008_10/Q09/test_ptn4/0.txt b/as/exam_fe/2008_10/Q09/test_ptn4/0.txt similarity index 100% rename from as/fe_tests/2008_10/Q09/test_ptn4/0.txt rename to as/exam_fe/2008_10/Q09/test_ptn4/0.txt diff --git a/as/fe_tests/2008_10/Q09/test_ptn4/Makefile b/as/exam_fe/2008_10/Q09/test_ptn4/Makefile similarity index 100% rename from as/fe_tests/2008_10/Q09/test_ptn4/Makefile rename to as/exam_fe/2008_10/Q09/test_ptn4/Makefile diff --git a/as/fe_tests/2008_10/Q09/test_ptn4/test_ptn4.casl b/as/exam_fe/2008_10/Q09/test_ptn4/test_ptn4.casl similarity index 100% rename from as/fe_tests/2008_10/Q09/test_ptn4/test_ptn4.casl rename to as/exam_fe/2008_10/Q09/test_ptn4/test_ptn4.casl diff --git a/as/fe_tests/2008_10/Q13/summary.casl b/as/exam_fe/2008_10/Q13/summary.casl similarity index 100% rename from as/fe_tests/2008_10/Q13/summary.casl rename to as/exam_fe/2008_10/Q13/summary.casl diff --git a/as/fe_tests/2008_10/Q13/testsummary/0.txt b/as/exam_fe/2008_10/Q13/testsummary/0.txt similarity index 100% rename from as/fe_tests/2008_10/Q13/testsummary/0.txt rename to as/exam_fe/2008_10/Q13/testsummary/0.txt diff --git a/as/fe_tests/2008_10/Q13/testsummary/Makefile b/as/exam_fe/2008_10/Q13/testsummary/Makefile similarity index 100% rename from as/fe_tests/2008_10/Q13/testsummary/Makefile rename to as/exam_fe/2008_10/Q13/testsummary/Makefile diff --git a/as/fe_tests/2008_10/Q13/testsummary/testsummary.casl b/as/exam_fe/2008_10/Q13/testsummary/testsummary.casl similarity index 100% rename from as/fe_tests/2008_10/Q13/testsummary/testsummary.casl rename to as/exam_fe/2008_10/Q13/testsummary/testsummary.casl diff --git a/as/fe_tests/2009_04/Q12/muls.casl b/as/exam_fe/2009_04/Q12/muls.casl similarity index 100% rename from as/fe_tests/2009_04/Q12/muls.casl rename to as/exam_fe/2009_04/Q12/muls.casl diff --git a/as/fe_tests/2009_04/Q12/muls2.casl b/as/exam_fe/2009_04/Q12/muls2.casl similarity index 100% rename from as/fe_tests/2009_04/Q12/muls2.casl rename to as/exam_fe/2009_04/Q12/muls2.casl diff --git a/as/fe_tests/2009_04/Q12/muls2_call.casl b/as/exam_fe/2009_04/Q12/muls2_call.casl similarity index 100% rename from as/fe_tests/2009_04/Q12/muls2_call.casl rename to as/exam_fe/2009_04/Q12/muls2_call.casl diff --git a/as/fe_tests/2009_04/Q12/muls_call.casl b/as/exam_fe/2009_04/Q12/muls_call.casl similarity index 100% rename from as/fe_tests/2009_04/Q12/muls_call.casl rename to as/exam_fe/2009_04/Q12/muls_call.casl diff --git a/as/fe_tests/2009_10/Q12/outb.casl b/as/exam_fe/2009_10/Q12/outb.casl similarity index 100% rename from as/fe_tests/2009_10/Q12/outb.casl rename to as/exam_fe/2009_10/Q12/outb.casl diff --git a/as/fe_tests/2009_10/Q12/replace.casl b/as/exam_fe/2009_10/Q12/replace.casl similarity index 100% rename from as/fe_tests/2009_10/Q12/replace.casl rename to as/exam_fe/2009_10/Q12/replace.casl diff --git a/as/fe_tests/2009_10/Q12/replace_call.casl b/as/exam_fe/2009_10/Q12/replace_call.casl similarity index 100% rename from as/fe_tests/2009_10/Q12/replace_call.casl rename to as/exam_fe/2009_10/Q12/replace_call.casl diff --git a/as/fe_tests/2010_04/Q12/fadd.casl b/as/exam_fe/2010_04/Q12/fadd.casl similarity index 100% rename from as/fe_tests/2010_04/Q12/fadd.casl rename to as/exam_fe/2010_04/Q12/fadd.casl diff --git a/as/fe_tests/2010_10/Q12/lrevrs.casl b/as/exam_fe/2010_10/Q12/lrevrs.casl similarity index 100% rename from as/fe_tests/2010_10/Q12/lrevrs.casl rename to as/exam_fe/2010_10/Q12/lrevrs.casl diff --git a/as/fe_tests/2010_10/Q12/prevrs.casl b/as/exam_fe/2010_10/Q12/prevrs.casl similarity index 100% rename from as/fe_tests/2010_10/Q12/prevrs.casl rename to as/exam_fe/2010_10/Q12/prevrs.casl diff --git a/as/fe_tests/2010_10/Q12/revl.casl b/as/exam_fe/2010_10/Q12/revl.casl similarity index 100% rename from as/fe_tests/2010_10/Q12/revl.casl rename to as/exam_fe/2010_10/Q12/revl.casl diff --git a/as/fe_tests/2011_06/Q12/.gitignore b/as/exam_fe/2011_06/Q12/.gitignore similarity index 100% rename from as/fe_tests/2011_06/Q12/.gitignore rename to as/exam_fe/2011_06/Q12/.gitignore diff --git a/as/fe_tests/2011_06/Q12/Q12.txt b/as/exam_fe/2011_06/Q12/Q12.txt similarity index 100% rename from as/fe_tests/2011_06/Q12/Q12.txt rename to as/exam_fe/2011_06/Q12/Q12.txt diff --git a/as/fe_tests/2011_06/Q12/call_rotate.casl b/as/exam_fe/2011_06/Q12/call_rotate.casl similarity index 100% rename from as/fe_tests/2011_06/Q12/call_rotate.casl rename to as/exam_fe/2011_06/Q12/call_rotate.casl diff --git a/as/fe_tests/2011_06/Q12/call_rotate2.casl b/as/exam_fe/2011_06/Q12/call_rotate2.casl similarity index 100% rename from as/fe_tests/2011_06/Q12/call_rotate2.casl rename to as/exam_fe/2011_06/Q12/call_rotate2.casl diff --git a/as/fe_tests/2011_06/Q12/graph_five.casl b/as/exam_fe/2011_06/Q12/graph_five.casl similarity index 100% rename from as/fe_tests/2011_06/Q12/graph_five.casl rename to as/exam_fe/2011_06/Q12/graph_five.casl diff --git a/as/fe_tests/2011_06/Q12/out_pbm.casl b/as/exam_fe/2011_06/Q12/out_pbm.casl similarity index 100% rename from as/fe_tests/2011_06/Q12/out_pbm.casl rename to as/exam_fe/2011_06/Q12/out_pbm.casl diff --git a/as/fe_tests/2011_06/Q12/pbm16.casl b/as/exam_fe/2011_06/Q12/pbm16.casl similarity index 100% rename from as/fe_tests/2011_06/Q12/pbm16.casl rename to as/exam_fe/2011_06/Q12/pbm16.casl diff --git a/as/fe_tests/2011_06/Q12/rotate.casl b/as/exam_fe/2011_06/Q12/rotate.casl similarity index 100% rename from as/fe_tests/2011_06/Q12/rotate.casl rename to as/exam_fe/2011_06/Q12/rotate.casl diff --git a/as/fe_tests/2011_06/Q12/rotate2.casl b/as/exam_fe/2011_06/Q12/rotate2.casl similarity index 100% rename from as/fe_tests/2011_06/Q12/rotate2.casl rename to as/exam_fe/2011_06/Q12/rotate2.casl diff --git a/as/fe_tests/2011_10/Q12/Q12.txt b/as/exam_fe/2011_10/Q12/Q12.txt similarity index 100% rename from as/fe_tests/2011_10/Q12/Q12.txt rename to as/exam_fe/2011_10/Q12/Q12.txt diff --git a/as/fe_tests/2011_10/Q12/btod1.casl b/as/exam_fe/2011_10/Q12/btod1.casl similarity index 100% rename from as/fe_tests/2011_10/Q12/btod1.casl rename to as/exam_fe/2011_10/Q12/btod1.casl diff --git a/as/fe_tests/2011_10/Q12/btod2.casl b/as/exam_fe/2011_10/Q12/btod2.casl similarity index 100% rename from as/fe_tests/2011_10/Q12/btod2.casl rename to as/exam_fe/2011_10/Q12/btod2.casl diff --git a/as/fe_tests/2011_10/Q12/call_btod.casl b/as/exam_fe/2011_10/Q12/call_btod.casl similarity index 100% rename from as/fe_tests/2011_10/Q12/call_btod.casl rename to as/exam_fe/2011_10/Q12/call_btod.casl diff --git a/as/fe_tests/2011_10/Q12/call_div.casl b/as/exam_fe/2011_10/Q12/call_div.casl similarity index 100% rename from as/fe_tests/2011_10/Q12/call_div.casl rename to as/exam_fe/2011_10/Q12/call_div.casl diff --git a/as/fe_tests/2011_10/Q12/div.casl b/as/exam_fe/2011_10/Q12/div.casl similarity index 100% rename from as/fe_tests/2011_10/Q12/div.casl rename to as/exam_fe/2011_10/Q12/div.casl diff --git a/as/exam_fe/2018_04/call_mult.casl b/as/exam_fe/2018_04/call_mult.casl new file mode 100644 index 0000000..0d6c96b --- /dev/null +++ b/as/exam_fe/2018_04/call_mult.casl @@ -0,0 +1,12 @@ +MAIN START + LAD GR1,WD + CALL MULT + LD GR1,GR0 + LAD GR2,STR + CALL L2STR + ST GR0,LEN + OUT STR,LEN + RET +WD DC '12 45.' +STR DS 5 +LEN DS 1 diff --git a/as/exam_fe/2018_04/dtob.casl b/as/exam_fe/2018_04/dtob.casl new file mode 100644 index 0000000..91d4ca3 --- /dev/null +++ b/as/exam_fe/2018_04/dtob.casl @@ -0,0 +1,18 @@ +DTOB START + RPUSH + ADDL GR2,GR1 + LAD GR0,0 ; æ»ãå¤ã®åæå +LP CPL GR1,GR2 ; 夿çµäºï¼ + JZE FIN + LD GR4,0,GR1 ; æ°å1æåã®ååºã + SUBL GR4,='0' ; 1 æ¡ãæ°å¤ã«å¤æ + SLL GR0,1 ; GR0ã10åãã¦GR4ãå ç® + LD GR5,GR0 + SLL GR5,2 + ADDL GR0,GR5 + ADDL GR0,GR4 + LAD GR1,1,GR1 + JUMP LP +FIN RPOP + RET + END diff --git a/as/exam_fe/2018_04/getwd.casl b/as/exam_fe/2018_04/getwd.casl new file mode 100644 index 0000000..47e69cd --- /dev/null +++ b/as/exam_fe/2018_04/getwd.casl @@ -0,0 +1,34 @@ +GETWD START + RPUSH + LD GR6,GR1 + LD GR7,GR2 + LD GR3,=-1 ; æ°ååã®å¦çç¶æ ãã©ã°ã®åæå + LAD GR6,-1,GR6 +LP LAD GR6,1,GR6 + LD GR4,0,GR6 ; 1æåã®ååºã + CPL GR4,='.' + JZE FIN + CPL GR4,=' ' + JNZ NUM + CALL SETWD + JUMP LP +NUM LD GR3,GR3 ; æ°ååã®å¦çä¸ï¼ + JZE LP + LD GR3,=0 ; æ¬¡ã®æ°ååã®å¦çéå§ + LD GR1,GR6 ; æ°ååã®å é ã¢ãã¬ã¹ãéé¿ + JUMP LP +FIN CALL SETWD + LD GR2,=-1 + ST GR2,0,GR7 ; æ°å¤ã®çµããã示ãå°ãæ ¼ç´ + RPOP + RET +SETWD LD GR3,GR3 + JNZ FIN2 + LD GR2,GR6 + SUBL GR2,GR1 + CALL DTOB ; æ°ååãæ°å¤ã«å¤æ + ST GR0,0,GR7 + LD GR3,=-1 ; æ°ååã®å¦çä¸ç¶æ ãè§£é¤ + LAD GR7,1,GR7 +FIN2 RET + END diff --git a/as/exam_fe/2018_04/l2str.casl b/as/exam_fe/2018_04/l2str.casl new file mode 120000 index 0000000..c64e894 --- /dev/null +++ b/as/exam_fe/2018_04/l2str.casl @@ -0,0 +1 @@ +../../casl2lib/l2str.casl \ No newline at end of file diff --git a/as/exam_fe/2018_04/mult.casl b/as/exam_fe/2018_04/mult.casl new file mode 100644 index 0000000..255cd5a --- /dev/null +++ b/as/exam_fe/2018_04/mult.casl @@ -0,0 +1,20 @@ +MULT START + RPUSH + LAD GR2,CTBL + CALL GETWD + LD GR4,0,GR2 ; GR4 â è¢«ä¹æ° + LD GR5,1,GR2 ; GR5 â 乿° + LD GR0,=0 + LD GR5,GR5 +LP JZE FIN + LD GR3,GR5 + AND GR3,=#0001 ; 乿°ã®æä¸ä½ãããã®ãã§ã㯠+ JZE NEXT + ADDL GR0,GR4 +NEXT SLL GR4,1 ; è¢«ä¹æ°ã1ãããå·¦è«çã·ãã + SRL GR5,1 + JUMP LP +FIN RPOP + RET +CTBL DS 3 ; GETWDç¨ç®¡çãã¼ãã« + END diff --git a/as/fe_tests/2011_10/Q12/call_div.o.casl b/as/fe_tests/2011_10/Q12/call_div.o.casl deleted file mode 100644 index 400f320..0000000 --- a/as/fe_tests/2011_10/Q12/call_div.o.casl +++ /dev/null @@ -1,37 +0,0 @@ -MAIN START - LAD GR1,#0000 ; #0000: #1210 #0000 - LAD GR2,#000F ; #0002: #1220 #000F - LAD GR3,#0009 ; #0004: #1230 #0009 - CALL #000B ; #0006: #8000 #000B - RET ; #0008: #8100 - NOP ; #0009: #0000 - DC 3 ; #000A: #0003 :: 3 = #0003 = 0000000000000011 - PUSH #0000,GR6 ; #000B: #7006 #0000 - PUSH #0000,GR7 ; #000D: #7007 #0000 - LD GR6,GR1 ; #000F: #1461 - LD GR7,GR2 ; #0010: #1472 - LD GR1,#0032 ; #0011: #1010 #0032 - LD GR2,#0033 ; #0013: #1020 #0033 - LD GR4,GR6 ; #0015: #1446 - LD GR5,GR7 ; #0016: #1457 - ADDL GR2,#0034 ; #0017: #2220 #0034 - JOV #001D ; #0019: #6600 #001D - JUMP #001F ; #001B: #6400 #001F - ADDL GR1,#0035 ; #001D: #2210 #0035 - SUBL GR6,#0000,GR3 ; #001F: #2363 #0000 - JOV #002F ; #0021: #6600 #002F - SUBL GR7,#0001,GR3 ; #0023: #2373 #0001 - JOV #0029 ; #0025: #6600 #0029 - JUMP #0015 ; #0027: #6400 #0015 - SUBL GR6,#0036 ; #0029: #2360 #0036 - JOV #002F ; #002B: #6600 #002F - JUMP #0015 ; #002D: #6400 #0015 - POP GR7 ; #002F: #7170 - POP GR6 ; #0030: #7160 - RET ; #0031: #8100 - DC 65535 ; #0032: #FFFF :: 65535 = #FFFF = 1111111111111111 - DC 65535 ; #0033: #FFFF :: 65535 = #FFFF = 1111111111111111 - DC 1 ; #0034: #0001 :: 1 = #0001 = 0000000000000001 - DC 1 ; #0035: #0001 :: 1 = #0001 = 0000000000000001 - DC 1 ; #0036: #0001 :: 1 = #0001 = 0000000000000001 - END diff --git a/doc/casl2_spec/casl2_spec.texi b/doc/casl2_spec/casl2_spec.texi index a28ed7a..2bde49e 100644 --- a/doc/casl2_spec/casl2_spec.texi +++ b/doc/casl2_spec/casl2_spec.texi @@ -413,15 +413,15 @@ COUNT1 START ; ; å¦ç ; GR1 ä¸ã®'1'ã®ãããã®åæ°ãæ±ãã ; åºå ; GR0:GR1 ä¸ã®'1'ã®ãããã®åæ° PUSH 0,GR1 ; - PUSH 0,GR2 ; Count = 0 - SUBA GR2,GR2 ; å ¨é¨ã®ãããã'0'? - AND GR1,GR1 ; å ¨é¨ã®ãããã'0'ãªãçµäº - JZE RETURN ; Count = Count + 1 -MORE LAD GR2,1,GR2 ; æä¸ä½ã®'1'ã®ããã 1 åã - LAD GR0,-1,GR1 ; '0'ã«å¤ãã - AND GR1,GR0 ; '1'ã®ããããæ®ã£ã¦ããã°ç¹°è¿ã - JNZ MORE ; GR0 = Count -RETURN LD GR0,GR2 ; + PUSH 0,GR2 ; + SUBA GR2,GR2 ; Count = 0 + AND GR1,GR1 ; å ¨é¨ã®ãããã'0'? + JZE RETURN ; å ¨é¨ã®ãããã'0'ãªãçµäº +MORE LAD GR2,1,GR2 ; Count = Count + 1 + LAD GR0,-1,GR1 ; æä¸ä½ã®'1'ã®ããã 1 åã + AND GR1,GR0 ; '0'ã«å¤ãã + JNZ MORE ; '1'ã®ããããæ®ã£ã¦ããã°ç¹°è¿ã +RETURN LD GR0,GR2 ; GR0 = Count POP GR2 ; POP GR1 ; RET ; å¼åºãããã°ã©ã ã¸æ»ã diff --git a/doc/casl2_spec/images.mk b/doc/casl2_spec/images.mk deleted file mode 100644 index 96e21e4..0000000 --- a/doc/casl2_spec/images.mk +++ /dev/null @@ -1,8 +0,0 @@ -INKSCAPE := inkscape -z -CONVERT := convert - -%.png: %.svg - $(INKSCAPE) -y 0.0 -e $@ $< >$<2png.log 2>&1 - -%.eps: %.svg - $(INKSCAPE) -E $@ $< >$<2eps.log 2>&1 diff --git a/doc/casl2_spec/images.mk b/doc/casl2_spec/images.mk new file mode 120000 index 0000000..206aad6 --- /dev/null +++ b/doc/casl2_spec/images.mk @@ -0,0 +1 @@ +../images.mk \ No newline at end of file diff --git a/doc/exam_fe/.gitignore b/doc/exam_fe/.gitignore new file mode 100644 index 0000000..8ba3bd6 --- /dev/null +++ b/doc/exam_fe/.gitignore @@ -0,0 +1,3 @@ +*.html +*.pdf +*.eps diff --git a/doc/exam_fe/2018_04/Makefile b/doc/exam_fe/2018_04/Makefile new file mode 100644 index 0000000..3f46ec9 --- /dev/null +++ b/doc/exam_fe/2018_04/Makefile @@ -0,0 +1,21 @@ +VPATH := img + +CSS := ../style.css + +TEXITARGETS := fe_2018_04.html fe_2018_04.pdf + +.PHONY: all clean distclean + +all: $(TEXITARGETS) + +clean: texinfo-clean + $(RM) *.bak + $(MAKE) -C img clean + +distclean: clean texinfo-distclean + $(RM) *.d *.html *.pdf + $(MAKE) -C img distclean + +include ../texinfo_exam.mk + +include ../../images.mk diff --git a/doc/exam_fe/2018_04/fe_2018_04.texi b/doc/exam_fe/2018_04/fe_2018_04.texi new file mode 100644 index 0000000..e9f6a12 --- /dev/null +++ b/doc/exam_fe/2018_04/fe_2018_04.texi @@ -0,0 +1,289 @@ +\input texinfo @c -*-texinfo-*- +@c %**start of header +@ifnottex +@documentlanguage ja_JP +@end ifnottex +@setfilename exam_fe_2018h.info +@documentencoding UTF-8 +@settitle åºæ¬æè¡æ å ±è è©¦é¨ 2018å¹´ æ¥æ åå¾åé¡ +@firstparagraphindent insert +@paragraphindent 0 +@ifhtml +@exampleindent 0 +@end ifhtml +@c %**end of header + +@indicateurl{https://www.jitec.ipa.go.jp/1_04hanni_sukiru/mondai_kaitou_2018h30_1/2018h30h_fe_pm_qs.pdf} P.62ãP.66ãã + +@unnumbered å12 +次ã®ã¢ã»ã³ãã©ããã°ã©ã ã®èª¬æåã³ããã°ã©ã ãèªãã§ï¼è¨å1ï½3ã«çããã + +@unnumberedsec ãããã°ã©ã 1ã®èª¬æã +0ï½65534ã®æ´æ°ãè¡¨ãæ°åããæãæååï¼ä»¥ä¸ï¼æ°ååã¨ããï¼ãæ°å¤ã«å¤æããå¯ããã°ã©ã DTOBã§ããã + +(1) æååã¯ï¼DCå½ä»¤ã®æå宿°ã¨åãå½¢å¼ã§ä¸»è¨æ¶ã«æ ¼ç´ããããæ°åå567ã æ ¼ç´ããä¾ãï¼å³1ã«ç¤ºãã + +@center @image{img/fig1,15cm,,,.svg} + +@center å³1 æ°ååã®æ ¼ç´ä¾ + +(2) 主ããã°ã©ã ã¯ï¼æ°ååãæ ¼ç´ããã¦ããé åã®å é ã¢ãã¬ã¹ãGR1ã«ï¼æ°ååã®é·ããGR2ã«è¨å®ãã¦ï¼DTOBãå¼ã¶ãDTOBã¯ï¼æ°å¤ã«å¤æãã¦å¾ãå¤ãGR0ã«æ ¼ç´ãã¦å¼åºãå ã«æ»ãã + +(3) å¯ããã°ã©ã DTOBããæ»ãã¨ãï¼æ±ç¨ã¬ã¸ã¹ã¿GR1ï½GR7ã®å 容ã¯å ã«æ»ãã + + +@unnumberedsubsecãããã°ã©ã 1ã + +@verbatim +DTOB START + RPUSH + ADDL GR2,GR1 + LAD GR0,0 ; æ»ãå¤ã®åæå +LP CPL GR1,GR2 ; 夿çµäºï¼ + JZE FIN + LD GR4,0,GR1 ; æ°å1æåã®ååºã + SUBL GR4,='0' ; 1 æ¡ãæ°å¤ã«å¤æ + SLL GR0,1 ; GR0ã10åãã¦GR4ãå ç® + LD GR5,GR0 + ::ansbox:8:a:: + ADDL GR0,GR5 + ADDL GR0,GR4 + LAD GR1,1,GR1 + JUMP LP +FIN RPOP + RET + END +@end verbatim + +@unnumberedsec è¨å1 + +ããã°ã©ã 1ä¸ã®::ansbox:4::ã«å ¥ããæ£ããçããï¼è§£ç群ã®ä¸ããé¸ã¹ã + +aã«é¢ããè§£ç群 +@itemize @w{} + +@item +㢠@code{ADDL GR5,GR4} + +@item +㤠@code{SLL GR4,1} + +@item +㦠@code{SLL GR4,2} + +@item +㨠@code{SLL GR5,1} + +@item +㪠@code{SLL GR5,2} +@end itemize + +@unnumberedsec è¨å2 + +æååã®å é ããæ°ååãæ¢ç´¢ãï¼é ã«ï¼å¯¾å¿ããæ°å¤ã管çãã¼ãã«ã«æ ¼ç´ããå¯ããã°ã©ã GETWDãï¼DTOBã使ç¨ãã¦ä½æãããããã°ã©ã 2ä¸ã®::ansbox:4::ã«å ¥ããæ£ããçããï¼è§£ç群ã®ä¸ããé¸ã¹ã + + +@unnumberedsubsec ãããã°ã©ã 2ã®èª¬æã + +(1) æååã¯ï¼ä¸ã¤ä»¥ä¸ã®ç©ºç½æåã§åºåãããä»»æã®åæ°ã®æ°ååãå«ã¿ï¼æå¾ã¯ããªãªãã§çµãããæå¾ã®æ°ååã¨ããªãªãã®éï¼åã¯æååã®å é ã«ä¸ã¤ä»¥ä¸ã®ç©ºç½æåããã£ã¦ããããæååã®ä¾ãï¼å³2ã«ç¤ºãã + + +@center @image{img/fig2,15cm,,,.svg} + +@center å³2 æååã®ä¾ + +(2) 管çãã¼ãã«ã«ã¯ï¼æååä¸ã«æ°ååãç¾ãããã¨ã«ï¼é ã«1 èªããæãè¦ç´ ã追å ãï¼æ°ååãæ°å¤ã«å¤æãã¦å¾ãå¤ãæ ¼ç´ãããæ°ååã®æ¢ç´¢ãçµäºããã¨ãï¼ç®¡çãã¼ãã«ã®æå¾ã«1 èªããæãè¦ç´ ã追å ãï¼æ°å¤ã®çµããã示ãå°ã¨ãã¦ï¼1ãæ ¼ç´ãããå³2ã®æååãGETWDã§å¦çãã¦å¾ã管çãã¼ãã«ãï¼å³3ã«ç¤ºãã + +@center @image{img/fig3,15cm,,,.svg} + +@center å³3 GETWDã§å¦çãã¦å¾ã管çãã¼ãã« + +(3) 主ããã°ã©ã ã¯ï¼æååãæ ¼ç´ããã¦ããé åã®å é ã¢ãã¬ã¹ãGR1ã«ï¼ç®¡çãã¼ãã«ã®å é ã¢ãã¬ã¹ãGR2ã«è¨å®ãã¦ï¼GETWDãå¼ã¶ã + +(4) å¯ããã°ã©ã GETWDããæ»ãã¨ãï¼æ±ç¨ã¬ã¸ã¹ã¿GR1ï½GR7ã®å 容ã¯å ã«æ»ãã + +@unnumberedsubsec ãããã°ã©ã 2ã + +@verbatim +GETWD START + RPUSH + LD GR6,GR1 + LD GR7,GR2 + LD GR3,=-1 ; æ°ååã®å¦çç¶æ ãã©ã°ã®åæå + LAD GR6,-1,GR6 +LP LAD GR6,1,GR6 + LD GR4,0,GR6 ; 1æåã®ååºã + CPL GR4,='.' + JZE FIN + CPL GR4,=' ' + ::ansbox:8:b:: + CALL SETWD + JUMP LP +NUM LD GR3,GR3 ; æ°ååã®å¦çä¸ï¼ + JZE LP + LD GR3,=0 ; æ¬¡ã®æ°ååã®å¦çéå§ + LD GR1,GR6 ; æ°ååã®å é ã¢ãã¬ã¹ãéé¿ + JUMP LP +FIN CALL SETWD + LD GR2,=-1 + ST GR2,0,GR7 ; æ°å¤ã®çµããã示ãå°ãæ ¼ç´ + RPOP + RET +SETWD LD GR3,GR3 + ::ansbox:8:c:: + LD GR2,GR6 + SUBL GR2,GR1 + CALL DTOB ; æ°ååãæ°å¤ã«å¤æ + ST GR0,0,GR7 + LD GR3,=-1 ; æ°ååã®å¦çä¸ç¶æ ãè§£é¤ + ::ansbox:8:d:: +FIN2 RET + END +@end verbatim + + +bã«é¢ããè§£ç群 +@itemize @w{} + +@item +㢠@code{JNZ FIN} + +@item +㤠@code{JNZ LP} + +@item +㦠@code{JNZ NUM} + +@item +㨠@code{JZE FIN} + +@item +㪠@code{JZE LP} + +@item +ã« @code{JZE NUM} +@end itemize + +cã«é¢ããè§£ç群 +@itemize @w{} + +@item +㢠@code{JNZ FIN} + +@item +㤠@code{JNZ FIN2} + +@item +㦠@code{JNZ NUM} + +@item +㨠@code{JZE FIN} + +@item +㪠@code{JZE FIN2} + +@item +ã« @code{JZE NUM} +@end itemize + +d ã«é¢ããè§£ç群 + +@itemize @w{} +@item +㢠@code{LAD GR6,1,GR1} + +@item +㤠@code{LAD GR6,1,GR6} + +@item +㦠@code{LAD GR7,1,GR2} + +@item +㨠@code{LAD GR7,1,GR7} + +@item +㪠@code{LD GR6,GR1} + +@item +ã« @code{LD GR7,GR2} +@end itemize + +@unnumberedsec è¨å3 + +GETWDã使ç¨ãã¦ï¼äºã¤ã®æ´æ°ã®ç©ãæ±ããå¯ããã°ã©ã MULTã使ãããããã°ã©ã 3ä¸ã®::ansbox:4::ã«å ¥ããæ£ããçããï¼è§£ç群ã®ä¸ããé¸ã¹ã + +@unnumberedsubsec ãããã°ã©ã 3ã®èª¬æã + +(1) MULTã¯ï¼æ°ååãäºã¤ã ãå«ãï¼ãããã°ã©ã 2ã®èª¬æãã®(1)ã§ç¤ºããå½¢å¼ã®æååã«ã¤ãã¦ï¼æåã®æ°ååã«å¯¾å¿ããæ°å¤ãè¢«ä¹æ°ã¨ãï¼2çªç®ã®æ°ååã«å¯¾å¿ããæ°å¤ã乿°ã¨ãã¦ä¹ç®ãè¡ããä¹ç®ã«ããã¦ããµãã¯çºçããªããã®ã¨ããã + +(2) 主ããã°ã©ã ã¯ï¼æååãæ ¼ç´ããã¦ããé åã®å é ã¢ãã¬ã¹ãGR1ã«è¨å®ãã¦ï¼MULTãå¼ã¶ãMULTã¯ï¼æ¼ç®çµæãGR0ã«æ ¼ç´ãã¦å¼åºãå ã«æ»ãã + +(3) å¯ããã°ã©ã MULTããæ»ãã¨ãï¼æ±ç¨ã¬ã¸ã¹ã¿GR1ï½GR7ã®å 容ã¯å ã«æ»ãã + +@unnumberedsubsec ãããã°ã©ã 3ã + +@verbatim +MULT START + RPUSH + LAD GR2,CTBL + CALL GETWD + LD GR4,0,GR2 ; GR4 â è¢«ä¹æ° + LD GR5,1,GR2 ; GR5 â 乿° + LD GR0,=0 + LD GR5,GR5 +LP ::ansbox:8:e:: + LD GR3,GR5 + AND GR3,=#0001 ; 乿°ã®æä¸ä½ãããã®ãã§ã㯠+ JZE NEXT + ADDL GR0,GR4 +NEXT SLL GR4,1 ; è¢«ä¹æ°ã1ãããå·¦è«çã·ãã + ::ansbox:8:f:: + JUMP LP +FIN RPOP + RET +CTBL DS 3 ; GETWDç¨ç®¡çãã¼ãã« + END +@end verbatim + +eã«é¢ããè§£ç群 + +@itemize @w{} +@item +㢠@code{JMI FIN} + +@item +㤠@code{JMI NEXT} + +@item +㦠@code{JPL FIN} + +@item +㨠@code{JPL NEXT} + +@item +㪠@code{JZE FIN} + +@item +ã« @code{JZE NEXT} +@end itemize + + +fã«é¢ããè§£ç群 + +@itemize @w{} +@item +㢠@code{ADDL GR0,GR5} + +@item +㤠@code{ADDL GR5,GR4} + +@item +㦠@code{LD GR5,GR4} + +@item +㨠@code{SLL GR5,1} + +@item +㪠@code{SRL GR5,1} +@end itemize +@bye diff --git a/doc/exam_fe/2018_04/img/Makefile b/doc/exam_fe/2018_04/img/Makefile new file mode 100644 index 0000000..f54721f --- /dev/null +++ b/doc/exam_fe/2018_04/img/Makefile @@ -0,0 +1,9 @@ +all: $(foreach ext,.png .eps,$(addsuffix $(ext),$(basename $(wildcard *.svg)))) + +clean: + $(RM) *.log + +distclean: clean + $(RM) *.png *.eps *.jpg + +include ../../../images.mk diff --git a/doc/exam_fe/2018_04/img/fig1.svg b/doc/exam_fe/2018_04/img/fig1.svg new file mode 100644 index 0000000..f376f72 --- /dev/null +++ b/doc/exam_fe/2018_04/img/fig1.svg @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="300" height="90" viewBox="0 0 200 60"> + <g transform="translate(10,10)"> + <g stroke="black" stroke-width="1" fill="none"> + <rect x="0" y="0" width="180" height="30" /> + <line x1="60" y1="0" x2="60" y2="30" /> + <line x1="120" y1="0" x2="120" y2="30" /> + </g> + <g font-family="monospace" font-size="10" fill="black"> + <text x="15" y="20">#0035</text> + <text x="75" y="20">#0036</text> + <text x="135" y="20">#0037</text> + </g> + <g font-family="sans-serif" font-size="10px" fill="black"> + <text x="5" y="40">ï¼1èªç®ï¼</text> + <text x="65" y="40">ï¼2èªç®ï¼</text> + <text x="125" y="40">ï¼3èªç®ï¼</text> + </g> + </g> +</svg> diff --git a/doc/exam_fe/2018_04/img/fig2.svg b/doc/exam_fe/2018_04/img/fig2.svg new file mode 100644 index 0000000..af1cdb3 --- /dev/null +++ b/doc/exam_fe/2018_04/img/fig2.svg @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="360" height="120" viewBox="0 0 240 60"> + <g transform="translate(10,10)"> + <rect x="0" y="0" width="170" height="30" stroke="black" stroke-width="1" fill="none" /> + <text font-family="monospace" font-size="10" fill="black" x="10" y="20">â³â³1234â³56789â³â³â³9876â³.</text> + <g font-family="sans-serif" font-size="10" fill="black"> + <text x="0" y="40">注è¨</text> + <text x="30" y="40">ç©ºç½æåã¯ââ³âã¨è¡¨ç¤ºãã</text> + </g> + </g> +</svg> diff --git a/doc/exam_fe/2018_04/img/fig3.svg b/doc/exam_fe/2018_04/img/fig3.svg new file mode 100644 index 0000000..9ae0372 --- /dev/null +++ b/doc/exam_fe/2018_04/img/fig3.svg @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="360" height="90" viewBox="0 0 240 60"> + <g transform="translate(10,10)"> + <g stroke="black" stroke-width="1" fill="none"> + <rect x="0" y="0" width="200" height="30" /> + <line x1="50" y1="0" x2="50" y2="30" /> + <line x1="100" y1="0" x2="100" y2="30" /> + <line x1="150" y1="0" x2="150" y2="30" /> + </g> + <g font-family="monospace" font-size="10px" fill="black"> + <text x="20" y="20">1234</text> + <text x="65" y="20">56789</text> + <text x="120" y="20">9876</text> + <text x="180" y="20">-1</text> + </g> + <g font-family="sans-serif" font-size="10" fill="black"> + <text x="0" y="40">注è¨</text> + <text x="30" y="40">æ°å¤ã¯ï¼10鲿°ã§è¡¨è¨ãã¦ããã</text> + </g> + </g> +</svg> diff --git a/doc/exam_fe/style.css b/doc/exam_fe/style.css new file mode 100644 index 0000000..b1d8a2c --- /dev/null +++ b/doc/exam_fe/style.css @@ -0,0 +1,174 @@ +body { + margin-left: 6em; + margin-right: 12em; + color: black; + background-color: #EEE; + font-family: sans-serif; +} + +h1, h2, h3, h4, h5, h6 { + color: navy; + background-color: inherit; +} + +h1, h2 { + margin-left: -2em; +} + +.node{ + margin-left: -3em; + color: inherit; + background-color: #DDF; +} + +.menu, .node { + color: inherit; + background-color: #DDF; +} + +table.menu, table.menu th, table.menu td { + border-style: none; +} + +h2 { + padding: 0.25em; +} + +.contents { + background-color: #DDF; + border: 4px double #000; + padding: 0.5em 1em 0.5em 1em; +} + +.contents h2 { + margin-left: 0; + color: black; + background-color: #DDF; +} + +.contents li { + list-style-type: none; +} + +.shortcontents { + background-color: #DDF; + border: 4px double #000; + } + +.shortcontents h2{ + display: none; +} + +h1.node-heading { + display: none; +} + +h2.contents-heading{ + display: none; +} + +h2.shortcontents-heading{ + display: none; +} + +.shortcontents a { + margin-right: 1em; +} + +h3, h4, h5 { + margin-left: -1em; +} + +h5 { + font-size: 100%; +} + +p { + line-height: 1.25em; + margin-top: 0; + margin-bottom: 0.5em; +} + +a:hover { + color: red; + text-decoration: underline; +} + +pre.example, pre.verbatim { + padding: 0.5em 1em 0.5em 1em; + border: 1px solid #CCC; + font-size: 120%; +} + +a { + text-decoration: none; +} + +blockquote { + line-height: 1.25em; + border: 1px solid #00F; +} + +kbd, code, .file, var { + font-style: normal; + font-weight: normal; + font-family: monospace; + font-size: 120%; + margin-left:0.25em; + margin-right: 0.25em; +} + +table, th, td { + border: 1px solid black; + border-collapse: collapse; /* æ ç·ã®è¡¨ç¤ºæ¹æ³ */ + margin-bottom: 1em; +} + +table.cartouche, table.cartouche th, table.cartouche td { + border: none; +} + +pre.example .command, pre.example .option, pre.example kbd { + font-weight: bold; + font-family: monospace; + font-size: 110%; + background-color: inherit; + font-style: normal; + margin-left:0; + margin-right: 0; +} + +pre.example strong { + font: inherit; + border: 2px solid green; +} + +th, em { + font-style: normal; + font-weight: bold; + font-family: sans-serif; +} + +th { + text-align: center; +} + +dfn { + font-style: normal; +} + +.header, .menu { + display: none; +} + +.selection { + color: navy; + font-weight: bold; + margin-right: 1em; +} + +.ansbox { + border: 2px solid navy; + text-align: center; + display: inline-block; +} diff --git a/doc/exam_fe/texinfo_exam.mk b/doc/exam_fe/texinfo_exam.mk new file mode 100644 index 0000000..56c8cd1 --- /dev/null +++ b/doc/exam_fe/texinfo_exam.mk @@ -0,0 +1,78 @@ +.PHONY: texinfo-distclean texinfo-clean texinfo-textmp-clean + +CP := cp +DVIPDFMX := dvipdfmx +DVIPDFMX_FLAGS ?= +ECHO := echo +INSTALL-INFO := install-info +MAKEINFO_FLAGS ?= +MKDIR := mkdir +RMR := rm -rf +SED := sed +TEX := ptex +TEXI2DVI := TEX=$(TEX) texi2dvi +TEXI2DVI_FLAGS ?= -q --texinfo=@afourpaper +MV := mv + +# \includeã³ãã³ãã§èªã¿è¾¼ã¾ãããã¡ã¤ã« +intexi = $(strip $(shell $(SED) -n -e 's/@include \(.*\)/\1/pg' $<)) + +# \imageã³ãã³ãã§èªã¿è¾¼ã¾ãããã¡ã¤ã« +imagetexi = $(strip $(shell $(SED) -n -e 's/.*@image{\([^,]*\)\(,[^,]*,[^,]*,[^,]*,\([^,}]*\)\)}.*/\1\3/p' $<)) + +# ä¾åé¢ä¿ãèªåçæããdãã¡ã¤ã«ã«æ ¼ç´ +%.d: %.texi + @$(ECHO) '$@ is created by scanning $<.' + # texiãã¡ã¤ã«ã¨åºåãã¡ã¤ã«ã®ä¾åé¢ä¿ + @$(ECHO) '$(foreach ext,.html _html .pdf .xml .info .txt .d,$(subst .texi,$(ext),$<)): $<' >$@ + # includeãã¡ã¤ã«ã®ä¾åé¢ä¿ + $(if $(intexi),@( \ + $(ECHO) >>$@; \ + $(ECHO) '# Include Files' >>$@; \ + $(ECHO) '$(foreach ext,.html _html .info .pdf .xml .txt,$<),$(subst .texi,$(ext),$<): $(intexi)') >>$@) + # imageãã¡ã¤ã«ã®ä¾åé¢ä¿ + # Docbookã¯æªå®ç¾© + $(if $(imagetexi),@( \ + $(ECHO) >>$@; \ + $(ECHO) '# Image Files: HTML, HTML split, Info' >>$@; \ + $(ECHO) '$(foreach ext,.html _html .info,$(subst .texi,$(ext),$<)): $(imagetexi)' >>$@)) + $(if $(imagetexi),@( \ + $(ECHO) >>$@; \ + $(ECHO) '# Imagefiles: DVI -> PDF' >>$@; \ + $(ECHO) '$(subst .texi,.pdf,$<): $(addsuffix .eps,$(basename $(imagetexi)))' >>$@)) + +# 夿°TEXITARGETSã§æå®ãããã¿ã¼ã²ãããã¡ã¤ã«ã«å¯¾å¿ããdãã¡ã¤ã«ãã¤ã³ã¯ã«ã¼ã +# .dãã¡ã¤ã«ããããããã¡ã¤ã«ã®ä¾åé¢ä¿ãåå¾ãã +# ã¿ã¼ã²ããã« clean ãå«ã¾ãã¦ããå ´åã¯é¤ã +ifeq (,$(filter %clean,$(MAKECMDGOALS))) + -include $(addsuffix .d,$(basename $(TEXITARGETS))) +endif + +%.info: %.texi + $(MAKEINFO) $(MAKEINFO_FLAGS) -o $@ $< + +%.html: %.texi + $(MAKEINFO) -o $@ --no-split --html --css-include=$(CSS) $< + $(SED) -i '' -e 's%<img src="\([^"]*\)" *[^>]*>%<object type="image/svg+xml" data="\1">&</object>%g' $@ + $(SED) -i '' -e 's%<!-- /@w --> \([ã¢ã¤ã¦ã¨ãªã«ãã¯ã±ã³]\)%<span class="selection">\1</span>%g' $@ + $(SED) -i '' -e 's%::ansbox:\([0-9]*\):*\([a-zA-Z]\)*::%<span class="ansbox" style="min-width:\1em">\2\ </span>%g' $@ + +%.html %_html: $(CSS) + +%.pdf: %.dvi + $(DVIPDFMX) $(DVIPDFMXFLAGS) $< + +%.txt: %.texi + $(MAKEINFO) --no-headers --disable-encoding -o $@ $< + +%.xml: %.texi + @$(MAKEINFO) --docbook -o $@ $< + +texinfo-distclean: texinfo-clean + $(RMR) *_html *.info *.html *.pdf *.dvi *.txt + +texinfo-clean: texinfo-textmp-clean + $(RM) *.d + +texinfo-textmp-clean: + $(RM) *.aux *.cp *.cps *.fn *.ky *.log *.pg *.pgs *.tmp *.toc *.tp *.vr diff --git a/doc/images.mk b/doc/images.mk new file mode 100644 index 0000000..96e21e4 --- /dev/null +++ b/doc/images.mk @@ -0,0 +1,8 @@ +INKSCAPE := inkscape -z +CONVERT := convert + +%.png: %.svg + $(INKSCAPE) -y 0.0 -e $@ $< >$<2png.log 2>&1 + +%.eps: %.svg + $(INKSCAPE) -E $@ $< >$<2eps.log 2>&1 diff --git a/doc/texinfo.mk b/doc/texinfo.mk index bd3c4d4..728091e 100644 --- a/doc/texinfo.mk +++ b/doc/texinfo.mk @@ -53,13 +53,13 @@ endif %.html: %.texi $(MAKEINFO) -o $@ --no-split --html --css-include=$(CSS) $< - $(SED) -i '' -e 's%<img src="\([^"]*\)" alt="[^"]*">%<object type="image/svg+xml" data="\1"></object>%g' $@ + $(SED) -i '' -e 's%<img src="\([^"]*\)" *[^>]*>%<object type="image/svg+xml" data="\1">&</object>%g' $@ %_html: %.texi if test ! -e $@; then $(MKDIR) $@; fi $(CP) $(CSS) $@/ $(MAKEINFO) -o $@ --html --css-ref=$(CSS) $< - $(SED) -i '' -e 's%<img src="\([^"]*\)" alt="[^"]*">%<object type="image/svg+xml" data="\1"></object>%g' $@ + $(SED) -i '' -e 's%<img src="\([^"]*\)" *[^>]*>%<object type="image/svg+xml" data="\1">&</object>%g' $@ %.html %_html: $(CSS)