lifed colm doc up to doc/colm

45 files changed, 59 insertions, 56 deletions

diff --git a/doc/.gitignore b/doc/.gitignore
index 98c25189..b336cc7c 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1,3 +1,2 @@
 /Makefile
 /Makefile.in
-/*.html
diff --git a/doc/Makefile.am b/doc/Makefile.am
index e7835f5e..336609b9 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,55 +1 @@
-ASCIIDOC = @ASCIIDOC@
-
-OUTPUT=html5
-OPTIONS=\
-	-a icons -a iconsdir=/usr/share/asciidoc/icons \
-	-a max-width=800px \
-	-a source-highlighter=pygments
-
-OUT_DIR=./output
-
-IN_FILES = \
-	0_00_welcome.adoc 0_06_scope.adoc 1_05_variables.adoc \
-	3_00_language_transformation.adoc 8_00_advanced_topics.adoc \
-	9_00_q_and_a.adoc 0_01_installing.adoc 1_00_language_overview.adoc \
-	1_06_iterators.adoc 3_01_lex.adoc 8_01_embedding.adoc \
-	0_02_vim_syntax.adoc 1_01_statements.adoc 2_00_types.adoc \
-	3_02_parse.adoc 8_02_modularity.adoc 0_03_commandline.adoc \
-	1_02_expressions.adoc 2_01_basic.adoc 3_03_match.adoc \
-	8_03_performance.adoc 0_04_hello_world.adoc 1_03_control_flow.adoc \
-	2_02_list_map_struct_alias.adoc 3_04_undo.adoc 8_04_error_handling.adoc \
-	0_05_fizzbuzz.adoc 1_04_functions.adoc 2_03_def.adoc \
-	3_05_reduction.adoc 8_05_contributing.adoc
-
-CODE = \
-	code/assign.lm     code/fizzbuzz.lm     code/nested_scope.lm  code/reference.lm \
-	code/figure_44.lm  code/hello_world.lm  code/poker.lm         code/scope.lm
-
-
-OUT_FILES = \
-	0_00_welcome.html 0_06_scope.html 1_05_variables.html \
-	3_00_language_transformation.html 8_00_advanced_topics.html \
-	9_00_q_and_a.html 0_01_installing.html 1_00_language_overview.html \
-	1_06_iterators.html 3_01_lex.html 8_01_embedding.html \
-	0_02_vim_syntax.html 1_01_statements.html 2_00_types.html \
-	3_02_parse.html 8_02_modularity.html 0_03_commandline.html \
-	1_02_expressions.html 2_01_basic.html 3_03_match.html \
-	8_03_performance.html 0_04_hello_world.html 1_03_control_flow.html \
-	2_02_list_map_struct_alias.html 3_04_undo.html 8_04_error_handling.html \
-	0_05_fizzbuzz.html 1_04_functions.html 2_03_def.html \
-	3_05_reduction.html 8_05_contributing.html
-
-CLEANFILES = $(OUT_FILES)
-
-EXTRA_DIST = $(IN_FILES) $(CODE)
-
-if BUILD_MANUAL
-
-doc_DATA = $(OUT_FILES)
-
-SUFFIXES = .html .adoc
-
-.adoc.html:
-	$(ASCIIDOC) -b $(OUTPUT) $(OPTIONS) -o $@ $<
-
-endif
+SUBDIRS = colm
diff --git a/doc/colm/.gitignore b/doc/colm/.gitignore
new file mode 100644
index 00000000..98c25189
--- /dev/null
+++ b/doc/colm/.gitignore
@@ -0,0 +1,3 @@
+/Makefile
+/Makefile.in
+/*.html
diff --git a/doc/0_00_welcome.adoc b/doc/colm/0_00_welcome.adoc
index 12f974b2..12f974b2 100644
--- a/doc/0_00_welcome.adoc
+++ b/doc/colm/0_00_welcome.adoc
diff --git a/doc/0_01_installing.adoc b/doc/colm/0_01_installing.adoc
index af8fbf0d..af8fbf0d 100644
--- a/doc/0_01_installing.adoc
+++ b/doc/colm/0_01_installing.adoc
diff --git a/doc/0_02_vim_syntax.adoc b/doc/colm/0_02_vim_syntax.adoc
index 168747d4..168747d4 100644
--- a/doc/0_02_vim_syntax.adoc
+++ b/doc/colm/0_02_vim_syntax.adoc
diff --git a/doc/0_03_commandline.adoc b/doc/colm/0_03_commandline.adoc
index 980003b0..980003b0 100644
--- a/doc/0_03_commandline.adoc
+++ b/doc/colm/0_03_commandline.adoc
diff --git a/doc/0_04_hello_world.adoc b/doc/colm/0_04_hello_world.adoc
index 0406a159..0406a159 100644
--- a/doc/0_04_hello_world.adoc
+++ b/doc/colm/0_04_hello_world.adoc
diff --git a/doc/0_05_fizzbuzz.adoc b/doc/colm/0_05_fizzbuzz.adoc
index 6e30279e..6e30279e 100644
--- a/doc/0_05_fizzbuzz.adoc
+++ b/doc/colm/0_05_fizzbuzz.adoc
diff --git a/doc/0_06_scope.adoc b/doc/colm/0_06_scope.adoc
index 2c411a61..2c411a61 100644
--- a/doc/0_06_scope.adoc
+++ b/doc/colm/0_06_scope.adoc
diff --git a/doc/1_00_language_overview.adoc b/doc/colm/1_00_language_overview.adoc
index 8628a0ad..8628a0ad 100644
--- a/doc/1_00_language_overview.adoc
+++ b/doc/colm/1_00_language_overview.adoc
diff --git a/doc/1_01_statements.adoc b/doc/colm/1_01_statements.adoc
index f5bf8880..f5bf8880 100644
--- a/doc/1_01_statements.adoc
+++ b/doc/colm/1_01_statements.adoc
diff --git a/doc/1_02_expressions.adoc b/doc/colm/1_02_expressions.adoc
index 223c5124..223c5124 100644
--- a/doc/1_02_expressions.adoc
+++ b/doc/colm/1_02_expressions.adoc
diff --git a/doc/1_03_control_flow.adoc b/doc/colm/1_03_control_flow.adoc
index e8c045d3..e8c045d3 100644
--- a/doc/1_03_control_flow.adoc
+++ b/doc/colm/1_03_control_flow.adoc
diff --git a/doc/1_04_functions.adoc b/doc/colm/1_04_functions.adoc
index 262a206b..262a206b 100644
--- a/doc/1_04_functions.adoc
+++ b/doc/colm/1_04_functions.adoc
diff --git a/doc/1_05_variables.adoc b/doc/colm/1_05_variables.adoc
index d4a4e59a..d4a4e59a 100644
--- a/doc/1_05_variables.adoc
+++ b/doc/colm/1_05_variables.adoc
diff --git a/doc/1_06_iterators.adoc b/doc/colm/1_06_iterators.adoc
index d20df9bc..d20df9bc 100644
--- a/doc/1_06_iterators.adoc
+++ b/doc/colm/1_06_iterators.adoc
diff --git a/doc/2_00_types.adoc b/doc/colm/2_00_types.adoc
index a1e54dd2..a1e54dd2 100644
--- a/doc/2_00_types.adoc
+++ b/doc/colm/2_00_types.adoc
diff --git a/doc/2_01_basic.adoc b/doc/colm/2_01_basic.adoc
index d9a3f84f..d9a3f84f 100644
--- a/doc/2_01_basic.adoc
+++ b/doc/colm/2_01_basic.adoc
diff --git a/doc/2_02_list_map_struct_alias.adoc b/doc/colm/2_02_list_map_struct_alias.adoc
index adaccc7f..adaccc7f 100644
--- a/doc/2_02_list_map_struct_alias.adoc
+++ b/doc/colm/2_02_list_map_struct_alias.adoc
diff --git a/doc/2_03_def.adoc b/doc/colm/2_03_def.adoc
index 0ef66ae8..0ef66ae8 100644
--- a/doc/2_03_def.adoc
+++ b/doc/colm/2_03_def.adoc
diff --git a/doc/3_00_language_transformation.adoc b/doc/colm/3_00_language_transformation.adoc
index 72279c90..72279c90 100644
--- a/doc/3_00_language_transformation.adoc
+++ b/doc/colm/3_00_language_transformation.adoc
diff --git a/doc/3_01_lex.adoc b/doc/colm/3_01_lex.adoc
index bb5d1409..bb5d1409 100644
--- a/doc/3_01_lex.adoc
+++ b/doc/colm/3_01_lex.adoc
diff --git a/doc/3_02_parse.adoc b/doc/colm/3_02_parse.adoc
index 80f89e7f..80f89e7f 100644
--- a/doc/3_02_parse.adoc
+++ b/doc/colm/3_02_parse.adoc
diff --git a/doc/3_03_match.adoc b/doc/colm/3_03_match.adoc
index 095e9e11..095e9e11 100644
--- a/doc/3_03_match.adoc
+++ b/doc/colm/3_03_match.adoc
diff --git a/doc/3_04_undo.adoc b/doc/colm/3_04_undo.adoc
index 68acfcf5..68acfcf5 100644
--- a/doc/3_04_undo.adoc
+++ b/doc/colm/3_04_undo.adoc
diff --git a/doc/3_05_reduction.adoc b/doc/colm/3_05_reduction.adoc
index d1293f6c..d1293f6c 100644
--- a/doc/3_05_reduction.adoc
+++ b/doc/colm/3_05_reduction.adoc
diff --git a/doc/8_00_advanced_topics.adoc b/doc/colm/8_00_advanced_topics.adoc
index 896ba3a8..896ba3a8 100644
--- a/doc/8_00_advanced_topics.adoc
+++ b/doc/colm/8_00_advanced_topics.adoc
diff --git a/doc/8_01_embedding.adoc b/doc/colm/8_01_embedding.adoc
index b05af1c0..b05af1c0 100644
--- a/doc/8_01_embedding.adoc
+++ b/doc/colm/8_01_embedding.adoc
diff --git a/doc/8_02_modularity.adoc b/doc/colm/8_02_modularity.adoc
index 27683309..27683309 100644
--- a/doc/8_02_modularity.adoc
+++ b/doc/colm/8_02_modularity.adoc
diff --git a/doc/8_03_performance.adoc b/doc/colm/8_03_performance.adoc
index 77294519..77294519 100644
--- a/doc/8_03_performance.adoc
+++ b/doc/colm/8_03_performance.adoc
diff --git a/doc/8_04_error_handling.adoc b/doc/colm/8_04_error_handling.adoc
index 66255c30..66255c30 100644
--- a/doc/8_04_error_handling.adoc
+++ b/doc/colm/8_04_error_handling.adoc
diff --git a/doc/8_05_contributing.adoc b/doc/colm/8_05_contributing.adoc
index 7031a24c..7031a24c 100644
--- a/doc/8_05_contributing.adoc
+++ b/doc/colm/8_05_contributing.adoc
diff --git a/doc/9_00_q_and_a.adoc b/doc/colm/9_00_q_and_a.adoc
index dea8126c..dea8126c 100644
--- a/doc/9_00_q_and_a.adoc
+++ b/doc/colm/9_00_q_and_a.adoc
diff --git a/doc/colm/Makefile.am b/doc/colm/Makefile.am
new file mode 100644
index 00000000..e7835f5e
--- /dev/null
+++ b/doc/colm/Makefile.am
@@ -0,0 +1,55 @@
+ASCIIDOC = @ASCIIDOC@
+
+OUTPUT=html5
+OPTIONS=\
+	-a icons -a iconsdir=/usr/share/asciidoc/icons \
+	-a max-width=800px \
+	-a source-highlighter=pygments
+
+OUT_DIR=./output
+
+IN_FILES = \
+	0_00_welcome.adoc 0_06_scope.adoc 1_05_variables.adoc \
+	3_00_language_transformation.adoc 8_00_advanced_topics.adoc \
+	9_00_q_and_a.adoc 0_01_installing.adoc 1_00_language_overview.adoc \
+	1_06_iterators.adoc 3_01_lex.adoc 8_01_embedding.adoc \
+	0_02_vim_syntax.adoc 1_01_statements.adoc 2_00_types.adoc \
+	3_02_parse.adoc 8_02_modularity.adoc 0_03_commandline.adoc \
+	1_02_expressions.adoc 2_01_basic.adoc 3_03_match.adoc \
+	8_03_performance.adoc 0_04_hello_world.adoc 1_03_control_flow.adoc \
+	2_02_list_map_struct_alias.adoc 3_04_undo.adoc 8_04_error_handling.adoc \
+	0_05_fizzbuzz.adoc 1_04_functions.adoc 2_03_def.adoc \
+	3_05_reduction.adoc 8_05_contributing.adoc
+
+CODE = \
+	code/assign.lm     code/fizzbuzz.lm     code/nested_scope.lm  code/reference.lm \
+	code/figure_44.lm  code/hello_world.lm  code/poker.lm         code/scope.lm
+
+
+OUT_FILES = \
+	0_00_welcome.html 0_06_scope.html 1_05_variables.html \
+	3_00_language_transformation.html 8_00_advanced_topics.html \
+	9_00_q_and_a.html 0_01_installing.html 1_00_language_overview.html \
+	1_06_iterators.html 3_01_lex.html 8_01_embedding.html \
+	0_02_vim_syntax.html 1_01_statements.html 2_00_types.html \
+	3_02_parse.html 8_02_modularity.html 0_03_commandline.html \
+	1_02_expressions.html 2_01_basic.html 3_03_match.html \
+	8_03_performance.html 0_04_hello_world.html 1_03_control_flow.html \
+	2_02_list_map_struct_alias.html 3_04_undo.html 8_04_error_handling.html \
+	0_05_fizzbuzz.html 1_04_functions.html 2_03_def.html \
+	3_05_reduction.html 8_05_contributing.html
+
+CLEANFILES = $(OUT_FILES)
+
+EXTRA_DIST = $(IN_FILES) $(CODE)
+
+if BUILD_MANUAL
+
+doc_DATA = $(OUT_FILES)
+
+SUFFIXES = .html .adoc
+
+.adoc.html:
+	$(ASCIIDOC) -b $(OUTPUT) $(OPTIONS) -o $@ $<
+
+endif
diff --git a/doc/code/assign.lm b/doc/colm/code/assign.lm
index d8b40d76..d8b40d76 100644
--- a/doc/code/assign.lm
+++ b/doc/colm/code/assign.lm
diff --git a/doc/code/figure_44.lm b/doc/colm/code/figure_44.lm
index fab421ed..fab421ed 100644
--- a/doc/code/figure_44.lm
+++ b/doc/colm/code/figure_44.lm
diff --git a/doc/code/fizzbuzz.lm b/doc/colm/code/fizzbuzz.lm
index b937be4a..b937be4a 100644
--- a/doc/code/fizzbuzz.lm
+++ b/doc/colm/code/fizzbuzz.lm
diff --git a/doc/code/hello_world.lm b/doc/colm/code/hello_world.lm
index 5522c5e1..5522c5e1 100644
--- a/doc/code/hello_world.lm
+++ b/doc/colm/code/hello_world.lm
diff --git a/doc/code/nested_scope.lm b/doc/colm/code/nested_scope.lm
index e84c216a..e84c216a 100644
--- a/doc/code/nested_scope.lm
+++ b/doc/colm/code/nested_scope.lm
diff --git a/doc/code/poker.lm b/doc/colm/code/poker.lm
index 2e776a96..2e776a96 100644
--- a/doc/code/poker.lm
+++ b/doc/colm/code/poker.lm
diff --git a/doc/code/reference.lm b/doc/colm/code/reference.lm
index 122ab6f6..122ab6f6 100644
--- a/doc/code/reference.lm
+++ b/doc/colm/code/reference.lm
diff --git a/doc/code/scope.lm b/doc/colm/code/scope.lm
index e559234c..e559234c 100644
--- a/doc/code/scope.lm
+++ b/doc/colm/code/scope.lm
diff --git a/doc/coding-conventions.txt b/doc/colm/coding-conventions.txt
index 01a9ed05..01a9ed05 100644
--- a/doc/coding-conventions.txt
+++ b/doc/colm/coding-conventions.txt
diff --git a/doc/types.txt b/doc/colm/types.txt
index bc0b297d..bc0b297d 100644
--- a/doc/types.txt
+++ b/doc/colm/types.txt