From 3888742173d70889c8748f34506c8ddfdeda2530 Mon Sep 17 00:00:00 2001
From: j8takagi <j8takagi@nifty.com>
Date: Fri, 25 Jan 2013 11:50:53 +0900
Subject: [PATCH] =?utf8?q?doc=E3=83=87=E3=82=A3=E3=83=AC=E3=82=AF=E3=83=88?=
 =?utf8?q?=E3=83=AA=E3=83=BC=E3=81=AEMakefile=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 doc/.gitignore                              |  1 +
 doc/Makefile                                | 58 ++++++-------
 doc/autotest_mk.html                        | 93 +++++++++++----------
 doc/autotest_mk.texi                        | 80 +++++++++---------
 doc/sample_sort/sort_001/0.txt              |  5 --
 doc/sample_sort/sort_001/cmd.c.txt          | 16 ----
 doc/sample_sort/sort_001/desc.txt           |  1 -
 doc/sample_sort/sort_001/makefile.txt       | 13 ---
 doc/sample_sort/sort_002/0.txt              |  1 -
 doc/sample_sort/sort_002/cmd.c.txt          | 16 ----
 doc/sample_sort/sort_002/desc.txt           |  1 -
 doc/sample_sort/sort_002/makefile.txt       | 13 ---
 doc/sample_sort/sort_003/0.txt              |  5 --
 doc/sample_sort/sort_003/cmd.c.txt          | 16 ----
 doc/sample_sort/sort_003/desc.txt           |  1 -
 doc/sample_sort/sort_003/makefile.txt       | 13 ---
 doc/sample_sort/sort_004/0.txt              | 10 ---
 doc/sample_sort/sort_004/cmd.c.txt          | 16 ----
 doc/sample_sort/sort_004/desc.txt           |  1 -
 doc/sample_sort/sort_004/makefile.txt       | 13 ---
 doc/sample_sort/sort_005/0.txt              | 10 ---
 doc/sample_sort/sort_005/cmd.c.txt          | 16 ----
 doc/sample_sort/sort_005/desc.txt           |  1 -
 doc/sample_sort/sort_005/makefile.txt       | 13 ---
 doc/sample_triangle/01_scalene/0.txt        |  1 -
 doc/sample_triangle/01_scalene/cmd.txt      |  1 -
 doc/sample_triangle/01_scalene/desc.txt     |  1 -
 doc/sample_triangle/02_equilateral/0.txt    |  1 -
 doc/sample_triangle/02_equilateral/cmd.txt  |  1 -
 doc/sample_triangle/02_equilateral/desc.txt |  1 -
 doc/sample_triangle/03_isosceles/0.txt      |  1 -
 doc/sample_triangle/03_isosceles/cmd.txt    |  1 -
 doc/sample_triangle/03_isosceles/desc.txt   |  1 -
 doc/sample_triangle/04_isosceles_c/0.txt    |  3 -
 doc/sample_triangle/04_isosceles_c/cmd.txt  |  3 -
 doc/sample_triangle/04_isosceles_c/desc.txt |  1 -
 doc/sample_triangle/05_zero/0.txt           |  1 -
 doc/sample_triangle/05_zero/cmd.txt         |  1 -
 doc/sample_triangle/05_zero/desc.txt        |  1 -
 doc/sample_triangle/06_minus/0.txt          |  1 -
 doc/sample_triangle/06_minus/cmd.txt        |  1 -
 doc/sample_triangle/06_minus/desc.txt       |  1 -
 doc/sample_triangle/07_line/0.txt           |  1 -
 doc/sample_triangle/07_line/cmd.txt         |  1 -
 doc/sample_triangle/07_line/desc.txt        |  1 -
 doc/sample_triangle/08_lines/0.txt          |  6 --
 doc/sample_triangle/08_lines/cmd.txt        |  6 --
 doc/sample_triangle/08_lines/desc.txt       |  1 -
 doc/sample_triangle/09_less/0.txt           |  2 -
 doc/sample_triangle/09_less/cmd.txt         |  2 -
 doc/sample_triangle/09_less/desc.txt        |  1 -
 doc/sample_triangle/10_lesses/0.txt         |  6 --
 doc/sample_triangle/10_lesses/cmd.txt       |  6 --
 doc/sample_triangle/10_lesses/desc.txt      |  1 -
 doc/sample_triangle/11_zeroall/0.txt        |  1 -
 doc/sample_triangle/11_zeroall/cmd.txt      |  1 -
 doc/sample_triangle/11_zeroall/desc.txt     |  1 -
 doc/sample_triangle/12_notint/0.txt         |  1 -
 doc/sample_triangle/12_notint/cmd.txt       |  1 -
 doc/sample_triangle/12_notint/desc.txt      |  1 -
 doc/sample_triangle/13_argcnt/0.txt         |  2 -
 doc/sample_triangle/13_argcnt/cmd.txt       |  3 -
 doc/sample_triangle/13_argcnt/desc.txt      |  1 -
 doc/texinfo.mk                              | 42 ++++++++++
 64 files changed, 156 insertions(+), 367 deletions(-)
 delete mode 100644 doc/sample_sort/sort_001/0.txt
 delete mode 100644 doc/sample_sort/sort_001/cmd.c.txt
 delete mode 100644 doc/sample_sort/sort_001/desc.txt
 delete mode 100644 doc/sample_sort/sort_001/makefile.txt
 delete mode 100644 doc/sample_sort/sort_002/0.txt
 delete mode 100644 doc/sample_sort/sort_002/cmd.c.txt
 delete mode 100644 doc/sample_sort/sort_002/desc.txt
 delete mode 100644 doc/sample_sort/sort_002/makefile.txt
 delete mode 100644 doc/sample_sort/sort_003/0.txt
 delete mode 100644 doc/sample_sort/sort_003/cmd.c.txt
 delete mode 100644 doc/sample_sort/sort_003/desc.txt
 delete mode 100644 doc/sample_sort/sort_003/makefile.txt
 delete mode 100644 doc/sample_sort/sort_004/0.txt
 delete mode 100644 doc/sample_sort/sort_004/cmd.c.txt
 delete mode 100644 doc/sample_sort/sort_004/desc.txt
 delete mode 100644 doc/sample_sort/sort_004/makefile.txt
 delete mode 100644 doc/sample_sort/sort_005/0.txt
 delete mode 100644 doc/sample_sort/sort_005/cmd.c.txt
 delete mode 100644 doc/sample_sort/sort_005/desc.txt
 delete mode 100644 doc/sample_sort/sort_005/makefile.txt
 delete mode 100644 doc/sample_triangle/01_scalene/0.txt
 delete mode 100755 doc/sample_triangle/01_scalene/cmd.txt
 delete mode 100644 doc/sample_triangle/01_scalene/desc.txt
 delete mode 100644 doc/sample_triangle/02_equilateral/0.txt
 delete mode 100755 doc/sample_triangle/02_equilateral/cmd.txt
 delete mode 100644 doc/sample_triangle/02_equilateral/desc.txt
 delete mode 100644 doc/sample_triangle/03_isosceles/0.txt
 delete mode 100755 doc/sample_triangle/03_isosceles/cmd.txt
 delete mode 100644 doc/sample_triangle/03_isosceles/desc.txt
 delete mode 100644 doc/sample_triangle/04_isosceles_c/0.txt
 delete mode 100755 doc/sample_triangle/04_isosceles_c/cmd.txt
 delete mode 100644 doc/sample_triangle/04_isosceles_c/desc.txt
 delete mode 100644 doc/sample_triangle/05_zero/0.txt
 delete mode 100755 doc/sample_triangle/05_zero/cmd.txt
 delete mode 100644 doc/sample_triangle/05_zero/desc.txt
 delete mode 100644 doc/sample_triangle/06_minus/0.txt
 delete mode 100755 doc/sample_triangle/06_minus/cmd.txt
 delete mode 100644 doc/sample_triangle/06_minus/desc.txt
 delete mode 100644 doc/sample_triangle/07_line/0.txt
 delete mode 100755 doc/sample_triangle/07_line/cmd.txt
 delete mode 100644 doc/sample_triangle/07_line/desc.txt
 delete mode 100644 doc/sample_triangle/08_lines/0.txt
 delete mode 100755 doc/sample_triangle/08_lines/cmd.txt
 delete mode 100644 doc/sample_triangle/08_lines/desc.txt
 delete mode 100644 doc/sample_triangle/09_less/0.txt
 delete mode 100755 doc/sample_triangle/09_less/cmd.txt
 delete mode 100644 doc/sample_triangle/09_less/desc.txt
 delete mode 100644 doc/sample_triangle/10_lesses/0.txt
 delete mode 100755 doc/sample_triangle/10_lesses/cmd.txt
 delete mode 100644 doc/sample_triangle/10_lesses/desc.txt
 delete mode 100644 doc/sample_triangle/11_zeroall/0.txt
 delete mode 100755 doc/sample_triangle/11_zeroall/cmd.txt
 delete mode 100644 doc/sample_triangle/11_zeroall/desc.txt
 delete mode 100644 doc/sample_triangle/12_notint/0.txt
 delete mode 100755 doc/sample_triangle/12_notint/cmd.txt
 delete mode 100644 doc/sample_triangle/12_notint/desc.txt
 delete mode 100644 doc/sample_triangle/13_argcnt/0.txt
 delete mode 100755 doc/sample_triangle/13_argcnt/cmd.txt
 delete mode 100644 doc/sample_triangle/13_argcnt/desc.txt
 create mode 100644 doc/texinfo.mk

diff --git a/doc/.gitignore b/doc/.gitignore
index 10759fd..372cbd0 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -3,3 +3,4 @@ autotest_mk.info
 autotest_mk.dvi
 autotest_mk.pdf
 autotest_mk.xml
+sample
diff --git a/doc/Makefile b/doc/Makefile
index 48d31da..8825840 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,46 +1,38 @@
-DOCNAME = autotest_mk
-SRC = $(DOCNAME).texi
-CSS = style.css
-SAMPLES = sample_triangle sample_sort
+DOC := autotest_mk
+CSS := style.css
+SAMPLE := sample
 
-PTEX = ptex
-TEXINDEX = texindex
-DVI2PDF = dvipdfmx
-MAKEINFO = makeinfo
+MKDIR := mkdir -p
+RMRF := rm -rf
+RSYNC := rsync
 
-.PHONY: all htmlnosplit pdf clean
+.PHONY: base all clean
 
-.INTERMEDIATE: $(DOCNAME).dvi
+base: $(DOC).info $(DOC).html
 
-all: info htmlnosplit html pdf
+all: base $(DOC)_html $(DOC).pdf
 
-htmlnosplit: $(DOCNAME).html
+$(DOC).html: $(SAMPLE)
 
-info: $(DOCNAME).info
+$(SAMPLE): $(SAMPLE)/triangle $(SAMPLE)/sort
 
-html: $(SRC) $(CSS) $(SAMPLES)
-	@if test ! -s $@; then mkdir $@; fi;
-	@cp $(CSS) $@/
-	@cp -r $(SAMPLES) $@/
-	@$(MAKEINFO) -o $@ --html --css-ref=style.css $(SRC)
+$(SAMPLE)/triangle: ../sample/triangle/test
+	if test ! -e $(dir $@); then $(MKDIR) $(dir $@); fi
+	$(RSYNC) -az $</ $@
 
-pdf: $(DOCNAME).pdf
+$(SAMPLE)/sort: ../sample/sort/test
+	if test ! -e $(dir $@); then $(MKDIR) $(dir $@); fi
+	$(RSYNC) -az $</ $@
 
-$(DOCNAME).info: $(SRC)
-	@$(MAKEINFO) -o $@ $^
+$(DOC)_html: $(DOC)_html/$(SAMPLE)
 
-$(DOCNAME).html: $(SRC) $(CSS)
-	@$(MAKEINFO) -o $@ --no-split --html --css-include=$(CSS) $(SRC)
+$(DOC)_html/$(SAMPLE): $(SAMPLE)
+	if test ! -e $(dir $@); then $(MKDIR) $(dir $@); fi
+	$(RSYNC) -az $</ $@
 
-$(DOCNAME).pdf: $(DOCNAME).dvi
-	@$(DVI2PDF) $^
+include texinfo.mk
 
-$(DOCNAME).dvi: $(SRC)
-	@TEX=ptex texi2dvi -q --texinfo=@afourpaper -o $@ $<
-	@rm -rf $(DOCNAME).aux $(DOCNAME).cp $(DOCNAME).cps $(DOCNAME).fn $(DOCNAME).ky $(DOCNAME).log $(DOCNAME).pg $(DOCNAME).pgs $(DOCNAME).tmp $(DOCNAME).toc $(DOCNAME).tp $(DOCNAME).vr
+distclean: texinfo-distclean
+	$(RMRF) $(DOC).info $(DOC).html $(SAMPLE) $(DOC)_html $(DOC).pdf
 
-$(DOCNAME).xml: $(SRC)
-	@$(MAKEINFO) -o $@ --docbook $(SRC)
-
-clean:
-	@rm -rf html $(DOCNAME).info $(DOCNAME).pdf $(DOCNAME).html $(DOCNAME).dvi $(DOCNAME).xml
+clean: texinfo-clean
diff --git a/doc/autotest_mk.html b/doc/autotest_mk.html
index 893cdb2..2cde4ed 100644
--- a/doc/autotest_mk.html
+++ b/doc/autotest_mk.html
@@ -7,7 +7,7 @@
 <link title="Top" rel="top" href="#Top">
 <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
 <!--
-Copyright (C) 2011 j8takagi-->
+Copyright (C) 2011-2013 j8takagi-->
 <meta http-equiv="Content-Style-Type" content="text/css">
 <style type="text/css"><!--
   pre.display { font-family:inherit }
@@ -294,9 +294,9 @@ Next:&nbsp;<a rel="next" accesskey="n" href="#About">About</a>
 <ul>
 <li><a href="#make-time-at-group">使用例</a>
 </li></ul>
-<li><a href="#make-cleantime-at-group">6.8 <kbd>make cleantime</kbd> - グループの計時結果をクリア</a>
+<li><a href="#make-time_002dclean-at-group">6.8 <kbd>make time-clean</kbd> - グループの計時結果をクリア</a>
 <ul>
-<li><a href="#make-cleantime-at-group">使用例</a>
+<li><a href="#make-time_002dclean-at-group">使用例</a>
 </li></ul>
 <li><a href="#Group-Files">6.9 グループディレクトリーのファイル</a>
 </li></ul>
@@ -318,17 +318,17 @@ Next:&nbsp;<a rel="next" accesskey="n" href="#About">About</a>
 <ul>
 <li><a href="#make-clean-at-test">使用例</a>
 </li></ul>
-<li><a href="#make-cleanall-at-test">7.5 <kbd>make cleanall</kbd> - テストの想定と結果をクリア</a>
+<li><a href="#make-all_002dclean-at-test">7.5 <kbd>make all-clean</kbd> - テストの想定と結果をクリア</a>
 <ul>
-<li><a href="#make-cleanall-at-test">使用例</a>
+<li><a href="#make-all_002dclean-at-test">使用例</a>
 </li></ul>
 <li><a href="#make-time-at-test">7.6 <kbd>make time</kbd> - テストの計時</a>
 <ul>
 <li><a href="#make-time-at-test">使用例</a>
 </li></ul>
-<li><a href="#make-cleantime-at-test">7.7 <kbd>make cleantime</kbd> - テスト計時結果のクリア</a>
+<li><a href="#make-time_002dclean-at-test">7.7 <kbd>make time-clean</kbd> - テスト計時結果のクリア</a>
 <ul>
-<li><a href="#make-cleantime-at-test">使用例</a>
+<li><a href="#make-time_002dclean-at-test">使用例</a>
 </li></ul>
 <li><a href="#Test-Files">7.8 テストディレクトリーのファイル</a>
 </li></ul>
@@ -924,79 +924,79 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#Tutorial-triangle">Tutorial triangle</
      <li>01_scalene
 
           <ul>
-<li><samp><span class="file">Makefile</span></samp> <a href="sample_triangle/01_scalene/desc.txt"><samp><span class="file">desc.txt</span></samp></a> <a href="sample_triangle/01_scalene/cmd.txt"><samp><span class="file">cmd</span></samp></a> <a href="sample_triangle/01_scalene/0.txt"><samp><span class="file">0.txt</span></samp></a>
+<li><samp><span class="file">Makefile</span></samp> <a href="sample/triangle/01_scalene/desc.txt"><samp><span class="file">desc.txt</span></samp></a> <a href="sample/triangle/01_scalene/cmd.txt"><samp><span class="file">cmd</span></samp></a> <a href="sample/triangle/01_scalene/0.txt"><samp><span class="file">0.txt</span></samp></a>
 </ul>
 
      <li>02_equilateral
 
           <ul>
-<li><samp><span class="file">Makefile</span></samp> <a href="sample_triangle/02_equilateral/desc.txt"><samp><span class="file">desc.txt</span></samp></a> <a href="sample_triangle/02_equilateral/cmd.txt"><samp><span class="file">cmd</span></samp></a> <a href="sample_triangle/02_equilateral/0.txt"><samp><span class="file">0.txt</span></samp></a>
+<li><samp><span class="file">Makefile</span></samp> <a href="sample/triangle/02_equilateral/desc.txt"><samp><span class="file">desc.txt</span></samp></a> <a href="sample/triangle/02_equilateral/cmd.txt"><samp><span class="file">cmd</span></samp></a> <a href="sample/triangle/02_equilateral/0.txt"><samp><span class="file">0.txt</span></samp></a>
 </ul>
 
      <li>03_isosceles
 
           <ul>
-<li><samp><span class="file">Makefile</span></samp> <a href="sample_triangle/03_isosceles/desc.txt"><samp><span class="file">desc.txt</span></samp></a> <a href="sample_triangle/03_isosceles/cmd.txt"><samp><span class="file">cmd</span></samp></a> <a href="sample_triangle/03_isosceles/0.txt"><samp><span class="file">0.txt</span></samp></a>
+<li><samp><span class="file">Makefile</span></samp> <a href="sample/triangle/03_isosceles/desc.txt"><samp><span class="file">desc.txt</span></samp></a> <a href="sample/triangle/03_isosceles/cmd.txt"><samp><span class="file">cmd</span></samp></a> <a href="sample/triangle/03_isosceles/0.txt"><samp><span class="file">0.txt</span></samp></a>
 </ul>
 
      <li>04_isosceles_c
 
           <ul>
-<li><samp><span class="file">Makefile</span></samp> <a href="sample_triangle/04_isosceles_c/desc.txt"><samp><span class="file">desc.txt</span></samp></a> <a href="sample_triangle/04_isosceles_c/cmd.txt"><samp><span class="file">cmd</span></samp></a> <a href="sample_triangle/04_isosceles_c/0.txt"><samp><span class="file">0.txt</span></samp></a>
+<li><samp><span class="file">Makefile</span></samp> <a href="sample/triangle/04_isosceles_c/desc.txt"><samp><span class="file">desc.txt</span></samp></a> <a href="sample/triangle/04_isosceles_c/cmd.txt"><samp><span class="file">cmd</span></samp></a> <a href="sample/triangle/04_isosceles_c/0.txt"><samp><span class="file">0.txt</span></samp></a>
 </ul>
 
      <li>05_zero
 
           <ul>
-<li><samp><span class="file">Makefile</span></samp> <a href="sample_triangle/05_zero/desc.txt"><samp><span class="file">desc.txt</span></samp></a> <a href="sample_triangle/05_zero/cmd.txt"><samp><span class="file">cmd</span></samp></a> <a href="sample_triangle/05_zero/0.txt"><samp><span class="file">0.txt</span></samp></a>
+<li><samp><span class="file">Makefile</span></samp> <a href="sample/triangle/05_zero/desc.txt"><samp><span class="file">desc.txt</span></samp></a> <a href="sample/triangle/05_zero/cmd.txt"><samp><span class="file">cmd</span></samp></a> <a href="sample/triangle/05_zero/0.txt"><samp><span class="file">0.txt</span></samp></a>
 </ul>
 
      <li>06_minus
 
           <ul>
-<li><samp><span class="file">Makefile</span></samp> <a href="sample_triangle/06_minus/desc.txt"><samp><span class="file">desc.txt</span></samp></a> <a href="sample_triangle/06_minus/cmd.txt"><samp><span class="file">cmd</span></samp></a> <a href="sample_triangle/06_minus/0.txt"><samp><span class="file">0.txt</span></samp></a>
+<li><samp><span class="file">Makefile</span></samp> <a href="sample/triangle/06_minus/desc.txt"><samp><span class="file">desc.txt</span></samp></a> <a href="sample/triangle/06_minus/cmd.txt"><samp><span class="file">cmd</span></samp></a> <a href="sample/triangle/06_minus/0.txt"><samp><span class="file">0.txt</span></samp></a>
 </ul>
 
      <li>07_line
 
           <ul>
-<li><samp><span class="file">Makefile</span></samp> <a href="sample_triangle/01_scalene/desc.txt"><samp><span class="file">desc.txt</span></samp></a> <a href="sample_triangle/01_scalene/cmd.txt"><samp><span class="file">cmd</span></samp></a> <a href="sample_triangle/01_scalene/0.txt"><samp><span class="file">0.txt</span></samp></a>
+<li><samp><span class="file">Makefile</span></samp> <a href="sample/triangle/01_scalene/desc.txt"><samp><span class="file">desc.txt</span></samp></a> <a href="sample/triangle/01_scalene/cmd.txt"><samp><span class="file">cmd</span></samp></a> <a href="sample/triangle/01_scalene/0.txt"><samp><span class="file">0.txt</span></samp></a>
 </ul>
 
      <li>08_lines
 
           <ul>
-<li><samp><span class="file">Makefile</span></samp> <a href="sample_triangle/08_lines/desc.txt"><samp><span class="file">desc.txt</span></samp></a> <a href="sample_triangle/08_lines/cmd.txt"><samp><span class="file">cmd</span></samp></a> <a href="sample_triangle/08_lines/0.txt"><samp><span class="file">0.txt</span></samp></a>
+<li><samp><span class="file">Makefile</span></samp> <a href="sample/triangle/08_lines/desc.txt"><samp><span class="file">desc.txt</span></samp></a> <a href="sample/triangle/08_lines/cmd.txt"><samp><span class="file">cmd</span></samp></a> <a href="sample/triangle/08_lines/0.txt"><samp><span class="file">0.txt</span></samp></a>
 </ul>
 
      <li>09_less
 
           <ul>
-<li><samp><span class="file">Makefile</span></samp> <a href="sample_triangle/09_less/desc.txt"><samp><span class="file">desc.txt</span></samp></a> <a href="sample_triangle/09_less/cmd.txt"><samp><span class="file">cmd</span></samp></a> <a href="sample_triangle/09_less/0.txt"><samp><span class="file">0.txt</span></samp></a>
+<li><samp><span class="file">Makefile</span></samp> <a href="sample/triangle/09_less/desc.txt"><samp><span class="file">desc.txt</span></samp></a> <a href="sample/triangle/09_less/cmd.txt"><samp><span class="file">cmd</span></samp></a> <a href="sample/triangle/09_less/0.txt"><samp><span class="file">0.txt</span></samp></a>
 </ul>
 
      <li>10_lesses
 
           <ul>
-<li><samp><span class="file">Makefile</span></samp> <a href="sample_triangle/10_lesses/desc.txt"><samp><span class="file">desc.txt</span></samp></a> <a href="sample_triangle/10_lesses/cmd.txt"><samp><span class="file">cmd</span></samp></a> <a href="sample_triangle/10_lesses/0.txt"><samp><span class="file">0.txt</span></samp></a>
+<li><samp><span class="file">Makefile</span></samp> <a href="sample/triangle/10_lesses/desc.txt"><samp><span class="file">desc.txt</span></samp></a> <a href="sample/triangle/10_lesses/cmd.txt"><samp><span class="file">cmd</span></samp></a> <a href="sample/triangle/10_lesses/0.txt"><samp><span class="file">0.txt</span></samp></a>
 </ul>
 
      <li>11_zeroall
 
           <ul>
-<li><samp><span class="file">Makefile</span></samp> <a href="sample_triangle/11_zeroall/desc.txt"><samp><span class="file">desc.txt</span></samp></a> <a href="sample_triangle/11_zeroall/cmd.txt"><samp><span class="file">cmd</span></samp></a> <a href="sample_triangle/11_zeroall/0.txt"><samp><span class="file">0.txt</span></samp></a>
+<li><samp><span class="file">Makefile</span></samp> <a href="sample/triangle/11_zeroall/desc.txt"><samp><span class="file">desc.txt</span></samp></a> <a href="sample/triangle/11_zeroall/cmd.txt"><samp><span class="file">cmd</span></samp></a> <a href="sample/triangle/11_zeroall/0.txt"><samp><span class="file">0.txt</span></samp></a>
 </ul>
 
      <li>12_notint
 
           <ul>
-<li><samp><span class="file">Makefile</span></samp> <a href="sample_triangle/12_notint/desc.txt"><samp><span class="file">desc.txt</span></samp></a> <a href="sample_triangle/12_notint/cmd.txt"><samp><span class="file">cmd</span></samp></a> <a href="sample_triangle/12_notint/0.txt"><samp><span class="file">0.txt</span></samp></a>
+<li><samp><span class="file">Makefile</span></samp> <a href="sample/triangle/12_notint/desc.txt"><samp><span class="file">desc.txt</span></samp></a> <a href="sample/triangle/12_notint/cmd.txt"><samp><span class="file">cmd</span></samp></a> <a href="sample/triangle/12_notint/0.txt"><samp><span class="file">0.txt</span></samp></a>
 </ul>
 
      <li>13_argcnt
 
           <ul>
-<li><samp><span class="file">Makefile</span></samp> <a href="sample_triangle/13_argcnt/desc.txt"><samp><span class="file">desc.txt</span></samp></a> <a href="sample_triangle/13_argcnt/cmd.txt"><samp><span class="file">cmd</span></samp></a> <a href="sample_triangle/13_argcnt/0.txt"><samp><span class="file">0.txt</span></samp></a>
+<li><samp><span class="file">Makefile</span></samp> <a href="sample/triangle/13_argcnt/desc.txt"><samp><span class="file">desc.txt</span></samp></a> <a href="sample/triangle/13_argcnt/cmd.txt"><samp><span class="file">cmd</span></samp></a> <a href="sample/triangle/13_argcnt/0.txt"><samp><span class="file">0.txt</span></samp></a>
 </ul>
      </ul>
 
@@ -1771,31 +1771,31 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#Tutorial-sort">Tutorial sort</a>
      <li>sort_001
 
           <ul>
-<li><samp><span class="file">Makefile</span></samp> <a href="sample_sort/sort_001/desc.txt"><samp><span class="file">desc.txt</span></samp></a> <a href="sample_sort/sort_001/cmd.c.txt"><samp><span class="file">cmd.c</span></samp></a> <a href="sample_sort/sort_001/0.txt"><samp><span class="file">0.txt</span></samp></a>
+<li><samp><span class="file">Makefile</span></samp> <a href="sample/sort/sort_001/desc.txt"><samp><span class="file">desc.txt</span></samp></a> <a href="sample/sort/sort_001/cmd.c.txt"><samp><span class="file">cmd.c</span></samp></a> <a href="sample/sort/sort_001/0.txt"><samp><span class="file">0.txt</span></samp></a>
 </ul>
 
      <li>sort_002
 
           <ul>
-<li><samp><span class="file">Makefile</span></samp> <a href="sample_sort/sort_002/desc.txt"><samp><span class="file">desc.txt</span></samp></a> <a href="sample_sort/sort_002/cmd.c.txt"><samp><span class="file">cmd.c</span></samp></a> <a href="sample_sort/sort_002/0.txt"><samp><span class="file">0.txt</span></samp></a>
+<li><samp><span class="file">Makefile</span></samp> <a href="sample/sort/sort_002/desc.txt"><samp><span class="file">desc.txt</span></samp></a> <a href="sample/sort/sort_002/cmd.c.txt"><samp><span class="file">cmd.c</span></samp></a> <a href="sample/sort/sort_002/0.txt"><samp><span class="file">0.txt</span></samp></a>
 </ul>
 
      <li>sort_003
 
           <ul>
-<li><samp><span class="file">Makefile</span></samp> <a href="sample_sort/sort_003/desc.txt"><samp><span class="file">desc.txt</span></samp></a> <a href="sample_sort/sort_003/cmd.c.txt"><samp><span class="file">cmd.c</span></samp></a> <a href="sample_sort/sort_003/0.txt"><samp><span class="file">0.txt</span></samp></a>
+<li><samp><span class="file">Makefile</span></samp> <a href="sample/sort/sort_003/desc.txt"><samp><span class="file">desc.txt</span></samp></a> <a href="sample/sort/sort_003/cmd.c.txt"><samp><span class="file">cmd.c</span></samp></a> <a href="sample/sort/sort_003/0.txt"><samp><span class="file">0.txt</span></samp></a>
 </ul>
 
      <li>sort_004
 
           <ul>
-<li><samp><span class="file">Makefile</span></samp> <a href="sample_sort/sort_004/desc.txt"><samp><span class="file">desc.txt</span></samp></a> <a href="sample_sort/sort_004/cmd.c.txt"><samp><span class="file">cmd.c</span></samp></a> <a href="sample_sort/sort_004/0.txt"><samp><span class="file">0.txt</span></samp></a>
+<li><samp><span class="file">Makefile</span></samp> <a href="sample/sort/sort_004/desc.txt"><samp><span class="file">desc.txt</span></samp></a> <a href="sample/sort/sort_004/cmd.c.txt"><samp><span class="file">cmd.c</span></samp></a> <a href="sample/sort/sort_004/0.txt"><samp><span class="file">0.txt</span></samp></a>
 </ul>
 
      <li>sort_005
 
           <ul>
-<li><samp><span class="file">Makefile</span></samp> <a href="sample_sort/sort_005/desc.txt"><samp><span class="file">desc.txt</span></samp></a> <a href="sample_sort/sort_005/cmd.c.txt"><samp><span class="file">cmd.c</span></samp></a> <a href="sample_sort/sort_005/0.txt"><samp><span class="file">0.txt</span></samp></a>
+<li><samp><span class="file">Makefile</span></samp> <a href="sample/sort/sort_005/desc.txt"><samp><span class="file">desc.txt</span></samp></a> <a href="sample/sort/sort_005/cmd.c.txt"><samp><span class="file">cmd.c</span></samp></a> <a href="sample/sort/sort_005/0.txt"><samp><span class="file">0.txt</span></samp></a>
 </ul>
      </ul>
 
@@ -2013,7 +2013,7 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#Top">Top</a>
 <li><a accesskey="5" href="#make-checkall">make checkall</a>:                <kbd>make checkall</kbd> - グループ内にあるすべてのテストの実行、計時
 <li><a accesskey="6" href="#make-clean-at-group">make clean at group</a>:          <kbd>make clean</kbd> - グループ内にあるすべてのテストで、実行結果をクリア
 <li><a accesskey="7" href="#make-time-at-group">make time at group</a>:           <kbd>make time</kbd> - グループ内にあるすべてのテストを計時
-<li><a accesskey="8" href="#make-cleantime-at-group">make cleantime at group</a>:      <kbd>make cleantime</kbd> - グループ内にあるすべてのテストで、計時結果をクリア
+<li><a accesskey="8" href="#make-time_002dclean-at-group">make time-clean at group</a>:      <kbd>make time-clean</kbd> - グループ内にあるすべてのテストで、計時結果をクリア
 <li><a accesskey="9" href="#Group-Files">Group Files</a>:                  グループのファイル
 </ul>
 
@@ -2163,7 +2163,7 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#Group-dir">Group dir</a>
  <div class="node">
 <a name="make-time-at-group"></a>
 <p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#make-cleantime-at-group">make cleantime at group</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#make-time_002dclean-at-group">make time-clean at group</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#make-clean-at-group">make clean at group</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#Group-dir">Group dir</a>
 
@@ -2216,7 +2216,8 @@ real    0m0.007s
 real    0m0.012s
 </pre>
  <div class="node">
-<a name="make-cleantime-at-group"></a>
+<a name="make-time-clean-at-group"></a>
+<a name="make-time_002dclean-at-group"></a>
 <p><hr>
 Next:&nbsp;<a rel="next" accesskey="n" href="#Group-Files">Group Files</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#make-time-at-group">make time at group</a>,
@@ -2224,18 +2225,18 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#Group-dir">Group dir</a>
 
 </div>
 
-<h3 class="section">6.8 <kbd>make cleantime</kbd> - グループの計時結果をクリア</h3>
+<h3 class="section">6.8 <kbd>make time-clean</kbd> - グループの計時結果をクリア</h3>
 
  <p><kbd>make cleatime</kbd>で、<kbd>make time</kbd>により作成されたテストグループディレクトリーと各テストディレクトリーのファイルをすべて削除します。
 
 <h4 class="unnumberedsubsec">使用例</h4>
 
-<pre class="example">$ <kbd>make cleantime</kbd>
+<pre class="example">$ <kbd>make time-clean</kbd>
 </pre>
  <div class="node">
 <a name="Group-Files"></a>
 <p><hr>
-Previous:&nbsp;<a rel="previous" accesskey="p" href="#make-cleantime-at-group">make cleantime at group</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="#make-time_002dclean-at-group">make time-clean at group</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#Group-dir">Group dir</a>
 
 </div>
@@ -2271,9 +2272,9 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#Top">Top</a>
 <li><a accesskey="2" href="#make-reset">make reset</a>:                   <kbd>make reset</kbd> - テスト想定の作成または更新
 <li><a accesskey="3" href="#make-check-at-test">make check at test</a>:           <kbd>make</kbd>または<kbd>make check</kbd> - テストの実行
 <li><a accesskey="4" href="#make-clean-at-test">make clean at test</a>:           <kbd>make clean</kbd> - テスト結果のクリア
-<li><a accesskey="5" href="#make-cleanall-at-test">make cleanall at test</a>:        <kbd>make cleanall</kbd> - テストの想定と結果をクリア
+<li><a accesskey="5" href="#make-all_002dclean-at-test">make all-clean at test</a>:        <kbd>make all-clean</kbd> - テストの想定と結果をクリア
 <li><a accesskey="6" href="#make-time-at-test">make time at test</a>:            <kbd>make time</kbd> - テストの計時
-<li><a accesskey="7" href="#make-cleantime-at-test">make cleantime at test</a>:       <kbd>make cleantime</kbd> - テスト計時結果のクリア
+<li><a accesskey="7" href="#make-time_002dclean-at-test">make time-clean at test</a>:       <kbd>make time-clean</kbd> - テスト計時結果のクリア
 <li><a accesskey="8" href="#Test-Files">Test Files</a>:                   テストディレクトリーのファイル
 </ul>
 
@@ -2344,7 +2345,7 @@ Detail in /home/foo/triangle/test/01_scalene/detail.log
  <div class="node">
 <a name="make-clean-at-test"></a>
 <p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#make-cleanall-at-test">make cleanall at test</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#make-all_002dclean-at-test">make all-clean at test</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#make-check-at-test">make check at test</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#Test-dir">Test dir</a>
 
@@ -2373,7 +2374,8 @@ $ <kbd>ls</kbd>
 0.txt  Makefile  cmd  desc.txt
 </pre>
  <div class="node">
-<a name="make-cleanall-at-test"></a>
+<a name="make-all-clean-at-test"></a>
+<a name="make-all_002dclean-at-test"></a>
 <p><hr>
 Next:&nbsp;<a rel="next" accesskey="n" href="#make-time-at-test">make time at test</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#make-clean-at-test">make clean at test</a>,
@@ -2381,7 +2383,7 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#Test-dir">Test dir</a>
 
 </div>
 
-<h3 class="section">7.5 <kbd>make cleanall</kbd> - テストの想定と結果をクリア</h3>
+<h3 class="section">7.5 <kbd>make all-clean</kbd> - テストの想定と結果をクリア</h3>
 
  <p><kbd>make clean</kbd>で次の、テストの想定ファイルとテストの実行または計時の結果作成されたファイルが削除されます。
 
@@ -2401,15 +2403,15 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#Test-dir">Test dir</a>
 
 <h4 class="unnumberedsubsec">使用例</h4>
 
-<pre class="example">$ <kbd>make cleanall</kbd>
+<pre class="example">$ <kbd>make all-clean</kbd>
 $ <kbd>ls</kbd>
 Makefile  cmd  desc.txt
 </pre>
  <div class="node">
 <a name="make-time-at-test"></a>
 <p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#make-cleantime-at-test">make cleantime at test</a>,
-Previous:&nbsp;<a rel="previous" accesskey="p" href="#make-cleanall-at-test">make cleanall at test</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#make-time_002dclean-at-test">make time-clean at test</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="#make-all_002dclean-at-test">make all-clean at test</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#Test-dir">Test dir</a>
 
 </div>
@@ -2424,7 +2426,8 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#Test-dir">Test dir</a>
 real  0m0.006s
 </pre>
  <div class="node">
-<a name="make-cleantime-at-test"></a>
+<a name="make-time-clean-at-test"></a>
+<a name="make-time_002dclean-at-test"></a>
 <p><hr>
 Next:&nbsp;<a rel="next" accesskey="n" href="#Test-Files">Test Files</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#make-time-at-test">make time at test</a>,
@@ -2432,9 +2435,9 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#Test-dir">Test dir</a>
 
 </div>
 
-<h3 class="section">7.7 <kbd>make cleantime</kbd> - テスト計時結果のクリア</h3>
+<h3 class="section">7.7 <kbd>make time-clean</kbd> - テスト計時結果のクリア</h3>
 
- <p><kbd>make cleantime</kbd>で、テストの計時の結果作成された次のファイルが削除されます。
+ <p><kbd>make time-clean</kbd>で、テストの計時の結果作成された次のファイルが削除されます。
 
      <ul>
 <li><samp><span class="file">time.log</span></samp>
@@ -2442,12 +2445,12 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#Test-dir">Test dir</a>
 
 <h4 class="unnumberedsubsec">使用例</h4>
 
-<pre class="example">$ <kbd>make cleantime</kbd>
+<pre class="example">$ <kbd>make time-clean</kbd>
 </pre>
  <div class="node">
 <a name="Test-Files"></a>
 <p><hr>
-Previous:&nbsp;<a rel="previous" accesskey="p" href="#make-cleantime-at-test">make cleantime at test</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="#make-time_002dclean-at-test">make time-clean at test</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#Test-dir">Test dir</a>
 
 </div>
@@ -2476,7 +2479,7 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#Test-dir">Test dir</a>
 
  <div class="footnote">
 <hr>
-<a name="texinfo-footnotes-in-document"></a><h4>Footnotes</h4><p class="footnote"><small>[<a name="fn-1" href="#fnd-1">1</a>]</small> 『ソフトウェア・テストの技法』では「カードから3つの整数を読む」となっているのを、「3つの引数をとる」に変更しています。</p>
+<a name="texinfo-footnotes-in-document"></a><h4>脚注</h4><p class="footnote"><small>[<a name="fn-1" href="#fnd-1">1</a>]</small> 『ソフトウェア・テストの技法』では「カードから3つの整数を読む」となっているのを、「3つの引数をとる」に変更しています。</p>
 
  <p class="footnote"><small>[<a name="fn-2" href="#fnd-2">2</a>]</small> 『ソフトウェア・テストの技法』では下記の13個に加え、「それぞれのテスト・ケースについて、入力の値に対して予想される値をしめしたか」というテスト・ケースが記載されています。このテスト・ケースは、Autotest.mkを実行している場合は自動的に満たされると考えています。</p>
 
diff --git a/doc/autotest_mk.texi b/doc/autotest_mk.texi
index 01a95ba..7b7d3aa 100644
--- a/doc/autotest_mk.texi
+++ b/doc/autotest_mk.texi
@@ -14,7 +14,7 @@
 @c %**end of header
 
 @copying
-Copyright @copyright{} 2011 j8takagi
+Copyright @copyright{} 2011-2013 j8takagi
 @end copying
 
 @dircategory Basics
@@ -107,7 +107,7 @@ Autotest.mk チュートリアルII - C言語@code{sort}関数のテスト
 * make checkall::               @kbd{make checkall} - グループ内にあるすべてのテストの実行、計時
 * make clean at group::         @kbd{make clean} - グループ内にあるすべてのテストで、実行結果をクリア
 * make time at group::          @kbd{make time} - グループ内にあるすべてのテストを計時
-* make cleantime at group::     @kbd{make cleantime} - グループ内にあるすべてのテストで、計時結果をクリア
+* make time-clean at group::     @kbd{make time-clean} - グループ内にあるすべてのテストで、計時結果をクリア
 * Group Files::                 グループのファイル
 
 テストディレクトリー マニュアル
@@ -116,9 +116,9 @@ Autotest.mk チュートリアルII - C言語@code{sort}関数のテスト
 * make reset::                  @kbd{make reset} - テスト想定の作成または更新
 * make check at test::          @kbd{make}または@kbd{make check} - テストの実行
 * make clean at test::          @kbd{make clean} - テスト結果のクリア
-* make cleanall at test::       @kbd{make cleanall} - テストの想定と結果をクリア
+* make all-clean at test::       @kbd{make all-clean} - テストの想定と結果をクリア
 * make time at test::           @kbd{make time} - テストの計時
-* make cleantime at test::      @kbd{make cleantime} - テスト計時結果のクリア
+* make time-clean at test::      @kbd{make time-clean} - テスト計時結果のクリア
 * Test Files::                  テストディレクトリーのファイル
 
 @end detailmenu
@@ -782,7 +782,7 @@ $ @kbd{ls}
 
 @itemize
 @item
-@file{Makefile} @uref{sample_triangle/01_scalene/desc.txt, @file{desc.txt}} @uref{sample_triangle/01_scalene/cmd.txt, @file{cmd}} @uref{sample_triangle/01_scalene/0.txt, @file{0.txt}}
+@file{Makefile} @uref{sample/triangle/01_scalene/desc.txt, @file{desc.txt}} @uref{sample/triangle/01_scalene/cmd.txt, @file{cmd}} @uref{sample/triangle/01_scalene/0.txt, @file{0.txt}}
 @end itemize
 
 @item
@@ -790,7 +790,7 @@ $ @kbd{ls}
 
 @itemize
 @item
-@file{Makefile} @uref{sample_triangle/02_equilateral/desc.txt, @file{desc.txt}} @uref{sample_triangle/02_equilateral/cmd.txt, @file{cmd}} @uref{sample_triangle/02_equilateral/0.txt, @file{0.txt}}
+@file{Makefile} @uref{sample/triangle/02_equilateral/desc.txt, @file{desc.txt}} @uref{sample/triangle/02_equilateral/cmd.txt, @file{cmd}} @uref{sample/triangle/02_equilateral/0.txt, @file{0.txt}}
 @end itemize
 
 @item
@@ -798,7 +798,7 @@ $ @kbd{ls}
 
 @itemize
 @item
-@file{Makefile} @uref{sample_triangle/03_isosceles/desc.txt, @file{desc.txt}} @uref{sample_triangle/03_isosceles/cmd.txt, @file{cmd}} @uref{sample_triangle/03_isosceles/0.txt, @file{0.txt}}
+@file{Makefile} @uref{sample/triangle/03_isosceles/desc.txt, @file{desc.txt}} @uref{sample/triangle/03_isosceles/cmd.txt, @file{cmd}} @uref{sample/triangle/03_isosceles/0.txt, @file{0.txt}}
 @end itemize
 
 
@@ -807,7 +807,7 @@ $ @kbd{ls}
 
 @itemize
 @item
-@file{Makefile} @uref{sample_triangle/04_isosceles_c/desc.txt, @file{desc.txt}} @uref{sample_triangle/04_isosceles_c/cmd.txt, @file{cmd}} @uref{sample_triangle/04_isosceles_c/0.txt, @file{0.txt}}
+@file{Makefile} @uref{sample/triangle/04_isosceles_c/desc.txt, @file{desc.txt}} @uref{sample/triangle/04_isosceles_c/cmd.txt, @file{cmd}} @uref{sample/triangle/04_isosceles_c/0.txt, @file{0.txt}}
 @end itemize
 
 @item
@@ -815,7 +815,7 @@ $ @kbd{ls}
 
 @itemize
 @item
-@file{Makefile} @uref{sample_triangle/05_zero/desc.txt, @file{desc.txt}} @uref{sample_triangle/05_zero/cmd.txt, @file{cmd}} @uref{sample_triangle/05_zero/0.txt, @file{0.txt}}
+@file{Makefile} @uref{sample/triangle/05_zero/desc.txt, @file{desc.txt}} @uref{sample/triangle/05_zero/cmd.txt, @file{cmd}} @uref{sample/triangle/05_zero/0.txt, @file{0.txt}}
 @end itemize
 
 @item
@@ -823,7 +823,7 @@ $ @kbd{ls}
 
 @itemize
 @item
-@file{Makefile} @uref{sample_triangle/06_minus/desc.txt, @file{desc.txt}} @uref{sample_triangle/06_minus/cmd.txt, @file{cmd}} @uref{sample_triangle/06_minus/0.txt, @file{0.txt}}
+@file{Makefile} @uref{sample/triangle/06_minus/desc.txt, @file{desc.txt}} @uref{sample/triangle/06_minus/cmd.txt, @file{cmd}} @uref{sample/triangle/06_minus/0.txt, @file{0.txt}}
 @end itemize
 
 @item
@@ -831,7 +831,7 @@ $ @kbd{ls}
 
 @itemize
 @item
-@file{Makefile} @uref{sample_triangle/01_scalene/desc.txt, @file{desc.txt}} @uref{sample_triangle/01_scalene/cmd.txt, @file{cmd}} @uref{sample_triangle/01_scalene/0.txt, @file{0.txt}}
+@file{Makefile} @uref{sample/triangle/01_scalene/desc.txt, @file{desc.txt}} @uref{sample/triangle/01_scalene/cmd.txt, @file{cmd}} @uref{sample/triangle/01_scalene/0.txt, @file{0.txt}}
 @end itemize
 
 @item
@@ -839,7 +839,7 @@ $ @kbd{ls}
 
 @itemize
 @item
-@file{Makefile} @uref{sample_triangle/08_lines/desc.txt, @file{desc.txt}} @uref{sample_triangle/08_lines/cmd.txt, @file{cmd}} @uref{sample_triangle/08_lines/0.txt, @file{0.txt}}
+@file{Makefile} @uref{sample/triangle/08_lines/desc.txt, @file{desc.txt}} @uref{sample/triangle/08_lines/cmd.txt, @file{cmd}} @uref{sample/triangle/08_lines/0.txt, @file{0.txt}}
 @end itemize
 
 @item
@@ -847,7 +847,7 @@ $ @kbd{ls}
 
 @itemize
 @item
-@file{Makefile} @uref{sample_triangle/09_less/desc.txt, @file{desc.txt}} @uref{sample_triangle/09_less/cmd.txt, @file{cmd}} @uref{sample_triangle/09_less/0.txt, @file{0.txt}}
+@file{Makefile} @uref{sample/triangle/09_less/desc.txt, @file{desc.txt}} @uref{sample/triangle/09_less/cmd.txt, @file{cmd}} @uref{sample/triangle/09_less/0.txt, @file{0.txt}}
 @end itemize
 
 @item
@@ -855,7 +855,7 @@ $ @kbd{ls}
 
 @itemize
 @item
-@file{Makefile} @uref{sample_triangle/10_lesses/desc.txt, @file{desc.txt}} @uref{sample_triangle/10_lesses/cmd.txt, @file{cmd}} @uref{sample_triangle/10_lesses/0.txt, @file{0.txt}}
+@file{Makefile} @uref{sample/triangle/10_lesses/desc.txt, @file{desc.txt}} @uref{sample/triangle/10_lesses/cmd.txt, @file{cmd}} @uref{sample/triangle/10_lesses/0.txt, @file{0.txt}}
 @end itemize
 
 @item
@@ -863,7 +863,7 @@ $ @kbd{ls}
 
 @itemize
 @item
-@file{Makefile} @uref{sample_triangle/11_zeroall/desc.txt, @file{desc.txt}} @uref{sample_triangle/11_zeroall/cmd.txt, @file{cmd}} @uref{sample_triangle/11_zeroall/0.txt, @file{0.txt}}
+@file{Makefile} @uref{sample/triangle/11_zeroall/desc.txt, @file{desc.txt}} @uref{sample/triangle/11_zeroall/cmd.txt, @file{cmd}} @uref{sample/triangle/11_zeroall/0.txt, @file{0.txt}}
 @end itemize
 
 @item
@@ -871,7 +871,7 @@ $ @kbd{ls}
 
 @itemize
 @item
-@file{Makefile} @uref{sample_triangle/12_notint/desc.txt, @file{desc.txt}} @uref{sample_triangle/12_notint/cmd.txt, @file{cmd}} @uref{sample_triangle/12_notint/0.txt, @file{0.txt}}
+@file{Makefile} @uref{sample/triangle/12_notint/desc.txt, @file{desc.txt}} @uref{sample/triangle/12_notint/cmd.txt, @file{cmd}} @uref{sample/triangle/12_notint/0.txt, @file{0.txt}}
 @end itemize
 
 @item
@@ -879,7 +879,7 @@ $ @kbd{ls}
 
 @itemize
 @item
-@file{Makefile} @uref{sample_triangle/13_argcnt/desc.txt, @file{desc.txt}} @uref{sample_triangle/13_argcnt/cmd.txt, @file{cmd}} @uref{sample_triangle/13_argcnt/0.txt, @file{0.txt}}
+@file{Makefile} @uref{sample/triangle/13_argcnt/desc.txt, @file{desc.txt}} @uref{sample/triangle/13_argcnt/cmd.txt, @file{cmd}} @uref{sample/triangle/13_argcnt/0.txt, @file{0.txt}}
 @end itemize
 @end ifhtml
 @end itemize
@@ -1666,7 +1666,7 @@ sort_001
 
 @itemize
 @item
-@file{Makefile} @uref{sample_sort/sort_001/desc.txt, @file{desc.txt}} @uref{sample_sort/sort_001/cmd.c.txt, @file{cmd.c}} @uref{sample_sort/sort_001/0.txt, @file{0.txt}}
+@file{Makefile} @uref{sample/sort/sort_001/desc.txt, @file{desc.txt}} @uref{sample/sort/sort_001/cmd.c.txt, @file{cmd.c}} @uref{sample/sort/sort_001/0.txt, @file{0.txt}}
 @end itemize
 
 @item
@@ -1674,7 +1674,7 @@ sort_002
 
 @itemize
 @item
-@file{Makefile} @uref{sample_sort/sort_002/desc.txt, @file{desc.txt}} @uref{sample_sort/sort_002/cmd.c.txt, @file{cmd.c}} @uref{sample_sort/sort_002/0.txt, @file{0.txt}}
+@file{Makefile} @uref{sample/sort/sort_002/desc.txt, @file{desc.txt}} @uref{sample/sort/sort_002/cmd.c.txt, @file{cmd.c}} @uref{sample/sort/sort_002/0.txt, @file{0.txt}}
 @end itemize
 
 @item
@@ -1682,7 +1682,7 @@ sort_003
 
 @itemize
 @item
-@file{Makefile} @uref{sample_sort/sort_003/desc.txt, @file{desc.txt}} @uref{sample_sort/sort_003/cmd.c.txt, @file{cmd.c}} @uref{sample_sort/sort_003/0.txt, @file{0.txt}}
+@file{Makefile} @uref{sample/sort/sort_003/desc.txt, @file{desc.txt}} @uref{sample/sort/sort_003/cmd.c.txt, @file{cmd.c}} @uref{sample/sort/sort_003/0.txt, @file{0.txt}}
 @end itemize
 
 
@@ -1691,7 +1691,7 @@ sort_004
 
 @itemize
 @item
-@file{Makefile} @uref{sample_sort/sort_004/desc.txt, @file{desc.txt}} @uref{sample_sort/sort_004/cmd.c.txt, @file{cmd.c}} @uref{sample_sort/sort_004/0.txt, @file{0.txt}}
+@file{Makefile} @uref{sample/sort/sort_004/desc.txt, @file{desc.txt}} @uref{sample/sort/sort_004/cmd.c.txt, @file{cmd.c}} @uref{sample/sort/sort_004/0.txt, @file{0.txt}}
 @end itemize
 
 @item
@@ -1699,7 +1699,7 @@ sort_005
 
 @itemize
 @item
-@file{Makefile} @uref{sample_sort/sort_005/desc.txt, @file{desc.txt}} @uref{sample_sort/sort_005/cmd.c.txt, @file{cmd.c}} @uref{sample_sort/sort_005/0.txt, @file{0.txt}}
+@file{Makefile} @uref{sample/sort/sort_005/desc.txt, @file{desc.txt}} @uref{sample/sort/sort_005/cmd.c.txt, @file{cmd.c}} @uref{sample/sort/sort_005/0.txt, @file{0.txt}}
 @end itemize
 @end ifhtml
 @end itemize
@@ -1893,7 +1893,7 @@ $ @kbd{make GROUPDIR=~/triangle/test}
 * make checkall::               @kbd{make checkall} - グループ内にあるすべてのテストの実行、計時
 * make clean at group::         @kbd{make clean} - グループ内にあるすべてのテストで、実行結果をクリア
 * make time at group::          @kbd{make time} - グループ内にあるすべてのテストを計時
-* make cleantime at group::     @kbd{make cleantime} - グループ内にあるすべてのテストで、計時結果をクリア
+* make time-clean at group::     @kbd{make time-clean} - グループ内にあるすべてのテストで、計時結果をクリア
 * Group Files::                 グループのファイル
 @end menu
 
@@ -2009,7 +2009,7 @@ test: All tests are succeded.
 $ @kbd{make clean}
 @end example
 
-@node make time at group, make cleantime at group, make clean at group, Group dir
+@node make time at group, make time-clean at group, make clean at group, Group dir
 @section @kbd{make time} - グループ内にあるすべてのテストを計時
 
 @kbd{make time}で、グループ内にあるすべてのテストを計時し、その結果が表示されます。計時結果は、@file{<テストグループ名を大文字にした文字列>_time.log}に格納されます。
@@ -2058,18 +2058,18 @@ real    0m0.007s
 real    0m0.012s
 @end example
 
-@node make cleantime at group, Group Files, make time at group, Group dir
-@section @kbd{make cleantime} - グループの計時結果をクリア
+@node make time-clean at group, Group Files, make time at group, Group dir
+@section @kbd{make time-clean} - グループの計時結果をクリア
 
 @kbd{make cleatime}で、@kbd{make time}により作成されたテストグループディレクトリーと各テストディレクトリーのファイルをすべて削除します。
 
 @unnumberedsubsec 使用例
 
 @example
-$ @kbd{make cleantime}
+$ @kbd{make time-clean}
 @end example
 
-@node Group Files,  , make cleantime at group, Group dir
+@node Group Files,  , make time-clean at group, Group dir
 @section グループディレクトリーのファイル
 
 グループディレクトリーには、テストディレクトリーに加えて、次のファイルが含まれます。
@@ -2099,9 +2099,9 @@ $ @kbd{make cleantime}
 * make reset::                  @kbd{make reset} - テスト想定の作成または更新
 * make check at test::          @kbd{make}または@kbd{make check} - テストの実行
 * make clean at test::          @kbd{make clean} - テスト結果のクリア
-* make cleanall at test::       @kbd{make cleanall} - テストの想定と結果をクリア
+* make all-clean at test::       @kbd{make all-clean} - テストの想定と結果をクリア
 * make time at test::           @kbd{make time} - テストの計時
-* make cleantime at test::      @kbd{make cleantime} - テスト計時結果のクリア
+* make time-clean at test::      @kbd{make time-clean} - テスト計時結果のクリア
 * Test Files::                  テストディレクトリーのファイル
 @end menu
 
@@ -2148,7 +2148,7 @@ $ @kbd{make}
 Detail in /home/foo/triangle/test/01_scalene/detail.log
 @end example
 
-@node make clean at test, make cleanall at test, make check at test, Test dir
+@node make clean at test, make all-clean at test, make check at test, Test dir
 @section @kbd{make clean} - テスト結果のクリア
 @kbd{make clean}で、テストの実行または計時の結果作成された次のファイルが削除されます。
 
@@ -2176,8 +2176,8 @@ $ @kbd{ls}
 0.txt  Makefile  cmd  desc.txt
 @end example
 
-@node make cleanall at test, make time at test, make clean at test, Test dir
-@section @kbd{make cleanall} - テストの想定と結果をクリア
+@node make all-clean at test, make time at test, make clean at test, Test dir
+@section @kbd{make all-clean} - テストの想定と結果をクリア
 @kbd{make clean}で次の、テストの想定ファイルとテストの実行または計時の結果作成されたファイルが削除されます。
 
 @itemize
@@ -2202,13 +2202,13 @@ $ @kbd{ls}
 
 @unnumberedsubsec 使用例
 @example
-$ @kbd{make cleanall}
+$ @kbd{make all-clean}
 $ @kbd{ls}
 Makefile  cmd  desc.txt
 @end example
 
 
-@node make time at test, make cleantime at test, make cleanall at test, Test dir
+@node make time at test, make time-clean at test, make all-clean at test, Test dir
 @section @kbd{make time} - テストの計時
 @kbd{make time}で、テストを計時しその結果が表示されます。計時結果は、@file{time.log}に格納されます。
 
@@ -2218,9 +2218,9 @@ $ @kbd{make time}
 real  0m0.006s
 @end example
 
-@node make cleantime at test, Test Files, make time at test, Test dir
-@section @kbd{make cleantime} - テスト計時結果のクリア
-@kbd{make cleantime}で、テストの計時の結果作成された次のファイルが削除されます。
+@node make time-clean at test, Test Files, make time at test, Test dir
+@section @kbd{make time-clean} - テスト計時結果のクリア
+@kbd{make time-clean}で、テストの計時の結果作成された次のファイルが削除されます。
 
 @itemize
 @item
@@ -2230,10 +2230,10 @@ real  0m0.006s
 @unnumberedsubsec 使用例
 
 @example
-$ @kbd{make cleantime}
+$ @kbd{make time-clean}
 @end example
 
-@node Test Files,  , make cleantime at test, Test dir
+@node Test Files,  , make time-clean at test, Test dir
 @section テストディレクトリーのファイル
 @table @file
 @item Makefile
diff --git a/doc/sample_sort/sort_001/0.txt b/doc/sample_sort/sort_001/0.txt
deleted file mode 100644
index 935d69f..0000000
--- a/doc/sample_sort/sort_001/0.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-2
-3
-5
-7
-11
diff --git a/doc/sample_sort/sort_001/cmd.c.txt b/doc/sample_sort/sort_001/cmd.c.txt
deleted file mode 100644
index b84237a..0000000
--- a/doc/sample_sort/sort_001/cmd.c.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <stdio.h>
-#ifndef ARRAYSIZE
-#define ARRAYSIZE(array) (sizeof(array)/sizeof(array[0]))
-#endif
-
-void sort(int array[], int num);
-
-int main() {
-    int i, array[] = {11, 7, 5, 3, 2};
-
-    sort(array, ARRAYSIZE(array));
-    for(i = 0; i < ARRAYSIZE(array); i++) {
-        printf("%d\n", array[i]);
-    }
-    return 0;
-}
diff --git a/doc/sample_sort/sort_001/desc.txt b/doc/sample_sort/sort_001/desc.txt
deleted file mode 100644
index c33e7d4..0000000
--- a/doc/sample_sort/sort_001/desc.txt
+++ /dev/null
@@ -1 +0,0 @@
-テスト関数1
diff --git a/doc/sample_sort/sort_001/makefile.txt b/doc/sample_sort/sort_001/makefile.txt
deleted file mode 100644
index 932253b..0000000
--- a/doc/sample_sort/sort_001/makefile.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-include ../Define.mk
-include ../Test.mk
-
-CC := gcc
-CFLAGS := -Wall
-
-.INTERMEDIATE: $(CMD_FILE)
-
-CMDSRC_FILE := cmd.c
-TESTTARGET_FILES := ../../sort.c      # Set test target files
-
-$(CMD_FILE): $(CMDSRC_FILE) $(TESTTARGET_FILES)
-	$(CC) $(CFLAGS) -o $@ $^
diff --git a/doc/sample_sort/sort_002/0.txt b/doc/sample_sort/sort_002/0.txt
deleted file mode 100644
index 00750ed..0000000
--- a/doc/sample_sort/sort_002/0.txt
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/doc/sample_sort/sort_002/cmd.c.txt b/doc/sample_sort/sort_002/cmd.c.txt
deleted file mode 100644
index f42eff3..0000000
--- a/doc/sample_sort/sort_002/cmd.c.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <stdio.h>
-#ifndef ARRAYSIZE
-#define ARRAYSIZE(array) (sizeof(array)/sizeof(array[0]))
-#endif
-
-void sort(int array[], int num);
-
-int main() {
-    int i, array[] = {3};
-
-    sort(array, ARRAYSIZE(array));
-    for(i = 0; i < ARRAYSIZE(array); i++) {
-        printf("%d\n", array[i]);
-    }
-    return 0;
-}
diff --git a/doc/sample_sort/sort_002/desc.txt b/doc/sample_sort/sort_002/desc.txt
deleted file mode 100644
index b2842f0..0000000
--- a/doc/sample_sort/sort_002/desc.txt
+++ /dev/null
@@ -1 +0,0 @@
-テスト関数2
diff --git a/doc/sample_sort/sort_002/makefile.txt b/doc/sample_sort/sort_002/makefile.txt
deleted file mode 100644
index 932253b..0000000
--- a/doc/sample_sort/sort_002/makefile.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-include ../Define.mk
-include ../Test.mk
-
-CC := gcc
-CFLAGS := -Wall
-
-.INTERMEDIATE: $(CMD_FILE)
-
-CMDSRC_FILE := cmd.c
-TESTTARGET_FILES := ../../sort.c      # Set test target files
-
-$(CMD_FILE): $(CMDSRC_FILE) $(TESTTARGET_FILES)
-	$(CC) $(CFLAGS) -o $@ $^
diff --git a/doc/sample_sort/sort_003/0.txt b/doc/sample_sort/sort_003/0.txt
deleted file mode 100644
index 935d69f..0000000
--- a/doc/sample_sort/sort_003/0.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-2
-3
-5
-7
-11
diff --git a/doc/sample_sort/sort_003/cmd.c.txt b/doc/sample_sort/sort_003/cmd.c.txt
deleted file mode 100644
index 659a492..0000000
--- a/doc/sample_sort/sort_003/cmd.c.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <stdio.h>
-#ifndef ARRAYSIZE
-#define ARRAYSIZE(array) (sizeof(array)/sizeof(array[0]))
-#endif
-
-void sort(int array[], int num);
-
-int main() {
-    int i, array[] = {7, 11, 3, 2, 5};
-
-    sort(array, ARRAYSIZE(array));
-    for(i = 0; i < ARRAYSIZE(array); i++) {
-        printf("%d\n", array[i]);
-    }
-    return 0;
-}
diff --git a/doc/sample_sort/sort_003/desc.txt b/doc/sample_sort/sort_003/desc.txt
deleted file mode 100644
index 186832e..0000000
--- a/doc/sample_sort/sort_003/desc.txt
+++ /dev/null
@@ -1 +0,0 @@
-テスト関数3
diff --git a/doc/sample_sort/sort_003/makefile.txt b/doc/sample_sort/sort_003/makefile.txt
deleted file mode 100644
index 932253b..0000000
--- a/doc/sample_sort/sort_003/makefile.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-include ../Define.mk
-include ../Test.mk
-
-CC := gcc
-CFLAGS := -Wall
-
-.INTERMEDIATE: $(CMD_FILE)
-
-CMDSRC_FILE := cmd.c
-TESTTARGET_FILES := ../../sort.c      # Set test target files
-
-$(CMD_FILE): $(CMDSRC_FILE) $(TESTTARGET_FILES)
-	$(CC) $(CFLAGS) -o $@ $^
diff --git a/doc/sample_sort/sort_004/0.txt b/doc/sample_sort/sort_004/0.txt
deleted file mode 100644
index f00c965..0000000
--- a/doc/sample_sort/sort_004/0.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-1
-2
-3
-4
-5
-6
-7
-8
-9
-10
diff --git a/doc/sample_sort/sort_004/cmd.c.txt b/doc/sample_sort/sort_004/cmd.c.txt
deleted file mode 100644
index 7223648..0000000
--- a/doc/sample_sort/sort_004/cmd.c.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <stdio.h>
-#ifndef ARRAYSIZE
-#define ARRAYSIZE(array) (sizeof(array)/sizeof(array[0]))
-#endif
-
-void sort(int array[], int num);
-
-int main() {
-    int i, array[] = {10, 9, 8, 7, 6, 5, 4, 3, 2, 1};
-
-    sort(array, ARRAYSIZE(array));
-    for(i = 0; i < ARRAYSIZE(array); i++) {
-        printf("%d\n", array[i]);
-    }
-    return 0;
-}
diff --git a/doc/sample_sort/sort_004/desc.txt b/doc/sample_sort/sort_004/desc.txt
deleted file mode 100644
index 5a14692..0000000
--- a/doc/sample_sort/sort_004/desc.txt
+++ /dev/null
@@ -1 +0,0 @@
-テスト関数4
diff --git a/doc/sample_sort/sort_004/makefile.txt b/doc/sample_sort/sort_004/makefile.txt
deleted file mode 100644
index 932253b..0000000
--- a/doc/sample_sort/sort_004/makefile.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-include ../Define.mk
-include ../Test.mk
-
-CC := gcc
-CFLAGS := -Wall
-
-.INTERMEDIATE: $(CMD_FILE)
-
-CMDSRC_FILE := cmd.c
-TESTTARGET_FILES := ../../sort.c      # Set test target files
-
-$(CMD_FILE): $(CMDSRC_FILE) $(TESTTARGET_FILES)
-	$(CC) $(CFLAGS) -o $@ $^
diff --git a/doc/sample_sort/sort_005/0.txt b/doc/sample_sort/sort_005/0.txt
deleted file mode 100644
index f00c965..0000000
--- a/doc/sample_sort/sort_005/0.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-1
-2
-3
-4
-5
-6
-7
-8
-9
-10
diff --git a/doc/sample_sort/sort_005/cmd.c.txt b/doc/sample_sort/sort_005/cmd.c.txt
deleted file mode 100644
index eb7a76f..0000000
--- a/doc/sample_sort/sort_005/cmd.c.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <stdio.h>
-#ifndef ARRAYSIZE
-#define ARRAYSIZE(array) (sizeof(array)/sizeof(array[0]))
-#endif
-
-void sort(int array[], int num);
-
-int main() {
-    int i, array[] = {2, 9, 3, 6, 10, 5, 8, 4, 1, 7};
-
-    sort(array, ARRAYSIZE(array));
-    for(i = 0; i < ARRAYSIZE(array); i++) {
-        printf("%d\n", array[i]);
-    }
-    return 0;
-}
diff --git a/doc/sample_sort/sort_005/desc.txt b/doc/sample_sort/sort_005/desc.txt
deleted file mode 100644
index 81d48ce..0000000
--- a/doc/sample_sort/sort_005/desc.txt
+++ /dev/null
@@ -1 +0,0 @@
-テスト関数5
diff --git a/doc/sample_sort/sort_005/makefile.txt b/doc/sample_sort/sort_005/makefile.txt
deleted file mode 100644
index c46a82a..0000000
--- a/doc/sample_sort/sort_005/makefile.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-include ../Define.mk
-include ../Test.mk
-
-CC := gcc
-CFLAGS := -Wall
-
-.INTERMEDIATE: $(CMD_FILE)
-
-CMDSRC_FILE := cmd.c
-TESTTARGET_FILES := ../../sort.c      # Set test target files
-
-$(CMD_FILE): $(CMDSRC_FILE) $(TESTTARGET_FILES)
-	$(CC) $(CFLAGS) -o $@ $^ >compile.log 2>&1
diff --git a/doc/sample_triangle/01_scalene/0.txt b/doc/sample_triangle/01_scalene/0.txt
deleted file mode 100644
index 2172c8f..0000000
--- a/doc/sample_triangle/01_scalene/0.txt
+++ /dev/null
@@ -1 +0,0 @@
-scalene triangle
diff --git a/doc/sample_triangle/01_scalene/cmd.txt b/doc/sample_triangle/01_scalene/cmd.txt
deleted file mode 100755
index 7362956..0000000
--- a/doc/sample_triangle/01_scalene/cmd.txt
+++ /dev/null
@@ -1 +0,0 @@
-../../triangle 3 4 5
diff --git a/doc/sample_triangle/01_scalene/desc.txt b/doc/sample_triangle/01_scalene/desc.txt
deleted file mode 100644
index 029a05f..0000000
--- a/doc/sample_triangle/01_scalene/desc.txt
+++ /dev/null
@@ -1 +0,0 @@
-有効な不等辺三角形をあらわすテスト・ケース
diff --git a/doc/sample_triangle/02_equilateral/0.txt b/doc/sample_triangle/02_equilateral/0.txt
deleted file mode 100644
index 6704fca..0000000
--- a/doc/sample_triangle/02_equilateral/0.txt
+++ /dev/null
@@ -1 +0,0 @@
-equilateral triangle
diff --git a/doc/sample_triangle/02_equilateral/cmd.txt b/doc/sample_triangle/02_equilateral/cmd.txt
deleted file mode 100755
index 2ebe2a3..0000000
--- a/doc/sample_triangle/02_equilateral/cmd.txt
+++ /dev/null
@@ -1 +0,0 @@
-../../triangle 4 4 4
diff --git a/doc/sample_triangle/02_equilateral/desc.txt b/doc/sample_triangle/02_equilateral/desc.txt
deleted file mode 100644
index 48a23ac..0000000
--- a/doc/sample_triangle/02_equilateral/desc.txt
+++ /dev/null
@@ -1 +0,0 @@
-有効な正三角形をあらわすテスト・ケース
diff --git a/doc/sample_triangle/03_isosceles/0.txt b/doc/sample_triangle/03_isosceles/0.txt
deleted file mode 100644
index 4e9e0ff..0000000
--- a/doc/sample_triangle/03_isosceles/0.txt
+++ /dev/null
@@ -1 +0,0 @@
-isosceles triangle
diff --git a/doc/sample_triangle/03_isosceles/cmd.txt b/doc/sample_triangle/03_isosceles/cmd.txt
deleted file mode 100755
index d497a25..0000000
--- a/doc/sample_triangle/03_isosceles/cmd.txt
+++ /dev/null
@@ -1 +0,0 @@
-../../triangle 2 4 4
diff --git a/doc/sample_triangle/03_isosceles/desc.txt b/doc/sample_triangle/03_isosceles/desc.txt
deleted file mode 100644
index fe911dc..0000000
--- a/doc/sample_triangle/03_isosceles/desc.txt
+++ /dev/null
@@ -1 +0,0 @@
-有効な二等辺三角形をあらわすテスト・ケース
diff --git a/doc/sample_triangle/04_isosceles_c/0.txt b/doc/sample_triangle/04_isosceles_c/0.txt
deleted file mode 100644
index b7333a3..0000000
--- a/doc/sample_triangle/04_isosceles_c/0.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-isosceles triangle
-isosceles triangle
-isosceles triangle
diff --git a/doc/sample_triangle/04_isosceles_c/cmd.txt b/doc/sample_triangle/04_isosceles_c/cmd.txt
deleted file mode 100755
index 3cfb153..0000000
--- a/doc/sample_triangle/04_isosceles_c/cmd.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-../../triangle 3 3 4
-../../triangle 3 4 3
-../../triangle 4 3 3
diff --git a/doc/sample_triangle/04_isosceles_c/desc.txt b/doc/sample_triangle/04_isosceles_c/desc.txt
deleted file mode 100644
index 5e8bc08..0000000
--- a/doc/sample_triangle/04_isosceles_c/desc.txt
+++ /dev/null
@@ -1 +0,0 @@
-有効な二等辺三角形で2つの等辺を含む3種類の組合せすべてをためすことができる3つのテスト・ケース
diff --git a/doc/sample_triangle/05_zero/0.txt b/doc/sample_triangle/05_zero/0.txt
deleted file mode 100644
index 0456fff..0000000
--- a/doc/sample_triangle/05_zero/0.txt
+++ /dev/null
@@ -1 +0,0 @@
-not triangle
diff --git a/doc/sample_triangle/05_zero/cmd.txt b/doc/sample_triangle/05_zero/cmd.txt
deleted file mode 100755
index c9ab8c0..0000000
--- a/doc/sample_triangle/05_zero/cmd.txt
+++ /dev/null
@@ -1 +0,0 @@
-../../triangle 3 4 0
diff --git a/doc/sample_triangle/05_zero/desc.txt b/doc/sample_triangle/05_zero/desc.txt
deleted file mode 100644
index 4ab99f3..0000000
--- a/doc/sample_triangle/05_zero/desc.txt
+++ /dev/null
@@ -1 +0,0 @@
-1つの辺がゼロの値をもつテスト・ケース
diff --git a/doc/sample_triangle/06_minus/0.txt b/doc/sample_triangle/06_minus/0.txt
deleted file mode 100644
index 2c240ac..0000000
--- a/doc/sample_triangle/06_minus/0.txt
+++ /dev/null
@@ -1 +0,0 @@
--1: less than zero
diff --git a/doc/sample_triangle/06_minus/cmd.txt b/doc/sample_triangle/06_minus/cmd.txt
deleted file mode 100755
index 665928f..0000000
--- a/doc/sample_triangle/06_minus/cmd.txt
+++ /dev/null
@@ -1 +0,0 @@
-../../triangle -1 3 4
diff --git a/doc/sample_triangle/06_minus/desc.txt b/doc/sample_triangle/06_minus/desc.txt
deleted file mode 100644
index 08d1e83..0000000
--- a/doc/sample_triangle/06_minus/desc.txt
+++ /dev/null
@@ -1 +0,0 @@
-1つの辺が負の値をしめすテスト・ケース
diff --git a/doc/sample_triangle/07_line/0.txt b/doc/sample_triangle/07_line/0.txt
deleted file mode 100644
index 0456fff..0000000
--- a/doc/sample_triangle/07_line/0.txt
+++ /dev/null
@@ -1 +0,0 @@
-not triangle
diff --git a/doc/sample_triangle/07_line/cmd.txt b/doc/sample_triangle/07_line/cmd.txt
deleted file mode 100755
index 24eec4b..0000000
--- a/doc/sample_triangle/07_line/cmd.txt
+++ /dev/null
@@ -1 +0,0 @@
-../../triangle 1 2 3
diff --git a/doc/sample_triangle/07_line/desc.txt b/doc/sample_triangle/07_line/desc.txt
deleted file mode 100644
index d9c6d52..0000000
--- a/doc/sample_triangle/07_line/desc.txt
+++ /dev/null
@@ -1 +0,0 @@
-ゼロより大きい3つの整数をもち、そのうち2つの和がそれ以外の1つと等しいようなテスト・ケース
diff --git a/doc/sample_triangle/08_lines/0.txt b/doc/sample_triangle/08_lines/0.txt
deleted file mode 100644
index e3af1aa..0000000
--- a/doc/sample_triangle/08_lines/0.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-not triangle
-not triangle
-not triangle
-not triangle
-not triangle
-not triangle
diff --git a/doc/sample_triangle/08_lines/cmd.txt b/doc/sample_triangle/08_lines/cmd.txt
deleted file mode 100755
index c7dfd96..0000000
--- a/doc/sample_triangle/08_lines/cmd.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-../../triangle 1 2 3
-../../triangle 1 3 2
-../../triangle 2 1 3
-../../triangle 2 3 1
-../../triangle 3 1 2
-../../triangle 3 2 1
diff --git a/doc/sample_triangle/08_lines/desc.txt b/doc/sample_triangle/08_lines/desc.txt
deleted file mode 100644
index 797413c..0000000
--- a/doc/sample_triangle/08_lines/desc.txt
+++ /dev/null
@@ -1 +0,0 @@
-1辺の長さが他の2辺の長さの和に等しいことを3種類の順列のすべてに対してためすことのできるテスト・ケース
diff --git a/doc/sample_triangle/09_less/0.txt b/doc/sample_triangle/09_less/0.txt
deleted file mode 100644
index 4552d92..0000000
--- a/doc/sample_triangle/09_less/0.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-not triangle
-not triangle
diff --git a/doc/sample_triangle/09_less/cmd.txt b/doc/sample_triangle/09_less/cmd.txt
deleted file mode 100755
index acad848..0000000
--- a/doc/sample_triangle/09_less/cmd.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-../../triangle 1 2 4
-../../triangle 12 15 30
diff --git a/doc/sample_triangle/09_less/desc.txt b/doc/sample_triangle/09_less/desc.txt
deleted file mode 100644
index c02c0a9..0000000
--- a/doc/sample_triangle/09_less/desc.txt
+++ /dev/null
@@ -1 +0,0 @@
-ゼロより大きな3つの整数のうち、2つの数の和がそれ以外の1つの数より小さくなるテストケース
diff --git a/doc/sample_triangle/10_lesses/0.txt b/doc/sample_triangle/10_lesses/0.txt
deleted file mode 100644
index e3af1aa..0000000
--- a/doc/sample_triangle/10_lesses/0.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-not triangle
-not triangle
-not triangle
-not triangle
-not triangle
-not triangle
diff --git a/doc/sample_triangle/10_lesses/cmd.txt b/doc/sample_triangle/10_lesses/cmd.txt
deleted file mode 100755
index 9f3ced4..0000000
--- a/doc/sample_triangle/10_lesses/cmd.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-../../triangle 1 2 4
-../../triangle 1 4 2
-../../triangle 2 4 1
-../../triangle 2 1 4
-../../triangle 4 1 2
-../../triangle 4 2 1
diff --git a/doc/sample_triangle/10_lesses/desc.txt b/doc/sample_triangle/10_lesses/desc.txt
deleted file mode 100644
index 3940632..0000000
--- a/doc/sample_triangle/10_lesses/desc.txt
+++ /dev/null
@@ -1 +0,0 @@
-ゼロより大きな3つの整数のうち、2つの数の和がそれ以外の1つの数より小さくなることにおいて、3種類の順列すべてを考慮することのできるテストケース
diff --git a/doc/sample_triangle/11_zeroall/0.txt b/doc/sample_triangle/11_zeroall/0.txt
deleted file mode 100644
index 0456fff..0000000
--- a/doc/sample_triangle/11_zeroall/0.txt
+++ /dev/null
@@ -1 +0,0 @@
-not triangle
diff --git a/doc/sample_triangle/11_zeroall/cmd.txt b/doc/sample_triangle/11_zeroall/cmd.txt
deleted file mode 100755
index 6357f33..0000000
--- a/doc/sample_triangle/11_zeroall/cmd.txt
+++ /dev/null
@@ -1 +0,0 @@
-../../triangle 0 0 0
diff --git a/doc/sample_triangle/11_zeroall/desc.txt b/doc/sample_triangle/11_zeroall/desc.txt
deleted file mode 100644
index d4144c8..0000000
--- a/doc/sample_triangle/11_zeroall/desc.txt
+++ /dev/null
@@ -1 +0,0 @@
-すべての辺がゼロであるテスト・ケース
diff --git a/doc/sample_triangle/12_notint/0.txt b/doc/sample_triangle/12_notint/0.txt
deleted file mode 100644
index 259bbde..0000000
--- a/doc/sample_triangle/12_notint/0.txt
+++ /dev/null
@@ -1 +0,0 @@
-3.1: not integer
diff --git a/doc/sample_triangle/12_notint/cmd.txt b/doc/sample_triangle/12_notint/cmd.txt
deleted file mode 100755
index 81a9de3..0000000
--- a/doc/sample_triangle/12_notint/cmd.txt
+++ /dev/null
@@ -1 +0,0 @@
-../../triangle 3.1 4.5 6.2
diff --git a/doc/sample_triangle/12_notint/desc.txt b/doc/sample_triangle/12_notint/desc.txt
deleted file mode 100644
index 1a871ee..0000000
--- a/doc/sample_triangle/12_notint/desc.txt
+++ /dev/null
@@ -1 +0,0 @@
-整数でない値をもつテスト・ケース
diff --git a/doc/sample_triangle/13_argcnt/0.txt b/doc/sample_triangle/13_argcnt/0.txt
deleted file mode 100644
index 67d691b..0000000
--- a/doc/sample_triangle/13_argcnt/0.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-too few argument.
-too many argument.
diff --git a/doc/sample_triangle/13_argcnt/cmd.txt b/doc/sample_triangle/13_argcnt/cmd.txt
deleted file mode 100755
index cb98719..0000000
--- a/doc/sample_triangle/13_argcnt/cmd.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-../../triangle 3 4
-../../triangle 3 4 5 6
-
diff --git a/doc/sample_triangle/13_argcnt/desc.txt b/doc/sample_triangle/13_argcnt/desc.txt
deleted file mode 100644
index 7c9b72e..0000000
--- a/doc/sample_triangle/13_argcnt/desc.txt
+++ /dev/null
@@ -1 +0,0 @@
-数値の個数が間違っていることをためすテスト・ケース
diff --git a/doc/texinfo.mk b/doc/texinfo.mk
new file mode 100644
index 0000000..b64a68d
--- /dev/null
+++ b/doc/texinfo.mk
@@ -0,0 +1,42 @@
+.PHONY: texinfo-distclean texinfo-clean texinfo-textmp-clean
+
+CP := cp
+DVIPDFMX := dvipdfmx
+INSTALL-INFO := install-info
+MAKEINFO = makeinfo
+MKDIR := mkdir
+RMR := rm -rf
+TEX := ptex
+TEXI2DVI := TEX=$(TEX) texi2dvi
+
+DVIPDFMX_FLAGS ?=
+MAKEINFO_FLAGS ?=
+TEXI2DVI_FLAGS ?= -q --texinfo=@afourpaper
+
+%.info: %.texi
+	$(MAKEINFO) $(MAKEINFO_FLAGS) -o $@ $<
+
+%.html: %.texi $(CSS)
+	$(MAKEINFO) -o $@ --no-split --html --css-include=$(CSS) $<
+
+%_html: %.texi $(CSS)
+	if test ! -e $@; then $(MKDIR) $@; fi
+	$(CP) $(CSS) $@/
+	$(MAKEINFO) -o $@ --html --css-ref=$(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
+
+texinfo-textmp-clean:
+	@$(RM) *.aux *.cp *.cps *.fn *.ky *.log *.pg *.pgs *.tmp *.toc *.tp *.vr
-- 
2.18.0