From db72b99e0ddad50852fa89e94b0df287f3c1b5bd Mon Sep 17 00:00:00 2001
From: j8takagi <j8takagi@nifty.com>
Date: Fri, 13 Jun 2014 11:20:33 +0900
Subject: [PATCH] =?utf8?q?CASL=20II=E4=BB=95=E6=A7=98=E6=9B=B8=E3=82=92?=
=?utf8?q?=E7=8B=AC=E7=AB=8B=E3=81=97=E3=81=9F=E3=83=87=E3=82=A3=E3=83=AC?=
=?utf8?q?=E3=82=AF=E3=83=88=E3=83=AA=E3=83=BC=E3=81=AB=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
---
doc/Makefile | 13 ++++-
doc/casl2_spec/.gitignore | 20 +++++++
doc/casl2_spec/Makefile | 24 ++++++++
doc/casl2_spec/casl2_spec.dep | 55 +++++++++++++++++++
doc/{ => casl2_spec}/casl2_spec.texi | 54 +++++++++---------
doc/casl2_spec/images.mk | 8 +++
.../img}/1_1-01.svg | 0
.../img}/1_2-.svg.template | 0
.../img}/1_2-00.svg | 0
.../img}/1_2-01.svg | 0
.../img}/1_2-02.svg | 0
.../img}/1_2-03.svg | 0
.../img}/1_2-04.svg | 0
.../img}/1_2-05.svg | 0
.../img}/1_2-06.svg | 0
.../img}/1_2-07.svg | 2 +-
.../img}/1_2-08.svg | 0
.../img}/1_3-01.svg | 0
.../img}/2_1-01.svg | 0
.../img}/2_2-01.svg | 0
.../img}/2_3-01.svg | 0
.../img}/2_3-02.svg | 0
.../img}/2_3-03.svg | 0
.../img}/2_3-04.svg | 0
.../img}/2_3-05.svg | 0
.../img}/2_4-01.svg | 0
.../img}/2_4-02.svg | 0
.../img}/2_4-03.svg | 0
.../img}/2_4-04.svg | 0
doc/casl2_spec/img/Makefile | 9 +++
.../img}/r_1-01.svg | 0
.../img}/r_1-02.svg | 0
.../img}/r_1-03.svg | 0
.../img}/r_1-04.svg | 0
.../img}/r_1-05.svg | 0
.../img}/svgstyle.css | 0
doc/casl2_spec/style.css | 1 +
doc/casl2_spec/texinfo.mk | 1 +
doc/casl2_spec/texinfo.tex | 1 +
doc/casl2_spec_img/Makefile | 19 -------
40 files changed, 157 insertions(+), 50 deletions(-)
create mode 100644 doc/casl2_spec/.gitignore
create mode 100644 doc/casl2_spec/Makefile
create mode 100644 doc/casl2_spec/casl2_spec.dep
rename doc/{ => casl2_spec}/casl2_spec.texi (93%)
create mode 100644 doc/casl2_spec/images.mk
rename doc/{casl2_spec_img => casl2_spec/img}/1_1-01.svg (100%)
rename doc/{casl2_spec_img => casl2_spec/img}/1_2-.svg.template (100%)
rename doc/{casl2_spec_img => casl2_spec/img}/1_2-00.svg (100%)
rename doc/{casl2_spec_img => casl2_spec/img}/1_2-01.svg (100%)
rename doc/{casl2_spec_img => casl2_spec/img}/1_2-02.svg (100%)
rename doc/{casl2_spec_img => casl2_spec/img}/1_2-03.svg (100%)
rename doc/{casl2_spec_img => casl2_spec/img}/1_2-04.svg (100%)
rename doc/{casl2_spec_img => casl2_spec/img}/1_2-05.svg (100%)
rename doc/{casl2_spec_img => casl2_spec/img}/1_2-06.svg (100%)
rename doc/{casl2_spec_img => casl2_spec/img}/1_2-07.svg (97%)
rename doc/{casl2_spec_img => casl2_spec/img}/1_2-08.svg (100%)
rename doc/{casl2_spec_img => casl2_spec/img}/1_3-01.svg (100%)
rename doc/{casl2_spec_img => casl2_spec/img}/2_1-01.svg (100%)
rename doc/{casl2_spec_img => casl2_spec/img}/2_2-01.svg (100%)
rename doc/{casl2_spec_img => casl2_spec/img}/2_3-01.svg (100%)
rename doc/{casl2_spec_img => casl2_spec/img}/2_3-02.svg (100%)
rename doc/{casl2_spec_img => casl2_spec/img}/2_3-03.svg (100%)
rename doc/{casl2_spec_img => casl2_spec/img}/2_3-04.svg (100%)
rename doc/{casl2_spec_img => casl2_spec/img}/2_3-05.svg (100%)
rename doc/{casl2_spec_img => casl2_spec/img}/2_4-01.svg (100%)
rename doc/{casl2_spec_img => casl2_spec/img}/2_4-02.svg (100%)
rename doc/{casl2_spec_img => casl2_spec/img}/2_4-03.svg (100%)
rename doc/{casl2_spec_img => casl2_spec/img}/2_4-04.svg (100%)
create mode 100644 doc/casl2_spec/img/Makefile
rename doc/{casl2_spec_img => casl2_spec/img}/r_1-01.svg (100%)
rename doc/{casl2_spec_img => casl2_spec/img}/r_1-02.svg (100%)
rename doc/{casl2_spec_img => casl2_spec/img}/r_1-03.svg (100%)
rename doc/{casl2_spec_img => casl2_spec/img}/r_1-04.svg (100%)
rename doc/{casl2_spec_img => casl2_spec/img}/r_1-05.svg (100%)
rename doc/{casl2_spec_img => casl2_spec/img}/svgstyle.css (100%)
create mode 120000 doc/casl2_spec/style.css
create mode 120000 doc/casl2_spec/texinfo.mk
create mode 120000 doc/casl2_spec/texinfo.tex
delete mode 100644 doc/casl2_spec_img/Makefile
diff --git a/doc/Makefile b/doc/Makefile
index 6216a3e..04b5f16 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,17 +1,19 @@
RMR := $(RM) -r
SED := sed
-DOCS := install manual casl2_spec
+DOCS := install manual
CSS := style.css
prefix ?= ~
infodir ?= $(prefix)/share/info
-.PHONY: base all info html htmls pdf distclean clean
+INSTALL-INFO-TARGETS := yacasl2.info
+
+.PHONY: base all info html htmls pdf casl2_spec distclean clean
base: install.txt info html
-all: base html pdf
+all: base html pdf casl2_spec
info: yacasl2.info
@@ -21,16 +23,21 @@ htmls: $(addsuffix _html,$(DOCS))
pdf: $(addsuffix .pdf,$(DOCS))
+casl2_spec:
+ $(MAKE) -C casl2_spec
+
yacasl2.info: manual.texi
$(MAKEINFO) $(MAKEINFO_FLAGS) $<
# makeã§ä½æãããããã¥ã¡ã³ãã¯ãã¹ã¦åé¤
distclean: clean texinfo-distclean
$(RM) install.txt *.info *.html *_html *.pdf
+ $(MAKE) -C casl2_spec distclean
# make baseã§ä½æãããããã¥ã¡ã³ãã¯æ®ã
clean: texinfo-clean
$(RM) *.bak
+ $(MAKE) -C casl2_spec clean
include texinfo.mk
diff --git a/doc/casl2_spec/.gitignore b/doc/casl2_spec/.gitignore
new file mode 100644
index 0000000..5c3f5e6
--- /dev/null
+++ b/doc/casl2_spec/.gitignore
@@ -0,0 +1,20 @@
+*.eps
+*.png
+*_html
+*.info
+*.html
+*.pdf
+*.dvi
+*.txt
+*.aux
+*.cp
+*.cps
+*.fn
+*.ky
+*.log
+*.pg
+*.pgs
+*.tmp
+*.toc
+*.tp
+*.vr
\ No newline at end of file
diff --git a/doc/casl2_spec/Makefile b/doc/casl2_spec/Makefile
new file mode 100644
index 0000000..17b62cf
--- /dev/null
+++ b/doc/casl2_spec/Makefile
@@ -0,0 +1,24 @@
+VPATH := img
+
+RMR := $(RM) -r
+SED := sed
+
+CSS := style.css
+
+.PHONY: all clean distclean
+
+all: casl2_spec.html casl2_spec.pdf
+
+clean: texinfo-clean
+ $(RM) *.bak
+ $(MAKE) -C img clean
+
+distclean: clean texinfo-distclean
+ $(RM) *.html *.pdf
+ $(MAKE) -C img distclean
+
+include casl2_spec.dep
+
+include texinfo.mk
+
+include images.mk
diff --git a/doc/casl2_spec/casl2_spec.dep b/doc/casl2_spec/casl2_spec.dep
new file mode 100644
index 0000000..d2fe284
--- /dev/null
+++ b/doc/casl2_spec/casl2_spec.dep
@@ -0,0 +1,55 @@
+casl2_spec.html: img/1_1-01.png
+casl2_spec.html: img/1_2-00.png
+casl2_spec.html: img/1_2-01.png
+casl2_spec.html: img/1_2-02.png
+casl2_spec.html: img/1_2-03.png
+casl2_spec.html: img/1_2-04.png
+casl2_spec.html: img/1_2-05.png
+casl2_spec.html: img/1_2-06.png
+casl2_spec.html: img/1_2-07.png
+casl2_spec.html: img/1_2-08.png
+casl2_spec.html: img/1_3-01.png
+casl2_spec.html: img/2_1-01.png
+casl2_spec.html: img/2_2-01.png
+casl2_spec.html: img/2_3-01.png
+casl2_spec.html: img/2_3-02.png
+casl2_spec.html: img/2_3-03.png
+casl2_spec.html: img/2_3-04.png
+casl2_spec.html: img/2_3-05.png
+casl2_spec.html: img/2_4-01.png
+casl2_spec.html: img/2_4-02.png
+casl2_spec.html: img/2_4-03.png
+casl2_spec.html: img/2_4-04.png
+casl2_spec.html: img/r_1-01.png
+casl2_spec.html: img/r_1-02.png
+casl2_spec.html: img/r_1-03.png
+casl2_spec.html: img/r_1-04.png
+casl2_spec.html: img/r_1-05.png
+
+casl2_spec.pdf: img/1_1-01.eps
+casl2_spec.pdf: img/1_2-00.eps
+casl2_spec.pdf: img/1_2-01.eps
+casl2_spec.pdf: img/1_2-02.eps
+casl2_spec.pdf: img/1_2-03.eps
+casl2_spec.pdf: img/1_2-04.eps
+casl2_spec.pdf: img/1_2-05.eps
+casl2_spec.pdf: img/1_2-06.eps
+casl2_spec.pdf: img/1_2-07.eps
+casl2_spec.pdf: img/1_2-08.eps
+casl2_spec.pdf: img/1_3-01.eps
+casl2_spec.pdf: img/2_1-01.eps
+casl2_spec.pdf: img/2_2-01.eps
+casl2_spec.pdf: img/2_3-01.eps
+casl2_spec.pdf: img/2_3-02.eps
+casl2_spec.pdf: img/2_3-03.eps
+casl2_spec.pdf: img/2_3-04.eps
+casl2_spec.pdf: img/2_3-05.eps
+casl2_spec.pdf: img/2_4-01.eps
+casl2_spec.pdf: img/2_4-02.eps
+casl2_spec.pdf: img/2_4-03.eps
+casl2_spec.pdf: img/2_4-04.eps
+casl2_spec.pdf: img/r_1-01.eps
+casl2_spec.pdf: img/r_1-02.eps
+casl2_spec.pdf: img/r_1-03.eps
+casl2_spec.pdf: img/r_1-04.eps
+casl2_spec.pdf: img/r_1-05.eps
diff --git a/doc/casl2_spec.texi b/doc/casl2_spec/casl2_spec.texi
similarity index 93%
rename from doc/casl2_spec.texi
rename to doc/casl2_spec/casl2_spec.texi
index 5d3dea8..84b4c22 100644
--- a/doc/casl2_spec.texi
+++ b/doc/casl2_spec/casl2_spec.texi
@@ -30,7 +30,7 @@ Copyright @copyright{} Information-technology Promotion Agency, Japan. All right
@item
1èªã¯16ãããã§ï¼ãã®ãããæ§æã¯ï¼æ¬¡ã®ã¨ããã§ããã
-@image{casl2_spec_img/1_1-01,15cm}
+@image{img/1_1-01,15cm}
@item
主è¨æ¶ã®å®¹éã¯65536èªã§ï¼ãã®ã¢ãã¬ã¹ã¯0ï½65535çªå°ã§ããã
@@ -92,39 +92,39 @@ Copyright @copyright{} Information-technology Promotion Agency, Japan. All right
ããã§ï¼ä¸ã¤ã®å½ä»¤ã³ã¼ãã«å¯¾ã2種é¡ã®ãªãã©ã³ããããå ´åï¼
ä¸æ®µã¯ã¬ã¸ã¹ã¿éã®å½ä»¤ï¼ä¸æ®µã¯ã¬ã¸ã¹ã¿ã¨ä¸»è¨æ¶éã®å½ä»¤ã表ãã
-@image{casl2_spec_img/1_2-00,15cm}
+@image{img/1_2-00,15cm}
@subsection ãã¼ãï¼ã¹ãã¢ï¼ãã¼ãã¢ãã¬ã¹å½ä»¤
-@image{casl2_spec_img/1_2-01,15cm}
+@image{img/1_2-01,15cm}
@subsection ç®è¡ï¼è«çæ¼ç®å½ä»¤
-@image{casl2_spec_img/1_2-02,15cm}
+@image{img/1_2-02,15cm}
@subsection æ¯è¼æ¼ç®å½ä»¤
-@image{casl2_spec_img/1_2-03,15cm}
+@image{img/1_2-03,15cm}
@subsection ã·ããæ¼ç®å½ä»¤
-@image{casl2_spec_img/1_2-04,15cm}
+@image{img/1_2-04,15cm}
@subsection åå²å½ä»¤
-@image{casl2_spec_img/1_2-05,15cm}
+@image{img/1_2-05,15cm}
@subsection ã¹ã¿ãã¯æä½å½ä»¤
-@image{casl2_spec_img/1_2-06,15cm}
+@image{img/1_2-06,15cm}
@subsection ã³ã¼ã«ï¼ãªã¿ã¼ã³å½ä»¤
-@image{casl2_spec_img/1_2-07,15cm}
+@image{img/1_2-07,15cm}
@subsection ãã®ä»
-@image{casl2_spec_img/1_2-08,15cm}
+@image{img/1_2-08,15cm}
@unnumberedsubsec 注
@@ -170,7 +170,7 @@ JIS X 0201 ã©ãã³æåã»çä»®åç¨8ããã符å·ã§è¦å®ããæå
@item
次ã«ç¬¦å·è¡¨ã®ä¸é¨ã示ãã @*
-@image{casl2_spec_img/1_3-01,5cm}
+@image{img/1_3-01,5cm}
1æåã¯ï¼ããããããªãï¼ä¸ä½4ããããåã§ï¼ä¸ä½4ããããè¡ã§ç¤ºãã ä¾ãã°ï¼@code{éé}ï¼@code{4}ï¼@code{H}ï¼@code{@backslashchar{}}ã®ãããæ§æã¯ï¼16é²è¡¨ç¤ºã§ï¼ãããã20ï¼34ï¼48ï¼5Cã§ããããããæ§æã21ï½7Eï¼åã³è¡¨ã§ã¯çç¥ãã¦ããA1ï½DFï¼ã«å¯¾å¿ããæåãå³å½¢æåã¨ããã å³å½¢æåã¯ï¼è¡¨ç¤ºï¼å°å·ï¼è£
ç½®ã§ï¼æåã¨ãã¦è¡¨ç¤ºï¼å°åï¼ã§ããã
@@ -195,7 +195,7 @@ CASL IIã¯ï¼COMET IIã®ããã®ã¢ã»ã³ãã©è¨èªã§ããã
@item
å½ä»¤è¡ããã³æ³¨éè¡ã¯ï¼æ¬¡ã«ç¤ºãè¨è¿°ã®å½¢å¼ã§ï¼è¡ã®1æåç®ããè¨è¿°ããã @*
-@image{casl2_spec_img/2_1-01,15cm}
+@image{img/2_1-01,15cm}
@end enumerate
@unnumberedsubsec 注
@@ -227,7 +227,7 @@ CASL IIã¯ï¼COMET IIã®ããã®ã¢ã»ã³ãã©è¨èªã§ããã
å½ä»¤ã¯ï¼4種é¡ã®ã¢ã»ã³ãã©å½ä»¤ï¼@code{START}ï¼@code{END}ï¼@code{DS}ï¼@code{DC}ï¼ï¼ ï¼ç¨®é¡ã®ãã¯ãå½ä»¤ï¼@code{IN}ï¼@code{OUT}ï¼ããã³æ©æ¢°èªå½ä»¤ï¼COMET IIã®å½ä»¤ï¼ãããªãã ãã®ä»æ§ã次ã«ç¤ºãã
-@image{casl2_spec_img/2_2-01,15cm}
+@image{img/2_2-01,15cm}
@section ã¢ã»ã³ãã©å½ä»¤
@@ -235,7 +235,7 @@ CASL IIã¯ï¼COMET IIã®ããã®ã¢ã»ã³ãã©è¨èªã§ããã
@enumerate
-@item @* @image{casl2_spec_img/2_3-01,5cm} @*
+@item @* @image{img/2_3-01,5cm} @*
@code{START}å½ä»¤ã¯ï¼ããã°ã©ã ã®å
é ãå®ç¾©ããã
@@ -243,22 +243,22 @@ CASL IIã¯ï¼COMET IIã®ããã®ã¢ã»ã³ãã©è¨èªã§ããã
ã¾ãï¼ãã®å½ä»¤ã«ã¤ããããã©ãã«ã¯ï¼ä»ã®ããã°ã©ã ããå
¥å£åã¨ãã¦åç
§ã§ããã
-@item @* @image{casl2_spec_img/2_3-02,5cm} @*
+@item @* @image{img/2_3-02,5cm} @*
@code{END}å½ä»¤ã¯ï¼ããã°ã©ã ã®çµãããå®ç¾©ããã
-@item @* @image{casl2_spec_img/2_3-03,5cm} @*
+@item @* @image{img/2_3-03,5cm} @*
@code{DS}å½ä»¤ã¯ï¼æå®ããèªæ°ã®é åã確ä¿ããã
èªæ°ã¯ï¼10é²å®æ°ï¼@geq{} 0ï¼ã§æå®ãããèªæ°ã0ã¨ããå ´åï¼é åã¯ç¢ºä¿ããªããï¼ã©ãã«ã¯æå¹ã§ããã
-@item @* @image{casl2_spec_img/2_3-04,5cm} @*
+@item @* @image{img/2_3-04,5cm} @*
@code{DC}å½ä»¤ã¯ï¼å®æ°ã§æå®ãããã¼ã¿ãï¼é£ç¶ããï¼èªã«æ ¼ç´ããã
å®æ°ã«ã¯ï¼10é²å®æ°ï¼16é²å®æ°ï¼æåå®æ°ï¼ã¢ãã¬ã¹å®æ°ã®ï¼ç¨®é¡ãããã @*
-@image{casl2_spec_img/2_3-05,15cm}
+@image{img/2_3-05,15cm}
@end enumerate
@section ãã¯ãå½ä»¤
@@ -267,7 +267,7 @@ CASL IIã¯ï¼COMET IIã®ããã®ã¢ã»ã³ãã©è¨èªã§ããã
@enumerate
-@item @* @image{casl2_spec_img/2_4-01,5cm} @*
+@item @* @image{img/2_4-01,5cm} @*
@code{IN}å½ä»¤ã¯ï¼ãããããå²ãå½ã¦ãå
¥åè£
ç½®ããï¼1ã¬ã³ã¼ãã®æåãã¼ã¿ãèªã¿è¾¼ãã
@@ -277,7 +277,7 @@ CASL IIã¯ï¼COMET IIã®ããã®ã¢ã»ã³ãã©è¨èªã§ããã
@code{IN}å½ä»¤ãå®è¡ããã¨ï¼@code{GR}ã®å
容ã¯ä¿åããããï¼@code{FR}ã®å
容ã¯ä¸å®ã¨ãªãã
-@item @* @image{casl2_spec_img/2_4-02,5cm} @*
+@item @* @image{img/2_4-02,5cm} @*
@code{OUT}å½ä»¤ã¯ï¼ãããããå²ãå½ã¦ãåºåè£
ç½®ã«ï¼æåãã¼ã¿ãï¼1ã¬ã³ã¼ãã¨ãã¦æ¸ãåºãã
@@ -287,11 +287,11 @@ CASL IIã¯ï¼COMET IIã®ããã®ã¢ã»ã³ãã©è¨èªã§ããã
@code{OUT}å½ä»¤ãå®è¡ããã¨ï¼@code{GR}ã®å
容ã¯ä¿åããããï¼@code{FR}ã®å
容ã¯ä¸å®ã¨ãªãã
-@item @* @image{casl2_spec_img/2_4-03,5cm} @*
+@item @* @image{img/2_4-03,5cm} @*
@code{RPUSH}å½ä»¤ã¯ï¼@code{GR}ã®å
容ãï¼@code{GR1}ï¼@code{GR2}ï¼â¦ï¼@code{GR7}ã®é ã§ã¹ã¿ãã¯ã«æ ¼ç´ããã
-@item @* @image{casl2_spec_img/2_4-04,5cm} @*
+@item @* @image{img/2_4-04,5cm} @*
@code{RPOP}å½ä»¤ã¯ï¼ã¹ã¿ãã¯ã®å
容ãé 次åãåºãï¼@code{GR7}ï¼@code{GR6}ï¼â¦ï¼@code{GR1}ã®é ã§@code{GR}ã«æ ¼ç´ããã`
@end enumerate
@@ -359,7 +359,7 @@ OSã¯ï¼å
¥åºåè£
ç½®ãåªä½ã«ããå
¥åºåæç¶ã®éããå¸åãï¼
å½ä»¤èªã®æ§æã¯å®ç¾©ããªããï¼æ¬¡ã®ãããªæ§æãæ³å®ãããããã§ï¼@code{OP}ã®æ°å¤ã¯16é²è¡¨ç¤ºã§ç¤ºãã
-@image{casl2_spec_img/r_1-01,15cm}
+@image{img/r_1-01,15cm}
@section ãã¯ãå½ä»¤
@@ -390,19 +390,19 @@ LABEL PUSH 0,GR1
@item ç®è¡å·¦ã·ããã§ã¯ï¼ãããçªå·14ã®å¤ãè¨å®ãããã @*
-@image{casl2_spec_img/r_1-02,15cm}
+@image{img/r_1-02,15cm}
@item ç®è¡å³ã·ããã§ã¯ï¼ãããçªå·0ã®å¤ãè¨å®ãããã @*
-@image{casl2_spec_img/r_1-03,15cm}
+@image{img/r_1-03,15cm}
@item è«çå·¦ã·ããã§ã¯ï¼ãããçªå·15ã®å¤ãè¨å®ãããã @*
-@image{casl2_spec_img/r_1-04,15cm}
+@image{img/r_1-04,15cm}
@item è«çå³ã·ããã§ã¯ï¼ãããçªå·0ã®å¤ãè¨å®ãããã @*
-@image{casl2_spec_img/r_1-05,15cm}
+@image{img/r_1-05,15cm}
@end enumerate
@section ããã°ã©ã ã®ä¾
diff --git a/doc/casl2_spec/images.mk b/doc/casl2_spec/images.mk
new file mode 100644
index 0000000..96e21e4
--- /dev/null
+++ b/doc/casl2_spec/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/casl2_spec_img/1_1-01.svg b/doc/casl2_spec/img/1_1-01.svg
similarity index 100%
rename from doc/casl2_spec_img/1_1-01.svg
rename to doc/casl2_spec/img/1_1-01.svg
diff --git a/doc/casl2_spec_img/1_2-.svg.template b/doc/casl2_spec/img/1_2-.svg.template
similarity index 100%
rename from doc/casl2_spec_img/1_2-.svg.template
rename to doc/casl2_spec/img/1_2-.svg.template
diff --git a/doc/casl2_spec_img/1_2-00.svg b/doc/casl2_spec/img/1_2-00.svg
similarity index 100%
rename from doc/casl2_spec_img/1_2-00.svg
rename to doc/casl2_spec/img/1_2-00.svg
diff --git a/doc/casl2_spec_img/1_2-01.svg b/doc/casl2_spec/img/1_2-01.svg
similarity index 100%
rename from doc/casl2_spec_img/1_2-01.svg
rename to doc/casl2_spec/img/1_2-01.svg
diff --git a/doc/casl2_spec_img/1_2-02.svg b/doc/casl2_spec/img/1_2-02.svg
similarity index 100%
rename from doc/casl2_spec_img/1_2-02.svg
rename to doc/casl2_spec/img/1_2-02.svg
diff --git a/doc/casl2_spec_img/1_2-03.svg b/doc/casl2_spec/img/1_2-03.svg
similarity index 100%
rename from doc/casl2_spec_img/1_2-03.svg
rename to doc/casl2_spec/img/1_2-03.svg
diff --git a/doc/casl2_spec_img/1_2-04.svg b/doc/casl2_spec/img/1_2-04.svg
similarity index 100%
rename from doc/casl2_spec_img/1_2-04.svg
rename to doc/casl2_spec/img/1_2-04.svg
diff --git a/doc/casl2_spec_img/1_2-05.svg b/doc/casl2_spec/img/1_2-05.svg
similarity index 100%
rename from doc/casl2_spec_img/1_2-05.svg
rename to doc/casl2_spec/img/1_2-05.svg
diff --git a/doc/casl2_spec_img/1_2-06.svg b/doc/casl2_spec/img/1_2-06.svg
similarity index 100%
rename from doc/casl2_spec_img/1_2-06.svg
rename to doc/casl2_spec/img/1_2-06.svg
diff --git a/doc/casl2_spec_img/1_2-07.svg b/doc/casl2_spec/img/1_2-07.svg
similarity index 97%
rename from doc/casl2_spec_img/1_2-07.svg
rename to doc/casl2_spec/img/1_2-07.svg
index 1d9d26f..7172a2b 100644
--- a/doc/casl2_spec_img/1_2-07.svg
+++ b/doc/casl2_spec/img/1_2-07.svg
@@ -25,7 +25,7 @@
<g transform="translate(0,50)">
<g font-size="10pt" font-family="monospace">
<text x="5" y="15" font-family="sans-serif">ãªã¿ã¼ã³</text>
- <text x="5" y="35">RETrun form subroutine</text>
+ <text x="5" y="35">RETurn form subroutine</text>
<text x="205" y="25">RET</text>
<text x="255" y="25"></text>
</g>
diff --git a/doc/casl2_spec_img/1_2-08.svg b/doc/casl2_spec/img/1_2-08.svg
similarity index 100%
rename from doc/casl2_spec_img/1_2-08.svg
rename to doc/casl2_spec/img/1_2-08.svg
diff --git a/doc/casl2_spec_img/1_3-01.svg b/doc/casl2_spec/img/1_3-01.svg
similarity index 100%
rename from doc/casl2_spec_img/1_3-01.svg
rename to doc/casl2_spec/img/1_3-01.svg
diff --git a/doc/casl2_spec_img/2_1-01.svg b/doc/casl2_spec/img/2_1-01.svg
similarity index 100%
rename from doc/casl2_spec_img/2_1-01.svg
rename to doc/casl2_spec/img/2_1-01.svg
diff --git a/doc/casl2_spec_img/2_2-01.svg b/doc/casl2_spec/img/2_2-01.svg
similarity index 100%
rename from doc/casl2_spec_img/2_2-01.svg
rename to doc/casl2_spec/img/2_2-01.svg
diff --git a/doc/casl2_spec_img/2_3-01.svg b/doc/casl2_spec/img/2_3-01.svg
similarity index 100%
rename from doc/casl2_spec_img/2_3-01.svg
rename to doc/casl2_spec/img/2_3-01.svg
diff --git a/doc/casl2_spec_img/2_3-02.svg b/doc/casl2_spec/img/2_3-02.svg
similarity index 100%
rename from doc/casl2_spec_img/2_3-02.svg
rename to doc/casl2_spec/img/2_3-02.svg
diff --git a/doc/casl2_spec_img/2_3-03.svg b/doc/casl2_spec/img/2_3-03.svg
similarity index 100%
rename from doc/casl2_spec_img/2_3-03.svg
rename to doc/casl2_spec/img/2_3-03.svg
diff --git a/doc/casl2_spec_img/2_3-04.svg b/doc/casl2_spec/img/2_3-04.svg
similarity index 100%
rename from doc/casl2_spec_img/2_3-04.svg
rename to doc/casl2_spec/img/2_3-04.svg
diff --git a/doc/casl2_spec_img/2_3-05.svg b/doc/casl2_spec/img/2_3-05.svg
similarity index 100%
rename from doc/casl2_spec_img/2_3-05.svg
rename to doc/casl2_spec/img/2_3-05.svg
diff --git a/doc/casl2_spec_img/2_4-01.svg b/doc/casl2_spec/img/2_4-01.svg
similarity index 100%
rename from doc/casl2_spec_img/2_4-01.svg
rename to doc/casl2_spec/img/2_4-01.svg
diff --git a/doc/casl2_spec_img/2_4-02.svg b/doc/casl2_spec/img/2_4-02.svg
similarity index 100%
rename from doc/casl2_spec_img/2_4-02.svg
rename to doc/casl2_spec/img/2_4-02.svg
diff --git a/doc/casl2_spec_img/2_4-03.svg b/doc/casl2_spec/img/2_4-03.svg
similarity index 100%
rename from doc/casl2_spec_img/2_4-03.svg
rename to doc/casl2_spec/img/2_4-03.svg
diff --git a/doc/casl2_spec_img/2_4-04.svg b/doc/casl2_spec/img/2_4-04.svg
similarity index 100%
rename from doc/casl2_spec_img/2_4-04.svg
rename to doc/casl2_spec/img/2_4-04.svg
diff --git a/doc/casl2_spec/img/Makefile b/doc/casl2_spec/img/Makefile
new file mode 100644
index 0000000..96d0ea3
--- /dev/null
+++ b/doc/casl2_spec/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/casl2_spec_img/r_1-01.svg b/doc/casl2_spec/img/r_1-01.svg
similarity index 100%
rename from doc/casl2_spec_img/r_1-01.svg
rename to doc/casl2_spec/img/r_1-01.svg
diff --git a/doc/casl2_spec_img/r_1-02.svg b/doc/casl2_spec/img/r_1-02.svg
similarity index 100%
rename from doc/casl2_spec_img/r_1-02.svg
rename to doc/casl2_spec/img/r_1-02.svg
diff --git a/doc/casl2_spec_img/r_1-03.svg b/doc/casl2_spec/img/r_1-03.svg
similarity index 100%
rename from doc/casl2_spec_img/r_1-03.svg
rename to doc/casl2_spec/img/r_1-03.svg
diff --git a/doc/casl2_spec_img/r_1-04.svg b/doc/casl2_spec/img/r_1-04.svg
similarity index 100%
rename from doc/casl2_spec_img/r_1-04.svg
rename to doc/casl2_spec/img/r_1-04.svg
diff --git a/doc/casl2_spec_img/r_1-05.svg b/doc/casl2_spec/img/r_1-05.svg
similarity index 100%
rename from doc/casl2_spec_img/r_1-05.svg
rename to doc/casl2_spec/img/r_1-05.svg
diff --git a/doc/casl2_spec_img/svgstyle.css b/doc/casl2_spec/img/svgstyle.css
similarity index 100%
rename from doc/casl2_spec_img/svgstyle.css
rename to doc/casl2_spec/img/svgstyle.css
diff --git a/doc/casl2_spec/style.css b/doc/casl2_spec/style.css
new file mode 120000
index 0000000..5191bf7
--- /dev/null
+++ b/doc/casl2_spec/style.css
@@ -0,0 +1 @@
+../style.css
\ No newline at end of file
diff --git a/doc/casl2_spec/texinfo.mk b/doc/casl2_spec/texinfo.mk
new file mode 120000
index 0000000..540462e
--- /dev/null
+++ b/doc/casl2_spec/texinfo.mk
@@ -0,0 +1 @@
+../texinfo.mk
\ No newline at end of file
diff --git a/doc/casl2_spec/texinfo.tex b/doc/casl2_spec/texinfo.tex
new file mode 120000
index 0000000..d604a30
--- /dev/null
+++ b/doc/casl2_spec/texinfo.tex
@@ -0,0 +1 @@
+../texinfo.tex
\ No newline at end of file
diff --git a/doc/casl2_spec_img/Makefile b/doc/casl2_spec_img/Makefile
deleted file mode 100644
index c78e06e..0000000
--- a/doc/casl2_spec_img/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-INKSCAPE := inkscape -z
-CONVERT := convert
-
-all: $(foreach ext,.png .eps,$(addsuffix $(ext),$(basename $(wildcard *.svg))))
-
-%.png: %.svg
- $(INKSCAPE) -y 0.0 -e $@ $< >$<2png.log 2>&1
-
-%.eps: %.svg
- $(INKSCAPE) -E $@ $< >$<2eps.log 2>&1
-
-%.jpg: %.png
- $(CONVERT) $< $@
-
-clean:
- $(RM) *.log
-
-distclean: clean
- $(RM) *.png *.eps *.jpg
--
2.18.0