From 39a22719714f3de2136c5f92ff036b54c3944db7 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