0.25.0 remove sdlang (headers, conf, make doc)

19 files changed, 484 insertions, 2091 deletions

diff --git a/.gitignore b/.gitignore
index 3d4e228..a929535 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,19 +16,15 @@
 !src/*
 !data
 !data/*
-!data/toml/*
-!data/sdlang/*
-!data/toml/sisupod/**
-!data/toml/sisudir/**
-!data/sdlang/sisupod/**
-!data/sdlang/sisudir/**
+!data/sisupod/**
+!data/sisudir/**
 !*.sst
 !*.ssm
 !**/*.sst
 !**/*.ssm
 !sisupod.manifest
-!sisu_document_make.sdl
-!config_local_site.sdl
+!sisu_document_make
+!config_local_site
 !sisu_document_make.toml
 !config_local_site.toml
 !sisudoc
diff --git a/dub.sdl b/dub.sdl
index 3f267c4..a3c0937 100644
--- a/dub.sdl
+++ b/dub.sdl
@@ -10,7 +10,6 @@ stringImportPaths "./views"
 buildRequirements "allowWarnings"
 dependency        "toml"      version="~>0.4.0-rc.2" # https://code.dlang.org/packages/toml       https://github.com/toml-lang/toml/wiki
 dependency        "toml:json" version="~>0.4.0-rc.2"
-dependency        "sdlang-d"  version="~>0.10.1"     # https://code.dlang.org/packages/sdlang-d   https://github.com/Abscissa/SDLang-D
 dependency        "d2sqlite3" version="~>0.13.1"     # https://code.dlang.org/packages/d2sqlite3  http://biozic.github.io/d2sqlite3/d2sqlite3.html
 subconfiguration  "d2sqlite3" "all-included"
 dependency        "archive"   version="~>0.6.0"      # http://code.dlang.org/packages/archive     https://github.com/rcythr/archive
diff --git a/makefile b/makefile
index bb0a85e..08189de 100644
--- a/makefile
+++ b/makefile
@@ -15,134 +15,70 @@ EMACSLISP_ORG_CONTRIB=~/.emacs.d/elpa/org-plus-contrib-$($(shell echo $(ORG_CONT
 ORGFILELIST=$(shell echo `ls -1 maker.org org/*.org`)
 ORGFILES=""
 ORGDIR :=$(shell echo `pwd`)
-SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND= \
-find data/toml/sisupod -maxdepth 2 -name sisupod.manifest | cut -f 1-4 -d / | sort | xargs
+SiSU_MARKUP_SAMPLES_PODS_FOUND= \
+find data/sisupod -maxdepth 2 -name sisupod.manifest | cut -f 1-4 -d / | sort | xargs
 
-SiSU_MARKUP_SAMPLES_POD_TOML= \
-data/toml/sisupod/accelerando.charles_stross \
-data/toml/sisupod/alices_adventures_in_wonderland.lewis_carroll \
-data/toml/sisupod/content.cory_doctorow \
-data/toml/sisupod/democratizing_innovation.eric_von_hippel \
-data/toml/sisupod/down_and_out_in_the_magic_kingdom.cory_doctorow \
-data/toml/sisupod/for_the_win.cory_doctorow \
-data/toml/sisupod/free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman \
-data/toml/sisupod/free_culture.lawrence_lessig \
-data/toml/sisupod/free_for_all.peter_wayner \
-data/toml/sisupod/gpl2.fsf \
-data/toml/sisupod/gpl3.fsf \
-data/toml/sisupod/gullivers_travels.jonathan_swift \
-data/toml/sisupod/little_brother.cory_doctorow \
-data/toml/sisupod/live-manual \
-data/toml/sisupod/sisu-manual \
-data/toml/sisupod/the_autonomous_contract.ralph_amissah \
-data/toml/sisupod/the_cathedral_and_the_bazaar.eric_s_raymond \
-data/toml/sisupod/the_public_domain.james_boyle \
-data/toml/sisupod/the_wealth_of_networks.yochai_benkler \
-data/toml/sisupod/through_the_looking_glass.lewis_carroll \
-data/toml/sisupod/two_bits.christopher_kelty \
-data/toml/sisupod/un_contracts_international_sale_of_goods_convention_1980 \
-data/toml/sisupod/viral_spiral.david_bollier
-SiSU_MARKUP_SAMPLES_PODS_SDL_FOUND= \
-find data/sdlang/sisupod -maxdepth 2 -name sisupod.manifest | sort | xargs
+SiSU_MARKUP_SAMPLES_POD = \
+data/sisupod/accelerando.charles_stross \
+data/sisupod/alices_adventures_in_wonderland.lewis_carroll \
+data/sisupod/content.cory_doctorow \
+data/sisupod/democratizing_innovation.eric_von_hippel \
+data/sisupod/down_and_out_in_the_magic_kingdom.cory_doctorow \
+data/sisupod/for_the_win.cory_doctorow \
+data/sisupod/free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman \
+data/sisupod/free_culture.lawrence_lessig \
+data/sisupod/free_for_all.peter_wayner \
+data/sisupod/gpl2.fsf \
+data/sisupod/gpl3.fsf \
+data/sisupod/gullivers_travels.jonathan_swift \
+data/sisupod/little_brother.cory_doctorow \
+data/sisupod/live-manual \
+data/sisupod/sisu-manual \
+data/sisupod/the_autonomous_contract.ralph_amissah \
+data/sisupod/the_cathedral_and_the_bazaar.eric_s_raymond \
+data/sisupod/the_public_domain.james_boyle \
+data/sisupod/the_wealth_of_networks.yochai_benkler \
+data/sisupod/through_the_looking_glass.lewis_carroll \
+data/sisupod/two_bits.christopher_kelty \
+data/sisupod/un_contracts_international_sale_of_goods_convention_1980 \
+data/sisupod/viral_spiral.david_bollier
+SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND = \
+find data/sisudir/media/text -name *.ss[tm] | sort | xargs
 
-SiSU_MARKUP_SAMPLES_POD_SDL= \
-data/sdlang/sisupod/accelerando.charles_stross \
-data/sdlang/sisupod/alices_adventures_in_wonderland.lewis_carroll \
-data/sdlang/sisupod/content.cory_doctorow \
-data/sdlang/sisupod/democratizing_innovation.eric_von_hippel \
-data/sdlang/sisupod/down_and_out_in_the_magic_kingdom.cory_doctorow \
-data/sdlang/sisupod/for_the_win.cory_doctorow \
-data/sdlang/sisupod/free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman \
-data/sdlang/sisupod/free_culture.lawrence_lessig \
-data/sdlang/sisupod/free_for_all.peter_wayner \
-data/sdlang/sisupod/gpl2.fsf \
-data/sdlang/sisupod/gpl3.fsf \
-data/sdlang/sisupod/gullivers_travels.jonathan_swift \
-data/sdlang/sisupod/little_brother.cory_doctorow \
-data/sdlang/sisupod/live-manual \
-data/sdlang/sisupod/sisu-manual \
-data/sdlang/sisupod/the_autonomous_contract.ralph_amissah \
-data/sdlang/sisupod/the_cathedral_and_the_bazaar.eric_s_raymond \
-data/sdlang/sisupod/the_public_domain.james_boyle \
-data/sdlang/sisupod/the_wealth_of_networks.yochai_benkler \
-data/sdlang/sisupod/through_the_looking_glass.lewis_carroll \
-data/sdlang/sisupod/two_bits.christopher_kelty \
-data/sdlang/sisupod/un_contracts_international_sale_of_goods_convention_1980 \
-data/sdlang/sisupod/viral_spiral.david_bollier
-SiSU_MARKUP_SAMPLES_DIR_TOML_FILES_FOUND= \
-find data/toml/sisudir/media/text -name *.ss[tm] | sort | xargs
-
-SiSU_MARKUP_SAMPLES_DIR_TOML= \
-data/toml/sisudir/media/text/accelerando.charles_stross.sst \
-data/toml/sisudir/media/text/alices_adventures_in_wonderland.lewis_carroll.sst \
-data/toml/sisudir/media/text/content.cory_doctorow.sst \
-data/toml/sisudir/media/text/democratizing_innovation.eric_von_hippel.sst \
-data/toml/sisudir/media/text/down_and_out_in_the_magic_kingdom.cory_doctorow.sst \
-data/toml/sisudir/media/text/ffa_tmp.sst \
-data/toml/sisudir/media/text/for_the_win.cory_doctorow.sst \
-data/toml/sisudir/media/text/free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman.sst \
-data/toml/sisudir/media/text/free_culture.lawrence_lessig.sst \
-data/toml/sisudir/media/text/free_for_all.peter_wayner.sst \
-data/toml/sisudir/media/text/gpl2.fsf.sst \
-data/toml/sisudir/media/text/gpl3.fsf.sst \
-data/toml/sisudir/media/text/gullivers_travels.jonathan_swift.sst \
-data/toml/sisudir/media/text/little_brother.cory_doctorow.sst \
-data/toml/sisudir/media/text/sisu_markup.sst \
-data/toml/sisudir/media/text/sisu_markup_stress_test.sst \
-data/toml/sisudir/media/text/sisu_markup_test.sst \
-data/toml/sisudir/media/text/table_special_markup.sst \
-data/toml/sisudir/media/text/the_autonomous_contract.ralph_amissah.sst \
-data/toml/sisudir/media/text/the_cathedral_and_the_bazaar.eric_s_raymond.sst \
-data/toml/sisudir/media/text/the_public_domain.james_boyle.sst \
-data/toml/sisudir/media/text/the_wealth_of_networks.yochai_benkler.sst \
-data/toml/sisudir/media/text/through_the_looking_glass.lewis_carroll.sst \
-data/toml/sisudir/media/text/two_bits.christopher_kelty.sst \
-data/toml/sisudir/media/text/un_contracts_international_sale_of_goods_convention_1980.sst \
-data/toml/sisudir/media/text/viral_spiral.david_bollier.sst
-SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND= \
-find data/sdlang/sisudir/media/text -name *.ss[tm] | sort | xargs
-
-SiSU_MARKUP_SAMPLES_DIR_SDL= \
-data/sdlang/sisudir/media/text/accelerando.charles_stross.sst \
-data/sdlang/sisudir/media/text/alices_adventures_in_wonderland.lewis_carroll.sst \
-data/sdlang/sisudir/media/text/content.cory_doctorow.sst \
-data/sdlang/sisudir/media/text/democratizing_innovation.eric_von_hippel.sst \
-data/sdlang/sisudir/media/text/down_and_out_in_the_magic_kingdom.cory_doctorow.sst \
-data/sdlang/sisudir/media/text/ffa_tmp.sst \
-data/sdlang/sisudir/media/text/for_the_win.cory_doctorow.sst \
-data/sdlang/sisudir/media/text/free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman.sst \
-data/sdlang/sisudir/media/text/free_culture.lawrence_lessig.sst \
-data/sdlang/sisudir/media/text/free_for_all.peter_wayner.sst \
-data/sdlang/sisudir/media/text/gpl2.fsf.sst \
-data/sdlang/sisudir/media/text/gpl3.fsf.sst \
-data/sdlang/sisudir/media/text/gullivers_travels.jonathan_swift.sst \
-data/sdlang/sisudir/media/text/little_brother.cory_doctorow.sst \
-data/sdlang/sisudir/media/text/sisu_markup.sst \
-data/sdlang/sisudir/media/text/sisu_markup_stress_test.sst \
-data/sdlang/sisudir/media/text/sisu_markup_test.sst \
-data/sdlang/sisudir/media/text/table_special_markup.sst \
-data/sdlang/sisudir/media/text/the_autonomous_contract.ralph_amissah.sst \
-data/sdlang/sisudir/media/text/the_cathedral_and_the_bazaar.eric_s_raymond.sst \
-data/sdlang/sisudir/media/text/the_public_domain.james_boyle.sst \
-data/sdlang/sisudir/media/text/the_wealth_of_networks.yochai_benkler.sst \
-data/sdlang/sisudir/media/text/through_the_looking_glass.lewis_carroll.sst \
-data/sdlang/sisudir/media/text/two_bits.christopher_kelty.sst \
-data/sdlang/sisudir/media/text/un_contracts_international_sale_of_goods_convention_1980.sst \
-data/sdlang/sisudir/media/text/viral_spiral.david_bollier.sst
-markup_samples_toml:
-	find data/toml/sisupod -name sisupod.manifest | cut -f 1-4 -d / | sort; \
-find data/toml/sisudir/media/text -name *.ss[tm] | sort
-markup_pod_samples_toml:
-	find data/toml/sisupod -name sisupod.manifest | cut -f 1-4 -d / | sort
-markup_dir_samples_toml:
-	find data/toml/sisudir/media/text -name *.ss[tm] | sort
-markup_samples_sdl:
-	find data/sdlang/sisupod -name sisupod.manifest | sort; \
-find data/sdlang/sisudir/media/text -name *.ss[tm] | sort
-markup_pod_samples_sdl:
-	find data/sdlang/sisupod -name sisupod.manifest | sort
-markup_dir_samples_sdl:
-	find data/sdlang/sisudir/media/text -name *.ss[tm] | sort
+SiSU_MARKUP_SAMPLES_DIR = \
+data/sisudir/media/text/accelerando.charles_stross.sst \
+data/sisudir/media/text/alices_adventures_in_wonderland.lewis_carroll.sst \
+data/sisudir/media/text/content.cory_doctorow.sst \
+data/sisudir/media/text/democratizing_innovation.eric_von_hippel.sst \
+data/sisudir/media/text/down_and_out_in_the_magic_kingdom.cory_doctorow.sst \
+data/sisudir/media/text/ffa_tmp.sst \
+data/sisudir/media/text/for_the_win.cory_doctorow.sst \
+data/sisudir/media/text/free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman.sst \
+data/sisudir/media/text/free_culture.lawrence_lessig.sst \
+data/sisudir/media/text/free_for_all.peter_wayner.sst \
+data/sisudir/media/text/gpl2.fsf.sst \
+data/sisudir/media/text/gpl3.fsf.sst \
+data/sisudir/media/text/gullivers_travels.jonathan_swift.sst \
+data/sisudir/media/text/little_brother.cory_doctorow.sst \
+data/sisudir/media/text/sisu_markup.sst \
+data/sisudir/media/text/sisu_markup_stress_test.sst \
+data/sisudir/media/text/sisu_markup_test.sst \
+data/sisudir/media/text/table_special_markup.sst \
+data/sisudir/media/text/the_autonomous_contract.ralph_amissah.sst \
+data/sisudir/media/text/the_cathedral_and_the_bazaar.eric_s_raymond.sst \
+data/sisudir/media/text/the_public_domain.james_boyle.sst \
+data/sisudir/media/text/the_wealth_of_networks.yochai_benkler.sst \
+data/sisudir/media/text/through_the_looking_glass.lewis_carroll.sst \
+data/sisudir/media/text/two_bits.christopher_kelty.sst \
+data/sisudir/media/text/un_contracts_international_sale_of_goods_convention_1980.sst \
+data/sisudir/media/text/viral_spiral.david_bollier.sst
+markup_samples:
+	find data/sisupod -name sisupod.manifest | cut -f 1-4 -d / | sort; \
+find data/sisudir/media/text -name *.ss[tm] | sort
+markup_pod_samples:
+	find data/sisupod -name sisupod.manifest | cut -f 1-4 -d / | sort
+markup_dir_samples:
+	find data/sisudir/media/text -name *.ss[tm] | sort
 all: dmd ldc gdc
 all_ver: dmd_ver ldc_ver gdc_ver
 all_debug: dmd_debug gdc_debug ldc_debug
@@ -239,560 +175,283 @@ ragga:
 	reggae -b binary
 	reggae -b ninja
 	build
-dmd_testrun_find_toml:
+dmd_testrun_find:
 	./bin/sdp-dmd -v --source --html --epub --sqlite-discrete \
 --sqlite-create --sqlite-update \
 --output-dir=tmp/program_output_pod \
-data/toml/sisupod/sisu-manual
-dmd_testrun_find_toml_pod_source:
-	$(SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND) \
+data/sisupod/sisu-manual
+dmd_testrun_find_pod_source:
+	$(SiSU_MARKUP_SAMPLES_PODS_FOUND) \
 ./bin/sdp-ldc -v --source --html --epub \
 --output-dir=tmp/program_output_pod
-dmd_testrun_find_toml_pod_sisupod:
-	$(SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND) \
+dmd_testrun_find_pod_sisupod:
+	$(SiSU_MARKUP_SAMPLES_PODS_FOUND) \
 ./bin/sdp-dmd -v --sisupod \
 --output-dir=tmp/program_output_pod
-dmd_testrun_find_toml_pod_html:
-	$(SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND) \
+dmd_testrun_find_pod_html:
+	$(SiSU_MARKUP_SAMPLES_PODS_FOUND) \
 ./bin/sdp-dmd -v --html \
 --output-dir=tmp/program_output_pod
-dmd_testrun_find_toml_pod_epub:
-	$(SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND) \
+dmd_testrun_find_pod_epub:
+	$(SiSU_MARKUP_SAMPLES_PODS_FOUND) \
 ./bin/sdp-dmd -v --epub \
 --output-dir=tmp/program_output_pod
-dmd_testrun_find_toml_pod_all:
-	$(SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND) \
+dmd_testrun_find_pod_all:
+	$(SiSU_MARKUP_SAMPLES_PODS_FOUND) \
 ./bin/sdp-dmd -v --source --html --epub --sqlite-discrete \
 --sqlite-create --sqlite-update \
 --output-dir=tmp/program_output_pod
-dmd_testrun_find_sdl:
-	./bin/sdp-dmd -v --source --html --epub --sqlite-discrete \
---sqlite-create --sqlite-update \
---output-dir=tmp/program_output_pod \
-data/sdlang/sisupod/sisu-manual
-dmd_testrun_find_sdl_pod_source:
-	$(SiSU_MARKUP_SAMPLES_PODS_SDL_FOUND) \
-./bin/sdp-ldc -v --source --html --epub \
---output-dir=tmp/program_output_pod
-dmd_testrun_find_sdl_pod_sisupod:
-	$(SiSU_MARKUP_SAMPLES_PODS_SDL_FOUND) \
-./bin/sdp-dmd -v --sisupod \
---output-dir=tmp/program_output_pod
-dmd_testrun_find_sdl_pod_html:
-	$(SiSU_MARKUP_SAMPLES_PODS_SDL_FOUND) \
-./bin/sdp-dmd -v --html \
---output-dir=tmp/program_output_pod
-dmd_testrun_find_sdl_pod_epub:
-	$(SiSU_MARKUP_SAMPLES_PODS_SDL_FOUND) \
-./bin/sdp-dmd -v --epub \
---output-dir=tmp/program_output_pod
-dmd_testrun_find_sdl_pod_all:
-	$(SiSU_MARKUP_SAMPLES_PODS_SDL_FOUND) \
-./bin/sdp-dmd -v --source --html --epub --sqlite-discrete \
---sqlite-create --sqlite-update \
---output-dir=tmp/program_output_pod
-dmd_testrun_paths_toml_pod_source:
-	./bin/sdp-dmd -v --source \
---output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_TOML)
-dmd_testrun_paths_toml_pod_sisupod:
-	./bin/sdp-dmd -v --sisupod \
---output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_TOML)
-dmd_testrun_paths_toml_pod_html:
-	./bin/sdp-dmd -v --html \
---output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_TOML)
-dmd_testrun_paths_toml_pod_epub:
-	./bin/sdp-dmd -v --epub \
---output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_TOML)
-dmd_testrun_paths_toml_pod_all:
-	./bin/sdp-dmd -v --source --html --epub --sqlite-discrete \
---sqlite-create --sqlite-update \
---output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_TOML)
-dmd_testrun_paths_sdlang_pod_source:
+dmd_testrun_paths_pod_source:
 	./bin/sdp-dmd -v --source \
 --output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_SDL)
-dmd_testrun_paths_sdlang_pod_sisupod:
+$(SiSU_MARKUP_SAMPLES_POD)
+dmd_testrun_paths_pod_sisupod:
 	./bin/sdp-dmd -v --sisupod \
 --output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_SDL)
-dmd_testrun_paths_sdlang_pod_html:
+$(SiSU_MARKUP_SAMPLES_POD)
+dmd_testrun_paths_pod_html:
 	./bin/sdp-dmd -v --html \
 --output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_SDL)
-dmd_testrun_paths_sdlang_pod_epub:
+$(SiSU_MARKUP_SAMPLES_POD)
+dmd_testrun_paths_pod_epub:
 	./bin/sdp-dmd -v --epub \
 --output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_SDL)
-dmd_testrun_paths_sdlang_pod_all:
+$(SiSU_MARKUP_SAMPLES_POD)
+dmd_testrun_paths_pod_all:
 	./bin/sdp-dmd -v --source --html --epub --sqlite-discrete \
 --sqlite-create --sqlite-update \
 --output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_SDL)
-gdc_testrun_find_toml:
+$(SiSU_MARKUP_SAMPLES_POD)
+gdc_testrun_find:
 	./bin/sdp-gdc -v --source --html --epub --sqlite-discrete \
 --sqlite-create --sqlite-update \
 --output-dir=tmp/program_output_pod \
-data/toml/sisupod/sisu-manual
-gdc_testrun_find_toml_pod_source:
-	$(SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND) \
+data/sisupod/sisu-manual
+gdc_testrun_find_pod_source:
+	$(SiSU_MARKUP_SAMPLES_PODS_FOUND) \
 ./bin/sdp-gdc -v --source \
 --output-dir=tmp/program_output_pod
-gdc_testrun_find_toml_pod_sisupod:
-	$(SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND) \
+gdc_testrun_find_pod_sisupod:
+	$(SiSU_MARKUP_SAMPLES_PODS_FOUND) \
 ./bin/sdp-gdc -v --sisupod \
 --output-dir=tmp/program_output_pod
-gdc_testrun_find_toml_pod_html:
-	$(SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND) \
+gdc_testrun_find_pod_html:
+	$(SiSU_MARKUP_SAMPLES_PODS_FOUND) \
 ./bin/sdp-gdc -v --html \
 --output-dir=tmp/program_output_pod
-gdc_testrun_find_toml_pod_epub:
-	$(SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND) \
+gdc_testrun_find_pod_epub:
+	$(SiSU_MARKUP_SAMPLES_PODS_FOUND) \
 ./bin/sdp-gdc -v --epub \
 --output-dir=tmp/program_output_pod
-gdc_testrun_find_toml_pod_all:
-	$(SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND) \
+gdc_testrun_find_pod_all:
+	$(SiSU_MARKUP_SAMPLES_PODS_FOUND) \
 ./bin/sdp-gdc -v --source --html --epub --sqlite-discrete \
 --sqlite-create --sqlite-update \
 --output-dir=tmp/program_output_pod
-gdc_testrun_find_sdl:
+gdc_testrun_paths:
 	./bin/sdp-gdc -v --source --html --epub --sqlite-discrete \
 --sqlite-create --sqlite-update \
 --output-dir=tmp/program_output_pod \
-data/sdlang/sisupod/sisu-manual
-gdc_testrun_find_sdl_pod_source:
-	$(SiSU_MARKUP_SAMPLES_PODS_SDL_FOUND) \
-./bin/sdp-gdc -v --source \
---output-dir=tmp/program_output_pod
-gdc_testrun_find_sdl_pod_sisupod:
-	$(SiSU_MARKUP_SAMPLES_PODS_SDL_FOUND) \
-./bin/sdp-gdc -v --sisupod \
---output-dir=tmp/program_output_pod
-gdc_testrun_find_sdl_pod_html:
-	$(SiSU_MARKUP_SAMPLES_PODS_SDL_FOUND) \
-./bin/sdp-gdc -v --html \
---output-dir=tmp/program_output_pod
-gdc_testrun_find_sdl_pod_epub:
-	$(SiSU_MARKUP_SAMPLES_PODS_SDL_FOUND) \
-./bin/sdp-gdc -v --epub \
---output-dir=tmp/program_output_pod
-gdc_testrun_find_sdl_pod_all:
-	$(SiSU_MARKUP_SAMPLES_PODS_SDL_FOUND) \
-./bin/sdp-gdc -v --source --html --epub --sqlite-discrete \
---sqlite-create --sqlite-update \
---output-dir=tmp/program_output_pod
-gdc_testrun_paths_toml:
-	./bin/sdp-gdc -v --source --html --epub --sqlite-discrete \
---sqlite-create --sqlite-update \
---output-dir=tmp/program_output_pod \
-data/toml/sisupod/sisu-manual
-gdc_testrun_paths_toml_pod_source:
+data/sisupod/sisu-manual
+gdc_testrun_paths_pod_source:
 	./bin/sdp-gdc -v --source \
 --output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_TOML)
-gdc_testrun_paths_toml_pod_sisupod:
+$(SiSU_MARKUP_SAMPLES_POD)
+gdc_testrun_paths_pod_sisupod:
 	./bin/sdp-gdc -v --sisupod \
 --output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_TOML)
-gdc_testrun_paths_toml_pod_html:
+$(SiSU_MARKUP_SAMPLES_POD)
+gdc_testrun_paths_pod_html:
 	./bin/sdp-gdc -v --html \
 --output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_TOML)
-gdc_testrun_paths_toml_pod_epub:
+$(SiSU_MARKUP_SAMPLES_POD)
+gdc_testrun_paths_pod_epub:
 	./bin/sdp-gdc -v --epub \
 --output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_TOML)
-gdc_testrun_paths_toml_pod_all:
-	./bin/sdp-gdc -v --source --html --epub --sqlite-discrete \
---sqlite-create --sqlite-update \
---output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_TOML)
-gdc_testrun_paths_sdl:
+$(SiSU_MARKUP_SAMPLES_POD)
+gdc_testrun_paths_pod_all:
 	./bin/sdp-gdc -v --source --html --epub --sqlite-discrete \
 --sqlite-create --sqlite-update \
 --output-dir=tmp/program_output_pod \
-data/sdlang/sisupod/sisu-manual
-gdc_testrun_paths_sdl_pod_source:
-	./bin/sdp-gdc -v --source \
---output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_SDL)
-gdc_testrun_paths_sdl_pod_sisupod:
-	./bin/sdp-gdc -v --sisupod \
---output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_SDL)
-gdc_testrun_paths_sdl_pod_html:
-	./bin/sdp-gdc -v --html \
---output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_SDL)
-gdc_testrun_paths_sdl_pod_epub:
-	./bin/sdp-gdc -v --epub \
---output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_SDL)
-gdc_testrun_paths_sdl_pod_all:
-	./bin/sdp-gdc -v --source --html --epub --sqlite-discrete \
---sqlite-create --sqlite-update \
---output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_SDL)
-ldc_testrun_find_toml:
+$(SiSU_MARKUP_SAMPLES_POD)
+ldc_testrun_find:
 	./bin/sdp-ldc -v --source --html --epub --sqlite-discrete \
 --sqlite-create --sqlite-update \
 --output-dir=tmp/program_output_pod \
-data/toml/sisupod/sisu-manual
-ldc_testrun_find_toml_pod_source:
-	$(SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND) \
+data/sisupod/sisu-manual
+ldc_testrun_find_pod_source:
+	$(SiSU_MARKUP_SAMPLES_PODS_FOUND) \
 	./bin/sdp-ldc -v --source \
 --output-dir=tmp/program_output_pod
-ldc_testrun_find_toml_pod_sisupod:
-	$(SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND) \
+ldc_testrun_find_pod_sisupod:
+	$(SiSU_MARKUP_SAMPLES_PODS_FOUND) \
 	./bin/sdp-ldc -v --sisupod \
 --output-dir=tmp/program_output_pod
-ldc_testrun_find_toml_pod_html:
-	$(SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND) \
+ldc_testrun_find_pod_html:
+	$(SiSU_MARKUP_SAMPLES_PODS_FOUND) \
 	./bin/sdp-ldc -v --html \
 --output-dir=tmp/program_output_pod
-ldc_testrun_find_toml_pod_epub:
-	$(SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND) \
+ldc_testrun_find_pod_epub:
+	$(SiSU_MARKUP_SAMPLES_PODS_FOUND) \
 	./bin/sdp-ldc -v --epub \
 --output-dir=tmp/program_output_pod
-ldc_testrun_find_toml_pod_all:
-	$(SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND) \
+ldc_testrun_find_pod_all:
+	$(SiSU_MARKUP_SAMPLES_PODS_FOUND) \
 	./bin/sdp-ldc -v --source --html --epub --sqlite-discrete \
 --sqlite-create --sqlite-update \
 --output-dir=tmp/program_output_pod
-ldc_testrun_find_sdl:
+ldc_testrun_paths:
 	./bin/sdp-ldc -v --source --html --epub --sqlite-discrete \
 --sqlite-create --sqlite-update \
 --output-dir=tmp/program_output_pod \
-data/sdlang/sisupod/sisu-manual
-ldc_testrun_find_sdl_pod_source:
-	$(SiSU_MARKUP_SAMPLES_PODS_SDL_FOUND) \
-	./bin/sdp-ldc -v --source \
---output-dir=tmp/program_output_pod
-ldc_testrun_find_sdl_pod_sisupod:
-	$(SiSU_MARKUP_SAMPLES_PODS_SDL_FOUND) \
-	./bin/sdp-ldc -v --sisupod \
---output-dir=tmp/program_output_pod
-ldc_testrun_find_sdl_pod_html:
-	$(SiSU_MARKUP_SAMPLES_PODS_SDL_FOUND) \
-	./bin/sdp-ldc -v --html \
---output-dir=tmp/program_output_pod
-ldc_testrun_find_sdl_pod_epub:
-	$(SiSU_MARKUP_SAMPLES_PODS_SDL_FOUND) \
-	./bin/sdp-ldc -v --epub \
---output-dir=tmp/program_output_pod
-ldc_testrun_find_sdl_pod_all:
-	$(SiSU_MARKUP_SAMPLES_PODS_SDL_FOUND) \
-	./bin/sdp-ldc -v --source --html --epub --sqlite-discrete \
---sqlite-create --sqlite-update \
---output-dir=tmp/program_output_pod
-ldc_testrun_paths_toml:
-	./bin/sdp-ldc -v --source --html --epub --sqlite-discrete \
---sqlite-create --sqlite-update \
---output-dir=tmp/program_output_pod \
-data/toml/sisupod/sisu-manual
-ldc_testrun_paths_toml_pod_source:
+data/sisupod/sisu-manual
+ldc_testrun_paths_pod_source:
 	./bin/sdp-ldc -v --source \
 --output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_TOML)
-ldc_testrun_paths_toml_pod_sisupod:
+$(SiSU_MARKUP_SAMPLES_POD)
+ldc_testrun_paths_pod_sisupod:
 	./bin/sdp-ldc -v --sisupod \
 --output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_TOML)
-ldc_testrun_paths_toml_pod_html:
+$(SiSU_MARKUP_SAMPLES_POD)
+ldc_testrun_paths_pod_html:
 	./bin/sdp-ldc -v --html \
 --output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_TOML)
-ldc_testrun_paths_toml_pod_epub:
+$(SiSU_MARKUP_SAMPLES_POD)
+ldc_testrun_paths_pod_epub:
 	./bin/sdp-ldc -v --epub \
 --output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_TOML)
-ldc_testrun_paths_toml_pod_all:
+$(SiSU_MARKUP_SAMPLES_POD)
+ldc_testrun_paths_pod_all:
 	./bin/sdp-ldc -v --source --html --epub --sqlite-discrete \
 --sqlite-create --sqlite-update \
 --output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_TOML)
-ldc_testrun_paths_sdl:
-	./bin/sdp-ldc -v --source --html --epub --sqlite-discrete \
---sqlite-create --sqlite-update \
---output-dir=tmp/program_output_pod \
-data/sdlang/sisupod/sisu-manual
-ldc_testrun_paths_sdl_pod_source:
-	./bin/sdp-ldc -v --source \
---output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_SDL)
-ldc_testrun_paths_sdl_pod_sisupod:
-	./bin/sdp-ldc -v --sisupod \
---output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_SDL)
-ldc_testrun_paths_sdl_pod_html:
-	./bin/sdp-ldc -v --html \
---output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_SDL)
-ldc_testrun_paths_sdl_pod_epub:
-	./bin/sdp-ldc -v --epub \
---output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_SDL)
-ldc_testrun_paths_sdl_pod_all:
-	./bin/sdp-ldc -v --source --html --epub --sqlite-discrete \
---sqlite-create --sqlite-update \
---output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_SDL)
-dmd_testrun_find_toml_dir_source:
-	$(SiSU_MARKUP_SAMPLES_DIR_TOML_FILES_FOUND) \
-./bin/sdp-dmd -v --source \
---output-dir=tmp/program_output_dir
-dmd_testrun_find_toml_dir_sisupod:
-	$(SiSU_MARKUP_SAMPLES_DIR_TOML_FILES_FOUND) \
-./bin/sdp-dmd -v --sisupod \
---output-dir=tmp/program_output_dir
-dmd_testrun_find_toml_dir_html:
-	$(SiSU_MARKUP_SAMPLES_DIR_TOML_FILES_FOUND) \
-./bin/sdp-dmd -v --html \
---output-dir=tmp/program_output_dir
-dmd_testrun_find_toml_dir_epub:
-	$(SiSU_MARKUP_SAMPLES_DIR_TOML_FILES_FOUND) \
-./bin/sdp-dmd -v --epub \
---output-dir=tmp/program_output_dir
-dmd_testrun_find_toml_dir_all:
-	$(SiSU_MARKUP_SAMPLES_DIR_TOML_FILES_FOUND) \
-./bin/sdp-dmd -v --source --html --epub --sqlite-discrete \
---sqlite-create --sqlite-update \
---output-dir=tmp/program_output_dir
-dmd_testrun_find_sdl_dir_source:
-	$(SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND) \
+$(SiSU_MARKUP_SAMPLES_POD)
+dmd_testrun_find_dir_source:
+	$(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \
 ./bin/sdp-dmd -v --source \
 --output-dir=tmp/program_output_dir
-dmd_testrun_find_sdl_dir_sisupod:
-	$(SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND) \
+dmd_testrun_find_dir_sisupod:
+	$(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \
 ./bin/sdp-dmd -v --sisupod \
 --output-dir=tmp/program_output_dir
-dmd_testrun_find_sdl_dir_html:
-	$(SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND) \
+dmd_testrun_find_dir_html:
+	$(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \
 ./bin/sdp-dmd -v --html \
 --output-dir=tmp/program_output_dir
-dmd_testrun_find_sdl_dir_epub:
-	$(SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND) \
+dmd_testrun_find_dir_epub:
+	$(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \
 ./bin/sdp-dmd -v --epub \
 --output-dir=tmp/program_output_dir
-dmd_testrun_find_sdl_dir_all:
-	$(SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND) \
+dmd_testrun_find_dir_all:
+	$(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \
 ./bin/sdp-dmd -v --source --html --epub --sqlite-discrete \
 --sqlite-create --sqlite-update \
 --output-dir=tmp/program_output_dir
-dmd_testrun_filelist_toml_dir_source:
+dmd_testrun_filelist_dir_source:
 	./bin/sdp-dmd -v --source \
 --output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_TOML)
-dmd_testrun_filelist_toml_dir_sisupod:
+$(SiSU_MARKUP_SAMPLES_DIR)
+dmd_testrun_filelist_dir_sisupod:
 	./bin/sdp-dmd -v --sisupod \
 --output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_TOML)
-dmd_testrun_filelist_toml_dir_html:
+$(SiSU_MARKUP_SAMPLES_DIR)
+dmd_testrun_filelist_dir_html:
 	./bin/sdp-dmd -v --html \
 --output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_TOML)
-dmd_testrun_filelist_toml_dir_epub:
+$(SiSU_MARKUP_SAMPLES_DIR)
+dmd_testrun_filelist_dir_epub:
 	./bin/sdp-dmd -v --epub \
 --output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_TOML)
-dmd_testrun_filelist_toml_dir_all:
+$(SiSU_MARKUP_SAMPLES_DIR)
+dmd_testrun_filelist_dir_all:
 	./bin/sdp-dmd -v --source --html --epub --sqlite-discrete \
 --sqlite-create --sqlite-update \
 --output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_TOML)
-dmd_testrun_filelist_sdl_dir_source:
-	./bin/sdp-dmd -v --source \
---output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_SDL)
-dmd_testrun_filelist_sdl_dir_sisupod:
-	./bin/sdp-dmd -v --sisupod \
---output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_SDL)
-dmd_testrun_filelist_sdl_dir_html:
-	./bin/sdp-dmd -v --html \
---output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_SDL)
-dmd_testrun_filelist_sdl_dir_epub:
-	./bin/sdp-dmd -v --epub \
---output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_SDL)
-dmd_testrun_filelist_sdl_dir_all:
-	./bin/sdp-dmd -v --source --html --epub --sqlite-discrete \
---sqlite-create --sqlite-update \
---output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_SDL)
-gdc_testrun_find_toml_dir_source:
-	./bin/sdp-gdc -v --source \
---output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_TOML)
-gdc_testrun_find_toml_dir_sisupod:
-	$(SiSU_MARKUP_SAMPLES_DIR_TOML_FILES_FOUND) \
-./bin/sdp-gdc -v --sisupod \
---output-dir=tmp/program_output_dir
-gdc_testrun_find_toml_dir_html:
-	$(SiSU_MARKUP_SAMPLES_DIR_TOML_FILES_FOUND) \
-./bin/sdp-gdc -v --html \
---output-dir=tmp/program_output_dir
-gdc_testrun_find_toml_dir_epub:
-	$(SiSU_MARKUP_SAMPLES_DIR_TOML_FILES_FOUND) \
-./bin/sdp-gdc -v --epub \
---output-dir=tmp/program_output_dir
-gdc_testrun_find_toml_dir_all:
-	$(SiSU_MARKUP_SAMPLES_DIR_TOML_FILES_FOUND) \
-./bin/sdp-gdc -v --source --html --epub --sqlite-discrete \
---sqlite-create --sqlite-update \
---output-dir=tmp/program_output_dir
-gdc_testrun_find_sdl_dir_source:
+$(SiSU_MARKUP_SAMPLES_DIR)
+gdc_testrun_find_dir_source:
 	./bin/sdp-gdc -v --source \
 --output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_SDL)
-gdc_testrun_find_sdl_dir_sisupod:
-	$(SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND) \
+$(SiSU_MARKUP_SAMPLES_DIR)
+gdc_testrun_find_dir_sisupod:
+	$(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \
 ./bin/sdp-gdc -v --sisupod \
 --output-dir=tmp/program_output_dir
-gdc_testrun_find_sdl_dir_html:
-	$(SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND) \
+gdc_testrun_find_dir_html:
+	$(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \
 ./bin/sdp-gdc -v --html \
 --output-dir=tmp/program_output_dir
-gdc_testrun_find_sdl_dir_epub:
-	$(SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND) \
+gdc_testrun_find_dir_epub:
+	$(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \
 ./bin/sdp-gdc -v --epub \
 --output-dir=tmp/program_output_dir
-gdc_testrun_find_sdl_dir_all:
-	$(SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND) \
+gdc_testrun_find_dir_all:
+	$(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \
 ./bin/sdp-gdc -v --source --html --epub --sqlite-discrete \
 --sqlite-create --sqlite-update \
 --output-dir=tmp/program_output_dir
-gdc_testrun_filelist_toml_dir_source:
+gdc_testrun_filelist_dir_source:
 	./bin/sdp-gdc -v --source \
 --output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_TOML)
-gdc_testrun_filelist_toml_dir_sisupod:
+$(SiSU_MARKUP_SAMPLES_DIR)
+gdc_testrun_filelist_dir_sisupod:
 	./bin/sdp-gdc -v --sisupod \
 --output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_TOML)
-gdc_testrun_filelist_toml_dir_html:
+$(SiSU_MARKUP_SAMPLES_DIR)
+gdc_testrun_filelist_dir_html:
 	./bin/sdp-gdc -v --html \
 --output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_TOML)
-gdc_testrun_filelist_toml_dir_epub:
+$(SiSU_MARKUP_SAMPLES_DIR)
+gdc_testrun_filelist_dir_epub:
 	./bin/sdp-gdc -v --epub \
 --output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_TOML)
-gdc_testrun_filelist_toml_dir_all:
+$(SiSU_MARKUP_SAMPLES_DIR)
+gdc_testrun_filelist_dir_all:
 	./bin/sdp-gdc -v --source --html --epub --sqlite-discrete \
 --sqlite-create --sqlite-update \
 --output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_TOML)
-gdc_testrun_filelist_sdl_dir_source:
-	./bin/sdp-gdc -v --source \
---output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_SDL)
-gdc_testrun_filelist_sdl_dir_sisupod:
-	./bin/sdp-gdc -v --sisupod \
---output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_SDL)
-gdc_testrun_filelist_sdl_dir_html:
-	./bin/sdp-gdc -v --html \
---output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_SDL)
-gdc_testrun_filelist_sdl_dir_epub:
-	./bin/sdp-gdc -v --epub \
---output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_SDL)
-gdc_testrun_filelist_sdl_dir_all:
-	./bin/sdp-gdc -v --source --html --epub --sqlite-discrete \
---sqlite-create --sqlite-update \
---output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_SDL)
-ldc_testrun_find_toml_dir_source:
-	$(SiSU_MARKUP_SAMPLES_DIR_TOML_FILES_FOUND) \
+$(SiSU_MARKUP_SAMPLES_DIR)
+ldc_testrun_find_dir_source:
+	$(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \
 ./bin/sdp-ldc -v --source \
 --output-dir=tmp/program_output_dir
-ldc_testrun_find_toml_dir_sisupod:
-	$(SiSU_MARKUP_SAMPLES_DIR_TOML_FILES_FOUND) \
+ldc_testrun_find_dir_sisupod:
+	$(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \
 ./bin/sdp-ldc -v --sisupod \
 --output-dir=tmp/program_output_dir
-ldc_testrun_find_toml_dir_html:
-	$(SiSU_MARKUP_SAMPLES_DIR_TOML_FILES_FOUND) \
+ldc_testrun_find_dir_html:
+	$(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \
 ./bin/sdp-ldc -v --html \
 --output-dir=tmp/program_output_dir
-ldc_testrun_find_toml_dir_epub:
-	$(SiSU_MARKUP_SAMPLES_DIR_TOML_FILES_FOUND) \
+ldc_testrun_find_dir_epub:
+	$(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \
 ./bin/sdp-ldc -v --epub \
 --output-dir=tmp/program_output_dir
-ldc_testrun_find_toml_dir_all:
-	$(SiSU_MARKUP_SAMPLES_DIR_TOML_FILES_FOUND) \
+ldc_testrun_find_dir_all:
+	$(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \
 ./bin/sdp-ldc -v --source --html --epub --sqlite-discrete \
 --sqlite-create --sqlite-update \
 --output-dir=tmp/program_output_dir
-ldc_testrun_find_sdl_dir_source:
-	$(SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND) \
-./bin/sdp-ldc -v --source \
---output-dir=tmp/program_output_dir
-ldc_testrun_find_sdl_dir_sisupod:
-	$(SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND) \
-./bin/sdp-ldc -v --sisupod \
---output-dir=tmp/program_output_dir
-ldc_testrun_find_sdl_dir_html:
-	$(SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND) \
-./bin/sdp-ldc -v --html \
---output-dir=tmp/program_output_dir
-ldc_testrun_find_sdl_dir_epub:
-	$(SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND) \
-./bin/sdp-ldc -v --epub \
---output-dir=tmp/program_output_dir
-ldc_testrun_find_sdl_dir_all:
-	$(SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND) \
-./bin/sdp-ldc -v --source --html --epub --sqlite-discrete \
---sqlite-create --sqlite-update \
---output-dir=tmp/program_output_dir
-ldc_testrun_filelist_toml_dir_source:
-	./bin/sdp-ldc -v --source \
---output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_TOML)
-ldc_testrun_filelist_toml_dir_sisupod:
-	./bin/sdp-ldc -v --sisupod \
---output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_TOML)
-ldc_testrun_filelist_toml_dir_html:
-	./bin/sdp-ldc -v --html \
---output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_TOML)
-ldc_testrun_filelist_toml_dir_epub:
-	./bin/sdp-ldc -v --epub \
---output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_TOML)
-ldc_testrun_filelist_toml_dir_all:
-	./bin/sdp-ldc -v --source --html --epub --sqlite-discrete \
---sqlite-create --sqlite-update \
---output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_TOML)
-ldc_testrun_filelist_sdl_dir_source:
+ldc_testrun_filelist_dir_source:
 	./bin/sdp-ldc -v --source \
 --output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_SDL)
-ldc_testrun_filelist_sdl_dir_sisupod:
+$(SiSU_MARKUP_SAMPLES_DIR)
+ldc_testrun_filelist_dir_sisupod:
 	./bin/sdp-ldc -v --sisupod \
 --output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_SDL)
-ldc_testrun_filelist_sdl_dir_html:
+$(SiSU_MARKUP_SAMPLES_DIR)
+ldc_testrun_filelist_dir_html:
 	./bin/sdp-ldc -v --html \
 --output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_SDL)
-ldc_testrun_filelist_sdl_dir_epub:
+$(SiSU_MARKUP_SAMPLES_DIR)
+ldc_testrun_filelist_dir_epub:
 	./bin/sdp-ldc -v --epub \
 --output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_SDL)
-ldc_testrun_filelist_sdl_dir_all:
+$(SiSU_MARKUP_SAMPLES_DIR)
+ldc_testrun_filelist_dir_all:
 	./bin/sdp-ldc -v --source --html --epub --sqlite-discrete \
 --sqlite-create --sqlite-update \
 --output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_SDL)
+$(SiSU_MARKUP_SAMPLES_DIR)
 tangle: skel
 	for f in $(ORGFILELIST); do \
 		ORGFILES="$$ORGFILES \"$$f\""; \
diff --git a/maker.org b/maker.org
index fdbeea9..9ae8a4f 100644
--- a/maker.org
+++ b/maker.org
@@ -57,131 +57,68 @@ ORGDIR :=$(shell echo `pwd`)
 **** pods
 
 #+BEGIN_SRC makefile :tangle makefile
-SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND= \
-find data/toml/sisupod -maxdepth 2 -name sisupod.manifest | cut -f 1-4 -d / | sort | xargs
-
-SiSU_MARKUP_SAMPLES_POD_TOML= \
-data/toml/sisupod/accelerando.charles_stross \
-data/toml/sisupod/alices_adventures_in_wonderland.lewis_carroll \
-data/toml/sisupod/content.cory_doctorow \
-data/toml/sisupod/democratizing_innovation.eric_von_hippel \
-data/toml/sisupod/down_and_out_in_the_magic_kingdom.cory_doctorow \
-data/toml/sisupod/for_the_win.cory_doctorow \
-data/toml/sisupod/free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman \
-data/toml/sisupod/free_culture.lawrence_lessig \
-data/toml/sisupod/free_for_all.peter_wayner \
-data/toml/sisupod/gpl2.fsf \
-data/toml/sisupod/gpl3.fsf \
-data/toml/sisupod/gullivers_travels.jonathan_swift \
-data/toml/sisupod/little_brother.cory_doctorow \
-data/toml/sisupod/live-manual \
-data/toml/sisupod/sisu-manual \
-data/toml/sisupod/the_autonomous_contract.ralph_amissah \
-data/toml/sisupod/the_cathedral_and_the_bazaar.eric_s_raymond \
-data/toml/sisupod/the_public_domain.james_boyle \
-data/toml/sisupod/the_wealth_of_networks.yochai_benkler \
-data/toml/sisupod/through_the_looking_glass.lewis_carroll \
-data/toml/sisupod/two_bits.christopher_kelty \
-data/toml/sisupod/un_contracts_international_sale_of_goods_convention_1980 \
-data/toml/sisupod/viral_spiral.david_bollier
-#+END_SRC
-
-#+BEGIN_SRC makefile :tangle makefile
-SiSU_MARKUP_SAMPLES_PODS_SDL_FOUND= \
-find data/sdlang/sisupod -maxdepth 2 -name sisupod.manifest | sort | xargs
-
-SiSU_MARKUP_SAMPLES_POD_SDL= \
-data/sdlang/sisupod/accelerando.charles_stross \
-data/sdlang/sisupod/alices_adventures_in_wonderland.lewis_carroll \
-data/sdlang/sisupod/content.cory_doctorow \
-data/sdlang/sisupod/democratizing_innovation.eric_von_hippel \
-data/sdlang/sisupod/down_and_out_in_the_magic_kingdom.cory_doctorow \
-data/sdlang/sisupod/for_the_win.cory_doctorow \
-data/sdlang/sisupod/free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman \
-data/sdlang/sisupod/free_culture.lawrence_lessig \
-data/sdlang/sisupod/free_for_all.peter_wayner \
-data/sdlang/sisupod/gpl2.fsf \
-data/sdlang/sisupod/gpl3.fsf \
-data/sdlang/sisupod/gullivers_travels.jonathan_swift \
-data/sdlang/sisupod/little_brother.cory_doctorow \
-data/sdlang/sisupod/live-manual \
-data/sdlang/sisupod/sisu-manual \
-data/sdlang/sisupod/the_autonomous_contract.ralph_amissah \
-data/sdlang/sisupod/the_cathedral_and_the_bazaar.eric_s_raymond \
-data/sdlang/sisupod/the_public_domain.james_boyle \
-data/sdlang/sisupod/the_wealth_of_networks.yochai_benkler \
-data/sdlang/sisupod/through_the_looking_glass.lewis_carroll \
-data/sdlang/sisupod/two_bits.christopher_kelty \
-data/sdlang/sisupod/un_contracts_international_sale_of_goods_convention_1980 \
-data/sdlang/sisupod/viral_spiral.david_bollier
+SiSU_MARKUP_SAMPLES_PODS_FOUND= \
+find data/sisupod -maxdepth 2 -name sisupod.manifest | cut -f 1-4 -d / | sort | xargs
+
+SiSU_MARKUP_SAMPLES_POD = \
+data/sisupod/accelerando.charles_stross \
+data/sisupod/alices_adventures_in_wonderland.lewis_carroll \
+data/sisupod/content.cory_doctorow \
+data/sisupod/democratizing_innovation.eric_von_hippel \
+data/sisupod/down_and_out_in_the_magic_kingdom.cory_doctorow \
+data/sisupod/for_the_win.cory_doctorow \
+data/sisupod/free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman \
+data/sisupod/free_culture.lawrence_lessig \
+data/sisupod/free_for_all.peter_wayner \
+data/sisupod/gpl2.fsf \
+data/sisupod/gpl3.fsf \
+data/sisupod/gullivers_travels.jonathan_swift \
+data/sisupod/little_brother.cory_doctorow \
+data/sisupod/live-manual \
+data/sisupod/sisu-manual \
+data/sisupod/the_autonomous_contract.ralph_amissah \
+data/sisupod/the_cathedral_and_the_bazaar.eric_s_raymond \
+data/sisupod/the_public_domain.james_boyle \
+data/sisupod/the_wealth_of_networks.yochai_benkler \
+data/sisupod/through_the_looking_glass.lewis_carroll \
+data/sisupod/two_bits.christopher_kelty \
+data/sisupod/un_contracts_international_sale_of_goods_convention_1980 \
+data/sisupod/viral_spiral.david_bollier
 #+END_SRC
 
 **** dir
 
 #+BEGIN_SRC makefile :tangle makefile
-SiSU_MARKUP_SAMPLES_DIR_TOML_FILES_FOUND= \
-find data/toml/sisudir/media/text -name *.ss[tm] | sort | xargs
-
-SiSU_MARKUP_SAMPLES_DIR_TOML= \
-data/toml/sisudir/media/text/accelerando.charles_stross.sst \
-data/toml/sisudir/media/text/alices_adventures_in_wonderland.lewis_carroll.sst \
-data/toml/sisudir/media/text/content.cory_doctorow.sst \
-data/toml/sisudir/media/text/democratizing_innovation.eric_von_hippel.sst \
-data/toml/sisudir/media/text/down_and_out_in_the_magic_kingdom.cory_doctorow.sst \
-data/toml/sisudir/media/text/ffa_tmp.sst \
-data/toml/sisudir/media/text/for_the_win.cory_doctorow.sst \
-data/toml/sisudir/media/text/free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman.sst \
-data/toml/sisudir/media/text/free_culture.lawrence_lessig.sst \
-data/toml/sisudir/media/text/free_for_all.peter_wayner.sst \
-data/toml/sisudir/media/text/gpl2.fsf.sst \
-data/toml/sisudir/media/text/gpl3.fsf.sst \
-data/toml/sisudir/media/text/gullivers_travels.jonathan_swift.sst \
-data/toml/sisudir/media/text/little_brother.cory_doctorow.sst \
-data/toml/sisudir/media/text/sisu_markup.sst \
-data/toml/sisudir/media/text/sisu_markup_stress_test.sst \
-data/toml/sisudir/media/text/sisu_markup_test.sst \
-data/toml/sisudir/media/text/table_special_markup.sst \
-data/toml/sisudir/media/text/the_autonomous_contract.ralph_amissah.sst \
-data/toml/sisudir/media/text/the_cathedral_and_the_bazaar.eric_s_raymond.sst \
-data/toml/sisudir/media/text/the_public_domain.james_boyle.sst \
-data/toml/sisudir/media/text/the_wealth_of_networks.yochai_benkler.sst \
-data/toml/sisudir/media/text/through_the_looking_glass.lewis_carroll.sst \
-data/toml/sisudir/media/text/two_bits.christopher_kelty.sst \
-data/toml/sisudir/media/text/un_contracts_international_sale_of_goods_convention_1980.sst \
-data/toml/sisudir/media/text/viral_spiral.david_bollier.sst
-#+END_SRC
-
-#+BEGIN_SRC makefile :tangle makefile
-SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND= \
-find data/sdlang/sisudir/media/text -name *.ss[tm] | sort | xargs
-
-SiSU_MARKUP_SAMPLES_DIR_SDL= \
-data/sdlang/sisudir/media/text/accelerando.charles_stross.sst \
-data/sdlang/sisudir/media/text/alices_adventures_in_wonderland.lewis_carroll.sst \
-data/sdlang/sisudir/media/text/content.cory_doctorow.sst \
-data/sdlang/sisudir/media/text/democratizing_innovation.eric_von_hippel.sst \
-data/sdlang/sisudir/media/text/down_and_out_in_the_magic_kingdom.cory_doctorow.sst \
-data/sdlang/sisudir/media/text/ffa_tmp.sst \
-data/sdlang/sisudir/media/text/for_the_win.cory_doctorow.sst \
-data/sdlang/sisudir/media/text/free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman.sst \
-data/sdlang/sisudir/media/text/free_culture.lawrence_lessig.sst \
-data/sdlang/sisudir/media/text/free_for_all.peter_wayner.sst \
-data/sdlang/sisudir/media/text/gpl2.fsf.sst \
-data/sdlang/sisudir/media/text/gpl3.fsf.sst \
-data/sdlang/sisudir/media/text/gullivers_travels.jonathan_swift.sst \
-data/sdlang/sisudir/media/text/little_brother.cory_doctorow.sst \
-data/sdlang/sisudir/media/text/sisu_markup.sst \
-data/sdlang/sisudir/media/text/sisu_markup_stress_test.sst \
-data/sdlang/sisudir/media/text/sisu_markup_test.sst \
-data/sdlang/sisudir/media/text/table_special_markup.sst \
-data/sdlang/sisudir/media/text/the_autonomous_contract.ralph_amissah.sst \
-data/sdlang/sisudir/media/text/the_cathedral_and_the_bazaar.eric_s_raymond.sst \
-data/sdlang/sisudir/media/text/the_public_domain.james_boyle.sst \
-data/sdlang/sisudir/media/text/the_wealth_of_networks.yochai_benkler.sst \
-data/sdlang/sisudir/media/text/through_the_looking_glass.lewis_carroll.sst \
-data/sdlang/sisudir/media/text/two_bits.christopher_kelty.sst \
-data/sdlang/sisudir/media/text/un_contracts_international_sale_of_goods_convention_1980.sst \
-data/sdlang/sisudir/media/text/viral_spiral.david_bollier.sst
+SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND = \
+find data/sisudir/media/text -name *.ss[tm] | sort | xargs
+
+SiSU_MARKUP_SAMPLES_DIR = \
+data/sisudir/media/text/accelerando.charles_stross.sst \
+data/sisudir/media/text/alices_adventures_in_wonderland.lewis_carroll.sst \
+data/sisudir/media/text/content.cory_doctorow.sst \
+data/sisudir/media/text/democratizing_innovation.eric_von_hippel.sst \
+data/sisudir/media/text/down_and_out_in_the_magic_kingdom.cory_doctorow.sst \
+data/sisudir/media/text/ffa_tmp.sst \
+data/sisudir/media/text/for_the_win.cory_doctorow.sst \
+data/sisudir/media/text/free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman.sst \
+data/sisudir/media/text/free_culture.lawrence_lessig.sst \
+data/sisudir/media/text/free_for_all.peter_wayner.sst \
+data/sisudir/media/text/gpl2.fsf.sst \
+data/sisudir/media/text/gpl3.fsf.sst \
+data/sisudir/media/text/gullivers_travels.jonathan_swift.sst \
+data/sisudir/media/text/little_brother.cory_doctorow.sst \
+data/sisudir/media/text/sisu_markup.sst \
+data/sisudir/media/text/sisu_markup_stress_test.sst \
+data/sisudir/media/text/sisu_markup_test.sst \
+data/sisudir/media/text/table_special_markup.sst \
+data/sisudir/media/text/the_autonomous_contract.ralph_amissah.sst \
+data/sisudir/media/text/the_cathedral_and_the_bazaar.eric_s_raymond.sst \
+data/sisudir/media/text/the_public_domain.james_boyle.sst \
+data/sisudir/media/text/the_wealth_of_networks.yochai_benkler.sst \
+data/sisudir/media/text/through_the_looking_glass.lewis_carroll.sst \
+data/sisudir/media/text/two_bits.christopher_kelty.sst \
+data/sisudir/media/text/un_contracts_international_sale_of_goods_convention_1980.sst \
+data/sisudir/media/text/viral_spiral.david_bollier.sst
 #+END_SRC
 
 ** _make_ commands [+2]                                        :make:commands:
@@ -206,40 +143,21 @@ data/sdlang/sisudir/media/text/viral_spiral.david_bollier.sst
 ***** all compiler builds                               :all:dmd:gdc:ldc:
 ****** all builds
 ******* sample markup file list
-******** toml
-
-#+BEGIN_SRC makefile :tangle makefile
-markup_samples_toml:
-	find data/toml/sisupod -name sisupod.manifest | cut -f 1-4 -d / | sort; \
-find data/toml/sisudir/media/text -name *.ss[tm] | sort
-#+END_SRC
-
-#+BEGIN_SRC makefile :tangle makefile
-markup_pod_samples_toml:
-	find data/toml/sisupod -name sisupod.manifest | cut -f 1-4 -d / | sort
-#+END_SRC
-
-#+BEGIN_SRC makefile :tangle makefile
-markup_dir_samples_toml:
-	find data/toml/sisudir/media/text -name *.ss[tm] | sort
-#+END_SRC
-
-******** sdlang
 
 #+BEGIN_SRC makefile :tangle makefile
-markup_samples_sdl:
-	find data/sdlang/sisupod -name sisupod.manifest | sort; \
-find data/sdlang/sisudir/media/text -name *.ss[tm] | sort
+markup_samples:
+	find data/sisupod -name sisupod.manifest | cut -f 1-4 -d / | sort; \
+find data/sisudir/media/text -name *.ss[tm] | sort
 #+END_SRC
 
 #+BEGIN_SRC makefile :tangle makefile
-markup_pod_samples_sdl:
-	find data/sdlang/sisupod -name sisupod.manifest | sort
+markup_pod_samples:
+	find data/sisupod -name sisupod.manifest | cut -f 1-4 -d / | sort
 #+END_SRC
 
 #+BEGIN_SRC makefile :tangle makefile
-markup_dir_samples_sdl:
-	find data/sdlang/sisudir/media/text -name *.ss[tm] | sort
+markup_dir_samples:
+	find data/sisudir/media/text -name *.ss[tm] | sort
 #+END_SRC
 
 ******* quick                                                   :quick:
@@ -466,695 +384,346 @@ ragga:
 **** pods
 ***** dmd
 ****** find files
-******* toml
 
 #+BEGIN_SRC makefile :tangle makefile
-dmd_testrun_find_toml:
+dmd_testrun_find:
 	./bin/sdp-dmd -v --source --html --epub --sqlite-discrete \
 --sqlite-create --sqlite-update \
 --output-dir=tmp/program_output_pod \
-data/toml/sisupod/sisu-manual
-dmd_testrun_find_toml_pod_source:
-	$(SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND) \
+data/sisupod/sisu-manual
+dmd_testrun_find_pod_source:
+	$(SiSU_MARKUP_SAMPLES_PODS_FOUND) \
 ./bin/sdp-ldc -v --source --html --epub \
 --output-dir=tmp/program_output_pod
-dmd_testrun_find_toml_pod_sisupod:
-	$(SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND) \
+dmd_testrun_find_pod_sisupod:
+	$(SiSU_MARKUP_SAMPLES_PODS_FOUND) \
 ./bin/sdp-dmd -v --sisupod \
 --output-dir=tmp/program_output_pod
-dmd_testrun_find_toml_pod_html:
-	$(SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND) \
+dmd_testrun_find_pod_html:
+	$(SiSU_MARKUP_SAMPLES_PODS_FOUND) \
 ./bin/sdp-dmd -v --html \
 --output-dir=tmp/program_output_pod
-dmd_testrun_find_toml_pod_epub:
-	$(SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND) \
+dmd_testrun_find_pod_epub:
+	$(SiSU_MARKUP_SAMPLES_PODS_FOUND) \
 ./bin/sdp-dmd -v --epub \
 --output-dir=tmp/program_output_pod
-dmd_testrun_find_toml_pod_all:
-	$(SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND) \
-./bin/sdp-dmd -v --source --html --epub --sqlite-discrete \
---sqlite-create --sqlite-update \
---output-dir=tmp/program_output_pod
-#+END_SRC
-
-******* sdlang
-
-#+BEGIN_SRC makefile :tangle makefile
-dmd_testrun_find_sdl:
-	./bin/sdp-dmd -v --source --html --epub --sqlite-discrete \
---sqlite-create --sqlite-update \
---output-dir=tmp/program_output_pod \
-data/sdlang/sisupod/sisu-manual
-dmd_testrun_find_sdl_pod_source:
-	$(SiSU_MARKUP_SAMPLES_PODS_SDL_FOUND) \
-./bin/sdp-ldc -v --source --html --epub \
---output-dir=tmp/program_output_pod
-dmd_testrun_find_sdl_pod_sisupod:
-	$(SiSU_MARKUP_SAMPLES_PODS_SDL_FOUND) \
-./bin/sdp-dmd -v --sisupod \
---output-dir=tmp/program_output_pod
-dmd_testrun_find_sdl_pod_html:
-	$(SiSU_MARKUP_SAMPLES_PODS_SDL_FOUND) \
-./bin/sdp-dmd -v --html \
---output-dir=tmp/program_output_pod
-dmd_testrun_find_sdl_pod_epub:
-	$(SiSU_MARKUP_SAMPLES_PODS_SDL_FOUND) \
-./bin/sdp-dmd -v --epub \
---output-dir=tmp/program_output_pod
-dmd_testrun_find_sdl_pod_all:
-	$(SiSU_MARKUP_SAMPLES_PODS_SDL_FOUND) \
+dmd_testrun_find_pod_all:
+	$(SiSU_MARKUP_SAMPLES_PODS_FOUND) \
 ./bin/sdp-dmd -v --source --html --epub --sqlite-discrete \
 --sqlite-create --sqlite-update \
 --output-dir=tmp/program_output_pod
 #+END_SRC
 
 ****** path list
-******* toml
 
 #+BEGIN_SRC makefile :tangle makefile
-dmd_testrun_paths_toml_pod_source:
+dmd_testrun_paths_pod_source:
 	./bin/sdp-dmd -v --source \
 --output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_TOML)
-dmd_testrun_paths_toml_pod_sisupod:
+$(SiSU_MARKUP_SAMPLES_POD)
+dmd_testrun_paths_pod_sisupod:
 	./bin/sdp-dmd -v --sisupod \
 --output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_TOML)
-dmd_testrun_paths_toml_pod_html:
+$(SiSU_MARKUP_SAMPLES_POD)
+dmd_testrun_paths_pod_html:
 	./bin/sdp-dmd -v --html \
 --output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_TOML)
-dmd_testrun_paths_toml_pod_epub:
+$(SiSU_MARKUP_SAMPLES_POD)
+dmd_testrun_paths_pod_epub:
 	./bin/sdp-dmd -v --epub \
 --output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_TOML)
-dmd_testrun_paths_toml_pod_all:
+$(SiSU_MARKUP_SAMPLES_POD)
+dmd_testrun_paths_pod_all:
 	./bin/sdp-dmd -v --source --html --epub --sqlite-discrete \
 --sqlite-create --sqlite-update \
 --output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_TOML)
-#+END_SRC
-
-******* sdlang
-
-#+BEGIN_SRC makefile :tangle makefile
-dmd_testrun_paths_sdlang_pod_source:
-	./bin/sdp-dmd -v --source \
---output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_SDL)
-dmd_testrun_paths_sdlang_pod_sisupod:
-	./bin/sdp-dmd -v --sisupod \
---output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_SDL)
-dmd_testrun_paths_sdlang_pod_html:
-	./bin/sdp-dmd -v --html \
---output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_SDL)
-dmd_testrun_paths_sdlang_pod_epub:
-	./bin/sdp-dmd -v --epub \
---output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_SDL)
-dmd_testrun_paths_sdlang_pod_all:
-	./bin/sdp-dmd -v --source --html --epub --sqlite-discrete \
---sqlite-create --sqlite-update \
---output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_SDL)
+$(SiSU_MARKUP_SAMPLES_POD)
 #+END_SRC
 
 ***** gdc
 ****** find files
-******* toml
 
 #+BEGIN_SRC makefile :tangle makefile
-gdc_testrun_find_toml:
+gdc_testrun_find:
 	./bin/sdp-gdc -v --source --html --epub --sqlite-discrete \
 --sqlite-create --sqlite-update \
 --output-dir=tmp/program_output_pod \
-data/toml/sisupod/sisu-manual
-gdc_testrun_find_toml_pod_source:
-	$(SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND) \
+data/sisupod/sisu-manual
+gdc_testrun_find_pod_source:
+	$(SiSU_MARKUP_SAMPLES_PODS_FOUND) \
 ./bin/sdp-gdc -v --source \
 --output-dir=tmp/program_output_pod
-gdc_testrun_find_toml_pod_sisupod:
-	$(SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND) \
+gdc_testrun_find_pod_sisupod:
+	$(SiSU_MARKUP_SAMPLES_PODS_FOUND) \
 ./bin/sdp-gdc -v --sisupod \
 --output-dir=tmp/program_output_pod
-gdc_testrun_find_toml_pod_html:
-	$(SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND) \
+gdc_testrun_find_pod_html:
+	$(SiSU_MARKUP_SAMPLES_PODS_FOUND) \
 ./bin/sdp-gdc -v --html \
 --output-dir=tmp/program_output_pod
-gdc_testrun_find_toml_pod_epub:
-	$(SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND) \
+gdc_testrun_find_pod_epub:
+	$(SiSU_MARKUP_SAMPLES_PODS_FOUND) \
 ./bin/sdp-gdc -v --epub \
 --output-dir=tmp/program_output_pod
-gdc_testrun_find_toml_pod_all:
-	$(SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND) \
-./bin/sdp-gdc -v --source --html --epub --sqlite-discrete \
---sqlite-create --sqlite-update \
---output-dir=tmp/program_output_pod
-#+END_SRC
-
-******* sdlang
-
-#+BEGIN_SRC makefile :tangle makefile
-gdc_testrun_find_sdl:
-	./bin/sdp-gdc -v --source --html --epub --sqlite-discrete \
---sqlite-create --sqlite-update \
---output-dir=tmp/program_output_pod \
-data/sdlang/sisupod/sisu-manual
-gdc_testrun_find_sdl_pod_source:
-	$(SiSU_MARKUP_SAMPLES_PODS_SDL_FOUND) \
-./bin/sdp-gdc -v --source \
---output-dir=tmp/program_output_pod
-gdc_testrun_find_sdl_pod_sisupod:
-	$(SiSU_MARKUP_SAMPLES_PODS_SDL_FOUND) \
-./bin/sdp-gdc -v --sisupod \
---output-dir=tmp/program_output_pod
-gdc_testrun_find_sdl_pod_html:
-	$(SiSU_MARKUP_SAMPLES_PODS_SDL_FOUND) \
-./bin/sdp-gdc -v --html \
---output-dir=tmp/program_output_pod
-gdc_testrun_find_sdl_pod_epub:
-	$(SiSU_MARKUP_SAMPLES_PODS_SDL_FOUND) \
-./bin/sdp-gdc -v --epub \
---output-dir=tmp/program_output_pod
-gdc_testrun_find_sdl_pod_all:
-	$(SiSU_MARKUP_SAMPLES_PODS_SDL_FOUND) \
+gdc_testrun_find_pod_all:
+	$(SiSU_MARKUP_SAMPLES_PODS_FOUND) \
 ./bin/sdp-gdc -v --source --html --epub --sqlite-discrete \
 --sqlite-create --sqlite-update \
 --output-dir=tmp/program_output_pod
 #+END_SRC
 
 ****** path list
-******* toml
-
-#+BEGIN_SRC makefile :tangle makefile
-gdc_testrun_paths_toml:
-	./bin/sdp-gdc -v --source --html --epub --sqlite-discrete \
---sqlite-create --sqlite-update \
---output-dir=tmp/program_output_pod \
-data/toml/sisupod/sisu-manual
-gdc_testrun_paths_toml_pod_source:
-	./bin/sdp-gdc -v --source \
---output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_TOML)
-gdc_testrun_paths_toml_pod_sisupod:
-	./bin/sdp-gdc -v --sisupod \
---output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_TOML)
-gdc_testrun_paths_toml_pod_html:
-	./bin/sdp-gdc -v --html \
---output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_TOML)
-gdc_testrun_paths_toml_pod_epub:
-	./bin/sdp-gdc -v --epub \
---output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_TOML)
-gdc_testrun_paths_toml_pod_all:
-	./bin/sdp-gdc -v --source --html --epub --sqlite-discrete \
---sqlite-create --sqlite-update \
---output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_TOML)
-#+END_SRC
-
-******* sdlang
 
 #+BEGIN_SRC makefile :tangle makefile
-gdc_testrun_paths_sdl:
+gdc_testrun_paths:
 	./bin/sdp-gdc -v --source --html --epub --sqlite-discrete \
 --sqlite-create --sqlite-update \
 --output-dir=tmp/program_output_pod \
-data/sdlang/sisupod/sisu-manual
-gdc_testrun_paths_sdl_pod_source:
+data/sisupod/sisu-manual
+gdc_testrun_paths_pod_source:
 	./bin/sdp-gdc -v --source \
 --output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_SDL)
-gdc_testrun_paths_sdl_pod_sisupod:
+$(SiSU_MARKUP_SAMPLES_POD)
+gdc_testrun_paths_pod_sisupod:
 	./bin/sdp-gdc -v --sisupod \
 --output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_SDL)
-gdc_testrun_paths_sdl_pod_html:
+$(SiSU_MARKUP_SAMPLES_POD)
+gdc_testrun_paths_pod_html:
 	./bin/sdp-gdc -v --html \
 --output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_SDL)
-gdc_testrun_paths_sdl_pod_epub:
+$(SiSU_MARKUP_SAMPLES_POD)
+gdc_testrun_paths_pod_epub:
 	./bin/sdp-gdc -v --epub \
 --output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_SDL)
-gdc_testrun_paths_sdl_pod_all:
+$(SiSU_MARKUP_SAMPLES_POD)
+gdc_testrun_paths_pod_all:
 	./bin/sdp-gdc -v --source --html --epub --sqlite-discrete \
 --sqlite-create --sqlite-update \
 --output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_SDL)
+$(SiSU_MARKUP_SAMPLES_POD)
 #+END_SRC
 
 ***** ldc
 ****** find files
-******* toml
 
 #+BEGIN_SRC makefile :tangle makefile
-ldc_testrun_find_toml:
+ldc_testrun_find:
 	./bin/sdp-ldc -v --source --html --epub --sqlite-discrete \
 --sqlite-create --sqlite-update \
 --output-dir=tmp/program_output_pod \
-data/toml/sisupod/sisu-manual
-ldc_testrun_find_toml_pod_source:
-	$(SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND) \
+data/sisupod/sisu-manual
+ldc_testrun_find_pod_source:
+	$(SiSU_MARKUP_SAMPLES_PODS_FOUND) \
 	./bin/sdp-ldc -v --source \
 --output-dir=tmp/program_output_pod
-ldc_testrun_find_toml_pod_sisupod:
-	$(SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND) \
+ldc_testrun_find_pod_sisupod:
+	$(SiSU_MARKUP_SAMPLES_PODS_FOUND) \
 	./bin/sdp-ldc -v --sisupod \
 --output-dir=tmp/program_output_pod
-ldc_testrun_find_toml_pod_html:
-	$(SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND) \
+ldc_testrun_find_pod_html:
+	$(SiSU_MARKUP_SAMPLES_PODS_FOUND) \
 	./bin/sdp-ldc -v --html \
 --output-dir=tmp/program_output_pod
-ldc_testrun_find_toml_pod_epub:
-	$(SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND) \
+ldc_testrun_find_pod_epub:
+	$(SiSU_MARKUP_SAMPLES_PODS_FOUND) \
 	./bin/sdp-ldc -v --epub \
 --output-dir=tmp/program_output_pod
-ldc_testrun_find_toml_pod_all:
-	$(SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND) \
-	./bin/sdp-ldc -v --source --html --epub --sqlite-discrete \
---sqlite-create --sqlite-update \
---output-dir=tmp/program_output_pod
-#+END_SRC
-
-******* sdlang
-
-#+BEGIN_SRC makefile :tangle makefile
-ldc_testrun_find_sdl:
-	./bin/sdp-ldc -v --source --html --epub --sqlite-discrete \
---sqlite-create --sqlite-update \
---output-dir=tmp/program_output_pod \
-data/sdlang/sisupod/sisu-manual
-ldc_testrun_find_sdl_pod_source:
-	$(SiSU_MARKUP_SAMPLES_PODS_SDL_FOUND) \
-	./bin/sdp-ldc -v --source \
---output-dir=tmp/program_output_pod
-ldc_testrun_find_sdl_pod_sisupod:
-	$(SiSU_MARKUP_SAMPLES_PODS_SDL_FOUND) \
-	./bin/sdp-ldc -v --sisupod \
---output-dir=tmp/program_output_pod
-ldc_testrun_find_sdl_pod_html:
-	$(SiSU_MARKUP_SAMPLES_PODS_SDL_FOUND) \
-	./bin/sdp-ldc -v --html \
---output-dir=tmp/program_output_pod
-ldc_testrun_find_sdl_pod_epub:
-	$(SiSU_MARKUP_SAMPLES_PODS_SDL_FOUND) \
-	./bin/sdp-ldc -v --epub \
---output-dir=tmp/program_output_pod
-ldc_testrun_find_sdl_pod_all:
-	$(SiSU_MARKUP_SAMPLES_PODS_SDL_FOUND) \
+ldc_testrun_find_pod_all:
+	$(SiSU_MARKUP_SAMPLES_PODS_FOUND) \
 	./bin/sdp-ldc -v --source --html --epub --sqlite-discrete \
 --sqlite-create --sqlite-update \
 --output-dir=tmp/program_output_pod
 #+END_SRC
 
 ****** path list
-******* toml
 
 #+BEGIN_SRC makefile :tangle makefile
-ldc_testrun_paths_toml:
+ldc_testrun_paths:
 	./bin/sdp-ldc -v --source --html --epub --sqlite-discrete \
 --sqlite-create --sqlite-update \
 --output-dir=tmp/program_output_pod \
-data/toml/sisupod/sisu-manual
-ldc_testrun_paths_toml_pod_source:
+data/sisupod/sisu-manual
+ldc_testrun_paths_pod_source:
 	./bin/sdp-ldc -v --source \
 --output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_TOML)
-ldc_testrun_paths_toml_pod_sisupod:
+$(SiSU_MARKUP_SAMPLES_POD)
+ldc_testrun_paths_pod_sisupod:
 	./bin/sdp-ldc -v --sisupod \
 --output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_TOML)
-ldc_testrun_paths_toml_pod_html:
+$(SiSU_MARKUP_SAMPLES_POD)
+ldc_testrun_paths_pod_html:
 	./bin/sdp-ldc -v --html \
 --output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_TOML)
-ldc_testrun_paths_toml_pod_epub:
+$(SiSU_MARKUP_SAMPLES_POD)
+ldc_testrun_paths_pod_epub:
 	./bin/sdp-ldc -v --epub \
 --output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_TOML)
-ldc_testrun_paths_toml_pod_all:
+$(SiSU_MARKUP_SAMPLES_POD)
+ldc_testrun_paths_pod_all:
 	./bin/sdp-ldc -v --source --html --epub --sqlite-discrete \
 --sqlite-create --sqlite-update \
 --output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_TOML)
-#+END_SRC
-
-******* sdlang
-
-#+BEGIN_SRC makefile :tangle makefile
-ldc_testrun_paths_sdl:
-	./bin/sdp-ldc -v --source --html --epub --sqlite-discrete \
---sqlite-create --sqlite-update \
---output-dir=tmp/program_output_pod \
-data/sdlang/sisupod/sisu-manual
-ldc_testrun_paths_sdl_pod_source:
-	./bin/sdp-ldc -v --source \
---output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_SDL)
-ldc_testrun_paths_sdl_pod_sisupod:
-	./bin/sdp-ldc -v --sisupod \
---output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_SDL)
-ldc_testrun_paths_sdl_pod_html:
-	./bin/sdp-ldc -v --html \
---output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_SDL)
-ldc_testrun_paths_sdl_pod_epub:
-	./bin/sdp-ldc -v --epub \
---output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_SDL)
-ldc_testrun_paths_sdl_pod_all:
-	./bin/sdp-ldc -v --source --html --epub --sqlite-discrete \
---sqlite-create --sqlite-update \
---output-dir=tmp/program_output_pod \
-$(SiSU_MARKUP_SAMPLES_POD_SDL)
+$(SiSU_MARKUP_SAMPLES_POD)
 #+END_SRC
 
 **** dir
 ***** dmd
 ****** find files
-******* toml
-
-#+BEGIN_SRC makefile :tangle makefile
-dmd_testrun_find_toml_dir_source:
-	$(SiSU_MARKUP_SAMPLES_DIR_TOML_FILES_FOUND) \
-./bin/sdp-dmd -v --source \
---output-dir=tmp/program_output_dir
-dmd_testrun_find_toml_dir_sisupod:
-	$(SiSU_MARKUP_SAMPLES_DIR_TOML_FILES_FOUND) \
-./bin/sdp-dmd -v --sisupod \
---output-dir=tmp/program_output_dir
-dmd_testrun_find_toml_dir_html:
-	$(SiSU_MARKUP_SAMPLES_DIR_TOML_FILES_FOUND) \
-./bin/sdp-dmd -v --html \
---output-dir=tmp/program_output_dir
-dmd_testrun_find_toml_dir_epub:
-	$(SiSU_MARKUP_SAMPLES_DIR_TOML_FILES_FOUND) \
-./bin/sdp-dmd -v --epub \
---output-dir=tmp/program_output_dir
-dmd_testrun_find_toml_dir_all:
-	$(SiSU_MARKUP_SAMPLES_DIR_TOML_FILES_FOUND) \
-./bin/sdp-dmd -v --source --html --epub --sqlite-discrete \
---sqlite-create --sqlite-update \
---output-dir=tmp/program_output_dir
-#+END_SRC
-
-******* sdlang
 
 #+BEGIN_SRC makefile :tangle makefile
-dmd_testrun_find_sdl_dir_source:
-	$(SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND) \
+dmd_testrun_find_dir_source:
+	$(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \
 ./bin/sdp-dmd -v --source \
 --output-dir=tmp/program_output_dir
-dmd_testrun_find_sdl_dir_sisupod:
-	$(SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND) \
+dmd_testrun_find_dir_sisupod:
+	$(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \
 ./bin/sdp-dmd -v --sisupod \
 --output-dir=tmp/program_output_dir
-dmd_testrun_find_sdl_dir_html:
-	$(SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND) \
+dmd_testrun_find_dir_html:
+	$(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \
 ./bin/sdp-dmd -v --html \
 --output-dir=tmp/program_output_dir
-dmd_testrun_find_sdl_dir_epub:
-	$(SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND) \
+dmd_testrun_find_dir_epub:
+	$(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \
 ./bin/sdp-dmd -v --epub \
 --output-dir=tmp/program_output_dir
-dmd_testrun_find_sdl_dir_all:
-	$(SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND) \
+dmd_testrun_find_dir_all:
+	$(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \
 ./bin/sdp-dmd -v --source --html --epub --sqlite-discrete \
 --sqlite-create --sqlite-update \
 --output-dir=tmp/program_output_dir
 #+END_SRC
 
 ****** file list
-******* toml
 
 #+BEGIN_SRC makefile :tangle makefile
-dmd_testrun_filelist_toml_dir_source:
+dmd_testrun_filelist_dir_source:
 	./bin/sdp-dmd -v --source \
 --output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_TOML)
-dmd_testrun_filelist_toml_dir_sisupod:
+$(SiSU_MARKUP_SAMPLES_DIR)
+dmd_testrun_filelist_dir_sisupod:
 	./bin/sdp-dmd -v --sisupod \
 --output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_TOML)
-dmd_testrun_filelist_toml_dir_html:
+$(SiSU_MARKUP_SAMPLES_DIR)
+dmd_testrun_filelist_dir_html:
 	./bin/sdp-dmd -v --html \
 --output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_TOML)
-dmd_testrun_filelist_toml_dir_epub:
+$(SiSU_MARKUP_SAMPLES_DIR)
+dmd_testrun_filelist_dir_epub:
 	./bin/sdp-dmd -v --epub \
 --output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_TOML)
-dmd_testrun_filelist_toml_dir_all:
+$(SiSU_MARKUP_SAMPLES_DIR)
+dmd_testrun_filelist_dir_all:
 	./bin/sdp-dmd -v --source --html --epub --sqlite-discrete \
 --sqlite-create --sqlite-update \
 --output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_TOML)
-#+END_SRC
-
-******* sdlang
-
-#+BEGIN_SRC makefile :tangle makefile
-dmd_testrun_filelist_sdl_dir_source:
-	./bin/sdp-dmd -v --source \
---output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_SDL)
-dmd_testrun_filelist_sdl_dir_sisupod:
-	./bin/sdp-dmd -v --sisupod \
---output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_SDL)
-dmd_testrun_filelist_sdl_dir_html:
-	./bin/sdp-dmd -v --html \
---output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_SDL)
-dmd_testrun_filelist_sdl_dir_epub:
-	./bin/sdp-dmd -v --epub \
---output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_SDL)
-dmd_testrun_filelist_sdl_dir_all:
-	./bin/sdp-dmd -v --source --html --epub --sqlite-discrete \
---sqlite-create --sqlite-update \
---output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_SDL)
+$(SiSU_MARKUP_SAMPLES_DIR)
 #+END_SRC
 
 ***** gdc
 ****** find files
-******* toml
-
-#+BEGIN_SRC makefile :tangle makefile
-gdc_testrun_find_toml_dir_source:
-	./bin/sdp-gdc -v --source \
---output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_TOML)
-gdc_testrun_find_toml_dir_sisupod:
-	$(SiSU_MARKUP_SAMPLES_DIR_TOML_FILES_FOUND) \
-./bin/sdp-gdc -v --sisupod \
---output-dir=tmp/program_output_dir
-gdc_testrun_find_toml_dir_html:
-	$(SiSU_MARKUP_SAMPLES_DIR_TOML_FILES_FOUND) \
-./bin/sdp-gdc -v --html \
---output-dir=tmp/program_output_dir
-gdc_testrun_find_toml_dir_epub:
-	$(SiSU_MARKUP_SAMPLES_DIR_TOML_FILES_FOUND) \
-./bin/sdp-gdc -v --epub \
---output-dir=tmp/program_output_dir
-gdc_testrun_find_toml_dir_all:
-	$(SiSU_MARKUP_SAMPLES_DIR_TOML_FILES_FOUND) \
-./bin/sdp-gdc -v --source --html --epub --sqlite-discrete \
---sqlite-create --sqlite-update \
---output-dir=tmp/program_output_dir
-#+END_SRC
-
-******* sdlang
 
 #+BEGIN_SRC makefile :tangle makefile
-gdc_testrun_find_sdl_dir_source:
+gdc_testrun_find_dir_source:
 	./bin/sdp-gdc -v --source \
 --output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_SDL)
-gdc_testrun_find_sdl_dir_sisupod:
-	$(SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND) \
+$(SiSU_MARKUP_SAMPLES_DIR)
+gdc_testrun_find_dir_sisupod:
+	$(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \
 ./bin/sdp-gdc -v --sisupod \
 --output-dir=tmp/program_output_dir
-gdc_testrun_find_sdl_dir_html:
-	$(SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND) \
+gdc_testrun_find_dir_html:
+	$(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \
 ./bin/sdp-gdc -v --html \
 --output-dir=tmp/program_output_dir
-gdc_testrun_find_sdl_dir_epub:
-	$(SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND) \
+gdc_testrun_find_dir_epub:
+	$(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \
 ./bin/sdp-gdc -v --epub \
 --output-dir=tmp/program_output_dir
-gdc_testrun_find_sdl_dir_all:
-	$(SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND) \
+gdc_testrun_find_dir_all:
+	$(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \
 ./bin/sdp-gdc -v --source --html --epub --sqlite-discrete \
 --sqlite-create --sqlite-update \
 --output-dir=tmp/program_output_dir
 #+END_SRC
 
 ****** file list
-******* toml
 
 #+BEGIN_SRC makefile :tangle makefile
-gdc_testrun_filelist_toml_dir_source:
+gdc_testrun_filelist_dir_source:
 	./bin/sdp-gdc -v --source \
 --output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_TOML)
-gdc_testrun_filelist_toml_dir_sisupod:
+$(SiSU_MARKUP_SAMPLES_DIR)
+gdc_testrun_filelist_dir_sisupod:
 	./bin/sdp-gdc -v --sisupod \
 --output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_TOML)
-gdc_testrun_filelist_toml_dir_html:
+$(SiSU_MARKUP_SAMPLES_DIR)
+gdc_testrun_filelist_dir_html:
 	./bin/sdp-gdc -v --html \
 --output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_TOML)
-gdc_testrun_filelist_toml_dir_epub:
+$(SiSU_MARKUP_SAMPLES_DIR)
+gdc_testrun_filelist_dir_epub:
 	./bin/sdp-gdc -v --epub \
 --output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_TOML)
-gdc_testrun_filelist_toml_dir_all:
+$(SiSU_MARKUP_SAMPLES_DIR)
+gdc_testrun_filelist_dir_all:
 	./bin/sdp-gdc -v --source --html --epub --sqlite-discrete \
 --sqlite-create --sqlite-update \
 --output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_TOML)
-#+END_SRC
-
-******* sdlang
-
-#+BEGIN_SRC makefile :tangle makefile
-gdc_testrun_filelist_sdl_dir_source:
-	./bin/sdp-gdc -v --source \
---output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_SDL)
-gdc_testrun_filelist_sdl_dir_sisupod:
-	./bin/sdp-gdc -v --sisupod \
---output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_SDL)
-gdc_testrun_filelist_sdl_dir_html:
-	./bin/sdp-gdc -v --html \
---output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_SDL)
-gdc_testrun_filelist_sdl_dir_epub:
-	./bin/sdp-gdc -v --epub \
---output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_SDL)
-gdc_testrun_filelist_sdl_dir_all:
-	./bin/sdp-gdc -v --source --html --epub --sqlite-discrete \
---sqlite-create --sqlite-update \
---output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_SDL)
+$(SiSU_MARKUP_SAMPLES_DIR)
 #+END_SRC
 
 ***** ldc
 ****** find files
-******* toml
-
-#+BEGIN_SRC makefile :tangle makefile
-ldc_testrun_find_toml_dir_source:
-	$(SiSU_MARKUP_SAMPLES_DIR_TOML_FILES_FOUND) \
-./bin/sdp-ldc -v --source \
---output-dir=tmp/program_output_dir
-ldc_testrun_find_toml_dir_sisupod:
-	$(SiSU_MARKUP_SAMPLES_DIR_TOML_FILES_FOUND) \
-./bin/sdp-ldc -v --sisupod \
---output-dir=tmp/program_output_dir
-ldc_testrun_find_toml_dir_html:
-	$(SiSU_MARKUP_SAMPLES_DIR_TOML_FILES_FOUND) \
-./bin/sdp-ldc -v --html \
---output-dir=tmp/program_output_dir
-ldc_testrun_find_toml_dir_epub:
-	$(SiSU_MARKUP_SAMPLES_DIR_TOML_FILES_FOUND) \
-./bin/sdp-ldc -v --epub \
---output-dir=tmp/program_output_dir
-ldc_testrun_find_toml_dir_all:
-	$(SiSU_MARKUP_SAMPLES_DIR_TOML_FILES_FOUND) \
-./bin/sdp-ldc -v --source --html --epub --sqlite-discrete \
---sqlite-create --sqlite-update \
---output-dir=tmp/program_output_dir
-#+END_SRC
-
-******* sdlang
 
 #+BEGIN_SRC makefile :tangle makefile
-ldc_testrun_find_sdl_dir_source:
-	$(SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND) \
+ldc_testrun_find_dir_source:
+	$(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \
 ./bin/sdp-ldc -v --source \
 --output-dir=tmp/program_output_dir
-ldc_testrun_find_sdl_dir_sisupod:
-	$(SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND) \
+ldc_testrun_find_dir_sisupod:
+	$(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \
 ./bin/sdp-ldc -v --sisupod \
 --output-dir=tmp/program_output_dir
-ldc_testrun_find_sdl_dir_html:
-	$(SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND) \
+ldc_testrun_find_dir_html:
+	$(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \
 ./bin/sdp-ldc -v --html \
 --output-dir=tmp/program_output_dir
-ldc_testrun_find_sdl_dir_epub:
-	$(SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND) \
+ldc_testrun_find_dir_epub:
+	$(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \
 ./bin/sdp-ldc -v --epub \
 --output-dir=tmp/program_output_dir
-ldc_testrun_find_sdl_dir_all:
-	$(SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND) \
+ldc_testrun_find_dir_all:
+	$(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \
 ./bin/sdp-ldc -v --source --html --epub --sqlite-discrete \
 --sqlite-create --sqlite-update \
 --output-dir=tmp/program_output_dir
 #+END_SRC
 
 ****** file list
-******* toml
 
 #+BEGIN_SRC makefile :tangle makefile
-ldc_testrun_filelist_toml_dir_source:
+ldc_testrun_filelist_dir_source:
 	./bin/sdp-ldc -v --source \
 --output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_TOML)
-ldc_testrun_filelist_toml_dir_sisupod:
+$(SiSU_MARKUP_SAMPLES_DIR)
+ldc_testrun_filelist_dir_sisupod:
 	./bin/sdp-ldc -v --sisupod \
 --output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_TOML)
-ldc_testrun_filelist_toml_dir_html:
+$(SiSU_MARKUP_SAMPLES_DIR)
+ldc_testrun_filelist_dir_html:
 	./bin/sdp-ldc -v --html \
 --output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_TOML)
-ldc_testrun_filelist_toml_dir_epub:
+$(SiSU_MARKUP_SAMPLES_DIR)
+ldc_testrun_filelist_dir_epub:
 	./bin/sdp-ldc -v --epub \
 --output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_TOML)
-ldc_testrun_filelist_toml_dir_all:
+$(SiSU_MARKUP_SAMPLES_DIR)
+ldc_testrun_filelist_dir_all:
 	./bin/sdp-ldc -v --source --html --epub --sqlite-discrete \
 --sqlite-create --sqlite-update \
 --output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_TOML)
-#+END_SRC
-
-******* sdlang
-
-#+BEGIN_SRC makefile :tangle makefile
-ldc_testrun_filelist_sdl_dir_source:
-	./bin/sdp-ldc -v --source \
---output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_SDL)
-ldc_testrun_filelist_sdl_dir_sisupod:
-	./bin/sdp-ldc -v --sisupod \
---output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_SDL)
-ldc_testrun_filelist_sdl_dir_html:
-	./bin/sdp-ldc -v --html \
---output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_SDL)
-ldc_testrun_filelist_sdl_dir_epub:
-	./bin/sdp-ldc -v --epub \
---output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_SDL)
-ldc_testrun_filelist_sdl_dir_all:
-	./bin/sdp-ldc -v --source --html --epub --sqlite-discrete \
---sqlite-create --sqlite-update \
---output-dir=tmp/program_output_dir \
-$(SiSU_MARKUP_SAMPLES_DIR_SDL)
+$(SiSU_MARKUP_SAMPLES_DIR)
 #+END_SRC
 
 *** org babel tangle batch process command                         :tangle:
@@ -1236,7 +805,6 @@ stringImportPaths "./views"
 buildRequirements "allowWarnings"
 dependency        "toml"      version="~>0.4.0-rc.2" # https://code.dlang.org/packages/toml       https://github.com/toml-lang/toml/wiki
 dependency        "toml:json" version="~>0.4.0-rc.2"
-dependency        "sdlang-d"  version="~>0.10.1"     # https://code.dlang.org/packages/sdlang-d   https://github.com/Abscissa/SDLang-D
 dependency        "d2sqlite3" version="~>0.13.1"     # https://code.dlang.org/packages/d2sqlite3  http://biozic.github.io/d2sqlite3/d2sqlite3.html
 subconfiguration  "d2sqlite3" "all-included"
 dependency        "archive"   version="~>0.6.0"      # http://code.dlang.org/packages/archive     https://github.com/rcythr/archive
@@ -1509,19 +1077,15 @@ mixin build!(_compile, _dub_conf);
 !src/*
 !data
 !data/*
-!data/toml/*
-!data/sdlang/*
-!data/toml/sisupod/**
-!data/toml/sisudir/**
-!data/sdlang/sisupod/**
-!data/sdlang/sisudir/**
+!data/sisupod/**
+!data/sisudir/**
 !*.sst
 !*.ssm
 !**/*.sst
 !**/*.ssm
 !sisupod.manifest
-!sisu_document_make.sdl
-!config_local_site.sdl
+!sisu_document_make
+!config_local_site
 !sisu_document_make.toml
 !config_local_site.toml
 !sisudoc
@@ -1590,7 +1154,6 @@ time (dub --compiler=gdc --config=sdp-gdc --debug=steps)
 time (dub --compiler=ldc2 --config=sdp-ldc --debug=checkdoc --debug=summary --debug=dumpdoc)
 time (dub --compiler=ldc2 --config=sdp-ldc --debug=io)
 time (dub --compiler=ldc2 --config=sdp-ldc --debug=checkdoc --debug=summary --debug=dumpdoc --debug=io)
-time (dub --compiler=ldc2 --config=sdp-ldc --debug=steps --debug=configsdlang)
 time (dub --compiler=ldc2 --config=sdp-ldc-debug --debug=io)
 time (dub --compiler=gdc --config=sdp-gdc-debug --debug=io)
 time (dub --compiler=dmd --config=sdp-dmd-debug --debug=io)
@@ -1676,16 +1239,11 @@ git log --since="1 day ago" --name-only --pretty=format: | sort -u
 
 ** test run
 *** e.g.
-time (./bin/sdp-ldc --source --html -v --output-dir=tmp/program-output data/toml/sisupod/sisu-manual/media/text/en/sisu_markup.sst )
-time (./bin/sdp-ldc --source --html -v --output-dir=tmp/program-output data/sdlang/sisupod/sisu-manual/media/text/en/sisu_markup.sst )
+time (./bin/sdp-ldc --source --html -v --output-dir=tmp/program-output data/sisupod/sisu-manual/media/text/en/sisu_markup.sst )
 
-time (./bin/sdp-ldc --source --html -v --output-dir=tmp/program-output data/toml/sisupod/sisu-manual )
-time (./bin/sdp-ldc --source --html -v --output-dir=tmp/program-output data/toml/sisupod/the_wealth_of_networks.yochai_benkler )
-time (./bin/sdp-ldc --source --html -v --output-dir=tmp/program-output data/toml/sisupod/live-manual )
-
-time (./bin/sdp-ldc --source --html -v --output-dir=tmp/program-output data/sdlang/sisupod/sisu-manual )
-time (./bin/sdp-ldc --source --html -v --output-dir=tmp/program-output data/sdlang/sisupod/the_wealth_of_networks.yochai_benkler )
-time (./bin/sdp-ldc --source --html -v --output-dir=tmp/program-output data/sdlang/sisupod/live-manual )
+time (./bin/sdp-ldc --source --html -v --output-dir=tmp/program-output data/sisupod/sisu-manual )
+time (./bin/sdp-ldc --source --html -v --output-dir=tmp/program-output data/sisupod/the_wealth_of_networks.yochai_benkler )
+time (./bin/sdp-ldc --source --html -v --output-dir=tmp/program-output data/sisupod/live-manual )
 
 time (~sdp2/bin/sdp-ldc --sisupod --source --html --epub --sqlite-create --sqlite-update -v sisudoc/media/text/en/sisu_markup_stress_test.sst sisudoc/media/text/en/the_wealth_of_networks.yochai_benkler.sst )
 
@@ -1698,30 +1256,18 @@ e.g. live-manual a multilingual document (with source file inserts .ssi)
 
 time (~sdp2/bin/sdp-ldc --html --lang=en,es -v sisudoc)
 
-time ( find data/toml/sisupod -name sisupod.manifest | sort | xargs ./bin/sdp-ldc --source --html --epub -v --output-dir=tmp/program-output )
-
-time ( find data/toml/sisupod -maxdepth 2 -name sisupod.manifest | sort | xargs ./bin/sdp-ldc --source --html --epub -v --output-dir=tmp/program-output )
-time ( find data/toml/sisudir/media/text -name *.ss[tm] | sort | xargs ./bin/sdp-ldc --source --html --epub -v --output-dir=tmp/program-output )
-
-find data/toml/sisupod -maxdepth 2 -name sisupod.manifest | sort | xargs
+time ( find data/sisupod -name sisupod.manifest | sort | xargs ./bin/sdp-ldc --source --html --epub -v --output-dir=tmp/program-output )
 
-find data/toml/sisudir/media/text -name *.ss[tm] | sort | xargs
+time ( find data/sisupod -maxdepth 2 -name sisupod.manifest | sort | xargs ./bin/sdp-ldc --source --html --epub -v --output-dir=tmp/program-output )
+time ( find data/sisudir/media/text -name *.ss[tm] | sort | xargs ./bin/sdp-ldc --source --html --epub -v --output-dir=tmp/program-output )
 
-time ( find data/sdlang/sisupod -name sisupod.manifest | sort | xargs ./bin/sdp-ldc --source --html --epub -v --output-dir=tmp/program-output )
+find data/sisupod -maxdepth 2 -name sisupod.manifest | sort | xargs
 
-time ( find data/sdlang/sisupod -maxdepth 2 -name sisupod.manifest | sort | xargs ./bin/sdp-ldc --source --html --epub -v --output-dir=tmp/program-output )
-time ( find data/sdlang/sisudir/media/text -name *.ss[tm] | sort | xargs ./bin/sdp-ldc --source --html --epub -v --output-dir=tmp/program-output )
-
-find data/sdlang/sisupod -maxdepth 2 -name sisupod.manifest | sort | xargs
-
-find data/sdlang/sisudir/media/text -name *.ss[tm] | sort | xargs
+find data/sisudir/media/text -name *.ss[tm] | sort | xargs
 
 *** list markup files
-find data/toml/sisupod -name sisupod.manifest | sort
-find data/toml/sisudir/media/text -name *.ss[tm] | sort
-
-find data/sdlang/sisupod -name sisupod.manifest | sort
-find data/sdlang/sisudir/media/text -name *.ss[tm] | sort
+find data/sisupod -name sisupod.manifest | sort
+find data/sisudir/media/text -name *.ss[tm] | sort
 
 time make ldc_testrun_paths_pod_sisupod
 time make ldc_testrun_paths_pod_sisupod | ag "^\".+\"|NOT found"
diff --git a/org/default_paths.org b/org/default_paths.org
index 914703c..f1d3301 100644
--- a/org/default_paths.org
+++ b/org/default_paths.org
@@ -370,12 +370,6 @@ template ConfigFilePaths() {
     E   _env,
   ) {
     struct ConfFilePaths {
-      auto config_filename_document_sdl() {
-        return "sisu_document_make.sdl";
-      }
-      auto config_filename_site_sdl() {
-        return "config_local_site.sdl";
-      }
       auto config_filename_document_toml() {
         return "sisu_document_make.toml";
       }
diff --git a/org/default_regex.org b/org/default_regex.org
index a5cf084..8edf0c1 100644
--- a/org/default_regex.org
+++ b/org/default_regex.org
@@ -110,7 +110,6 @@ static native_header_meta_title                       = ctRegex!(`^@title:\s`, "
 static variable_doc_title                             = ctRegex!(`@title`);
 static variable_doc_author                            = ctRegex!(`@author|@creator`);
 static raw_author_munge                               = ctRegex!(`(\S.+?),\s+(.+)`,"i");
-static sdlang_header_meta_title                       = ctRegex!(`^\s*title\s+["\\]`, "m");
 static toml_header_meta_title                         = ctRegex!(`^\s*(title\s*=\s*"|\[title\])`, "m");
 #+END_SRC
 
diff --git a/org/meta_conf_make_meta.org b/org/meta_conf_make_meta.org
index aa67709..c23d3aa 100644
--- a/org/meta_conf_make_meta.org
+++ b/org/meta_conf_make_meta.org
@@ -76,7 +76,7 @@ struct ConfCompositeMakeStr {
   string italics                        = "";
   string num_top                        = "";
   string num_depth                      = "";
-  JSONValue substitute                  = JSONValue( ["", ""] );
+  string[][] substitute;             // = [["", ""]];
   string texpdf_font                    = "";
 }
 struct confCompositeMakeBuild {
@@ -152,7 +152,7 @@ struct confCompositeMakeBuild {
   auto num_depth(string _mk) {
     return _mk;
   }
-  auto substitute(JSONValue _mk) {
+  auto substitute(string[][] _mk) {
     return _mk;
   }
   auto texpdf_font(string _mk) {
@@ -188,7 +188,7 @@ struct ConfCompositeMakeInit {
   auto italics_substitute_html          = "<i>$1</i>";
   string num_top                        = "";
   string num_depth                      = "";
-  auto substitute                       = JSONValue(["", ""]);
+  string[][] substitute;                // = [["", ""]];
   string texpdf_font                    = "";
 }
 #+END_SRC
@@ -495,7 +495,28 @@ if ("make" in _json.object) {
     _struct_composite.make_str.num_depth  = _json.object["num_depth"][""].str;
   }
   if ("substitute" in _json.object["make"]) {
-    _struct_composite.make_str.substitute  = _json.object["make"]["substitute"].arrayNoRef;
+    string[][] _sub;
+    if (
+      (_json.object["make"]["substitute"].type().to!string == "ARRAY")
+      && (_json.object["make"]["substitute"][0].type().to!string == "ARRAY")
+    ) {
+      foreach (substitute_pair; _json.object["make"]["substitute"].arrayNoRef) {
+        if ((substitute_pair.type().to!string) == "ARRAY") {
+          if (!empty(substitute_pair[0].str) && !empty(substitute_pair[1].str)) {
+            _sub ~= [ substitute_pair[0].str,  substitute_pair[1].str];
+          }
+        }
+      }
+    } else if (
+      (_json.object["make"]["substitute"].type().to!string == "ARRAY")
+      && (_json.object["make"]["substitute"][0].type().to!string == "STRING")
+    ) {
+       if (!empty(_json.object["make"]["substitute"][0].str) && !empty(_json.object["make"]["substitute"][1].str)) {
+         _sub = [[_json.object["make"]["substitute"][0].str, _json.object["make"]["substitute"][1].str]];
+       }
+    }
+    // writeln(_sub);
+    _struct_composite.make_str.substitute  = _sub;
   }
   if ("texpdf_font" in _json.object["make"]) {
     _struct_composite.make_str.texpdf_font  = _json.object["make"]["texpdf_font"].str;
@@ -878,9 +899,7 @@ static template docHeaderMakeAndMetaTupTomlExtractAndConvertToStruct() {
     Src     header_src,
   ) {
     TOMLDocument _doc;
-    if (header_src.match(rgx.sdlang_header_meta_title)) {
-      writeln("WARNING >>> document header is sdlang (in wrong location JSON)");
-    } else if (header_src.match(rgx.toml_header_meta_title)) {
+    if (header_src.match(rgx.toml_header_meta_title)) {
       debug (json) {
         writeln(">>> document header is toml, convert to JSON");
       }
@@ -893,538 +912,6 @@ static template docHeaderMakeAndMetaTupTomlExtractAndConvertToStruct() {
 }
 #+END_SRC
 
-* 3. SDLang to SiSUstruct
-** 1. header extract (sdlang) to Struct     :module:sdp:meta_conf_make_meta:
-
-#+BEGIN_SRC d :tangle ../src/sdp/meta/conf_make_meta_sdlang.d
-/++
-  extract native/orig header return associative array<BR>
-
-  the header is passed as text (lopped off top of a sisu markup file until the
-  required first heading ^A~), determine whether is a native header or sdlang one
-  with a regex check if whether it contains the "native header" required tag/field
-  @title: then process accordingly as a "native header" or "sdlang header"
-  converting the metadata and make instructions to a common json format used by
-  program internally. Moved to associative array.
-+/
-module sdp.meta.conf_make_meta_sdlang;
-static template docHeaderMakeAndMetaTupSDLangExtractAndConvertToStruct() {
-  import
-    std.exception,
-    std.regex,
-    std.stdio,
-    std.traits,
-    std.typecons,
-    std.utf,
-    std.conv : to;
-  import sdlang;
-  import
-    sdp.meta.conf_make_meta_sdlang,
-    sdp.meta.rgx;
-  mixin SiSUrgxInit;
-  mixin SiSUextractSDLang;
-  static auto rgx = Rgx();
-  auto docHeaderMakeAndMetaTupSDLangExtractAndConvertToStruct(CCm, Src)(
-    CCm     conf_composite_make,
-    Src     header_src,
-  ) {
-    auto header_sdlang_tag = (header_src.match(rgx.sdlang_header_meta_title))
-    ? extractSDL().docHeaderSDLtagGet(header_src) // sdlang.ast.Tag
-    : null;
-    auto header_make_and_meta_struct = extractSDL().docSDLtoStruct(conf_composite_make, header_sdlang_tag);
-    return header_make_and_meta_struct;
-  }
-}
-#+END_SRC
-
-** 2. module sdlang                  :module:sdp:meta_conf_make_meta_sdlang:
-*** 0. module template
-**** 1. extract sdlang
-#+BEGIN_SRC d :tangle ../src/sdp/meta/conf_make_meta_sdlang.d
-/++
-  sdlang headers<BR>
-  extract sdlang header return sdlang
-+/
-static template SiSUextractSDLang() {
-  import
-    std.exception,
-    std.regex,
-    std.stdio,
-    std.string,
-    std.traits,
-    std.typecons,
-    std.utf,
-    std.conv : to;
-  import
-    sdp.meta.conf_make_meta_structs,
-    sdp.meta.rgx;
-  struct extractSDL {
-    mixin SiSUmakeMetaStructsSDLang;
-    mixin SiSUrgxInit;
-    static auto rgx = Rgx();
-    <<meta_conf_make_meta_sdl_extract>>
-    private auto docSDLtoStruct(C,Tag)(C _conf_composite, Tag header_sdlang) { // work on
-      <<meta_conf_make_meta_sdl>>
-      return _conf_composite;
-    }
-  }
-}
-#+END_SRC
-
-**** 2. extract sdlang
-
-#+BEGIN_SRC d :tangle ../src/sdp/meta/conf_make_meta_sdlang.d
-static template parseSDLangConfig() {
-  import
-    std.exception,
-    std.regex,
-    std.stdio,
-    std.string,
-    std.traits,
-    std.typecons,
-    std.utf,
-    std.conv : to;
-  import sdlang;
-  <<meta_config_file_sdlang_test>>
-}
-#+END_SRC
-
-*** 1. sdlang root tag _extract root Tag_                   :sdlang:root:tag:
-**** 1. header
-
-#+name: meta_conf_make_meta_sdl_extract
-#+BEGIN_SRC d
-private auto docHeaderSDLtagGet(Hs)(Hs src_header) {
-  debug(asserts){
-    static assert(is(typeof(src_header) == char[]));
-  }
-  char[][] source_header_arr
-    = (cast(char[]) src_header).split(rgx.newline_eol_delimiter);
-  char[] _src_header;
-  foreach(header_line; source_header_arr) {
-    if (!match(header_line, rgx.comments)) {
-      _src_header ~= header_line ~ "\n";
-    }
-  }
-  scope(failure) {
-    stderr.writefln(
-      "%s\n%s\n%s:%s failed here:\n  _src_header: %s",
-      __MODULE__, __FUNCTION__,
-      __FILE__, __LINE__,
-      _src_header,
-    );
-  }
-  Tag sdl_root_header;
-  try {
-    sdl_root_header = parseSource(_src_header.to!string);
-  }
-  catch(ParseException e) {
-    stderr.writeln("SDLang problem with this document header:");
-    stderr.writeln(_src_header);
-    // Error messages of the form:
-    // myFile.sdl(5:28): Error: Invalid integer suffix.
-    stderr.writeln(e.msg);
-  }
-  debug(sdlang) {
-    writeln("header SDL:");
-    writeln(__LINE__, ": ",  sdl_root_header.toSDLDocument());
-    writeln(__LINE__, ": ",  sdl_root_header.maybe.namespaces);
-    writeln("header make sdlang: ", sdl_root_header.toSDLDocument());
-    writeln(__LINE__, ": ", sdl_root_header.getTagValues("title"));
-    writeln(__LINE__, ": ", sdl_root_header.getTagValues("creator"));
-    Tag creator = sdl_root_header.getTag("creator");
-    if (creator !is null) {
-      if ("author" in creator.maybe.tags) {
-        writeln(__LINE__, ": ", creator.getTagValues("author"));
-      } else if ("author" in creator.maybe.attributes) {
-        writeln(__LINE__, ": ", creator.maybe.attributes["author"][0].value);
-      }
-    }
-  }
-  return sdl_root_header; // sdlang.ast.Tag
-}
-#+END_SRC
-
-**** 2. conf & make
-
-#+name: meta_config_file_sdlang_test
-#+BEGIN_SRC d
-auto parseSDLangConfig(string configuration, string conf_sdl_filename) {
-  Tag sdl_root_conf;
-  try {
-    sdl_root_conf = parseSource(configuration);
-  }
-  catch(ParseException e) {
-    stderr.writeln("SDLang problem with content for ", conf_sdl_filename);
-    stderr.writeln(e.msg);
-  }
-  return sdl_root_conf;
-}
-#+END_SRC
-
-*** 2. _sdlang to struct_
-****  make
-
-#+name: meta_conf_make_meta_sdl
-#+BEGIN_SRC d
-/+ make ------------------------------------------------------------------- +/
-if ("make" in header_sdlang.maybe.tags) {
-  confCompositeMakeBuild _mk;
-  _conf_composite.make_str.bold                       = extractSDLangTabOrAttrib(header_sdlang, "make", "bold"); // TODO
-  _conf_composite.make_str.breaks                     = extractSDLangTabOrAttrib(header_sdlang, "make", "breaks");
-  _conf_composite.make_str.cover_image                = extractSDLangTabOrAttrib(header_sdlang, "make", "cover_image");
-  _conf_composite.make_str.css                        = extractSDLangTabOrAttrib(header_sdlang, "make", "css");
-  _conf_composite.make_str.emphasis                   = extractSDLangTabOrAttrib(header_sdlang, "make", "emphasis"); // TODO
-  _conf_composite.make_str.footer                     = extractSDLangTabOrAttrib(header_sdlang, "make", "footer");
-  _conf_composite.make_str.headings                   = extractSDLangTabOrAttrib(header_sdlang, "make", "headings");
-  _conf_composite.make_str.home_button_image          = extractSDLangTabOrAttrib(header_sdlang, "make", "home_button_image");
-  _conf_composite.make_str.home_button_text           = extractSDLangTabOrAttrib(header_sdlang, "make", "home_button_text");
-  _conf_composite.make_str.italics                    = extractSDLangTabOrAttrib(header_sdlang, "make", "italics"); // TODO
-  _conf_composite.make_str.num_top                    = extractSDLangTabOrAttrib(header_sdlang, "make", "num_top");
-  _conf_composite.make_str.num_depth                  = extractSDLangTabOrAttrib(header_sdlang, "make", "num_depth");
-  _conf_composite.make_str.substitute                 = extractSDLangTabOrAttrib(header_sdlang, "make", "substitute"); // TODO
-  _conf_composite.make_str.texpdf_font                = extractSDLangTabOrAttrib(header_sdlang, "make", "texpdf_font");
-  _conf_composite.make.bold_rgxmatch                  = _mk.bold_rgxmatch(_conf_composite.make_str.bold);
-  _conf_composite.make.breaks                         = _mk.breaks(_conf_composite.make_str.breaks);
-  _conf_composite.make.cover_image                    = _mk.cover_image(_conf_composite.make_str.cover_image);
-  _conf_composite.make.css                            = _mk.css(_conf_composite.make_str.css);
-  _conf_composite.make.emphasis_rgxmatch              = _mk.emphasis_rgxmatch(_conf_composite.make_str.emphasis);
-  _conf_composite.make.footer                         = _mk.footer(_conf_composite.make_str.footer);
-  _conf_composite.make.headings                       = _mk.headings(_conf_composite.make_str.headings);
-  _conf_composite.make.home_button_image              = _mk.home_button_image(_conf_composite.make_str.home_button_image);
-  _conf_composite.make.home_button_text               = _mk.home_button_text(_conf_composite.make_str.home_button_text);
-  _conf_composite.make.italics_rgxmatch               = _mk.italics_rgxmatch(_conf_composite.make_str.italics);
-  _conf_composite.make.num_top                        = _mk.num_top(_conf_composite.make_str.num_top);
-  _conf_composite.make.num_depth                      = _mk.num_depth(_conf_composite.make_str.num_depth);
-  _conf_composite.make.substitute                     = _mk.substitute(_conf_composite.make_str.substitute);
-  _conf_composite.make.texpdf_font                    = _mk.texpdf_font(_conf_composite.make_str.texpdf_font);
-}
-#+END_SRC
-
-****  conf
-
-#+name: meta_conf_make_meta_sdl
-#+BEGIN_SRC d
-/+ conf ------------------------------------------------------------------- +/
-if ("webserv" in header_sdlang.maybe.tags) {
-  _conf_composite.conf.webserv_url_root               = extractSDLangTabOrAttrib(header_sdlang, "webserv", "url_root");
-  _conf_composite.conf.webserv_path                   = extractSDLangTabOrAttrib(header_sdlang, "webserv", "path");
-  _conf_composite.conf.webserv_images                 = extractSDLangTabOrAttrib(header_sdlang, "webserv", "images");
-  _conf_composite.conf.webserv_cgi                    = extractSDLangTabOrAttrib(header_sdlang, "webserv", "cgi");
-  _conf_composite.conf.webserv_cgi_host               = extractSDLangTabOrAttrib(header_sdlang, "webserv", "cgi_host");
-  _conf_composite.conf.webserv_cgi_host_path          = extractSDLangTabOrAttrib(header_sdlang, "webserv", "cgi_host_path");
-  _conf_composite.conf.webserv_cgi_port               = extractSDLangTabOrAttrib(header_sdlang, "webserv", "cgi_port");
-  _conf_composite.conf.webserv_cgi_user               = extractSDLangTabOrAttrib(header_sdlang, "webserv", "cgi_user");
-  _conf_composite.conf.webserv_cgi_file_links         = extractSDLangTabOrAttrib(header_sdlang, "webserv", "cgi_file_links");
-}
-if ("processing" in header_sdlang.maybe.tags) {
-  _conf_composite.conf.processing_path                = extractSDLangTabOrAttrib(header_sdlang, "webserv", "processing_path");
-  _conf_composite.conf.processing_dir                 = extractSDLangTabOrAttrib(header_sdlang, "webserv", "processing_dir");
-  _conf_composite.conf.processing_concord_max         = extractSDLangTabOrAttrib(header_sdlang, "webserv", "processing_concord_max");
-}
-if ("flag" in header_sdlang.maybe.tags) {
-  _conf_composite.conf.flag_act0                      = extractSDLangTabOrAttrib(header_sdlang, "flag", "act0");
-  _conf_composite.conf.flag_act1                      = extractSDLangTabOrAttrib(header_sdlang, "flag", "act1");
-  _conf_composite.conf.flag_act2                      = extractSDLangTabOrAttrib(header_sdlang, "flag", "act2");
-  _conf_composite.conf.flag_act3                      = extractSDLangTabOrAttrib(header_sdlang, "flag", "act3");
-  _conf_composite.conf.flag_act4                      = extractSDLangTabOrAttrib(header_sdlang, "flag", "act4");
-  _conf_composite.conf.flag_act5                      = extractSDLangTabOrAttrib(header_sdlang, "flag", "act5");
-  _conf_composite.conf.flag_act6                      = extractSDLangTabOrAttrib(header_sdlang, "flag", "act6");
-  _conf_composite.conf.flag_act7                      = extractSDLangTabOrAttrib(header_sdlang, "flag", "act7");
-  _conf_composite.conf.flag_act8                      = extractSDLangTabOrAttrib(header_sdlang, "flag", "act8");
-  _conf_composite.conf.flag_act9                      = extractSDLangTabOrAttrib(header_sdlang, "flag", "act9");
-}
-if ("default" in header_sdlang.maybe.tags) {
-  _conf_composite.conf.default_papersize              = extractSDLangTabOrAttrib(header_sdlang, "default", "papersize");
-  _conf_composite.conf.default_text_wrap              = extractSDLangTabOrAttrib(header_sdlang, "default", "text_wrap");
-  _conf_composite.conf.default_emphasis               = extractSDLangTabOrAttrib(header_sdlang, "default", "emphasis");
-  _conf_composite.conf.default_language               = extractSDLangTabOrAttrib(header_sdlang, "default", "language");
-  _conf_composite.conf.default_digest                 = extractSDLangTabOrAttrib(header_sdlang, "default", "digest");
-}
-if ("search" in header_sdlang.maybe.tags) {
-  _conf_composite.conf.search_flag                    = extractSDLangTabOrAttrib(header_sdlang, "search", "flag");
-  _conf_composite.conf.search_action                  = extractSDLangTabOrAttrib(header_sdlang, "search", "action");
-  _conf_composite.conf.search_db                      = extractSDLangTabOrAttrib(header_sdlang, "search", "db");
-  _conf_composite.conf.search_title                   = extractSDLangTabOrAttrib(header_sdlang, "search", "title");
-}
-#+END_SRC
-
-****  meta
-
-#+name: meta_conf_make_meta_sdl
-#+BEGIN_SRC d
-/+ meta ------------------------------------------------------------------- +/
-if ("classify" in header_sdlang.maybe.tags) {
-  _conf_composite.meta.classify_dewey                 = extractSDLangTabOrAttrib(header_sdlang, "classify", "dewey");
-  _conf_composite.meta.classify_keywords              = extractSDLangTabOrAttrib(header_sdlang, "classify", "keywords");
-  _conf_composite.meta.classify_loc                   = extractSDLangTabOrAttrib(header_sdlang, "classify", "loc");
-  _conf_composite.meta.classify_subject               = extractSDLangTabOrAttrib(header_sdlang, "classify", "subject");
-  _conf_composite.meta.classify_topic_register        = extractSDLangTabOrAttrib(header_sdlang, "classify", "topic_register");
-}
-if ("date" in header_sdlang.maybe.tags) {
-  _conf_composite.meta.date_added_to_site             = extractSDLangTabOrAttrib(header_sdlang, "date", "added_to_site");
-  _conf_composite.meta.date_available                 = extractSDLangTabOrAttrib(header_sdlang, "date", "available");
-  _conf_composite.meta.date_created                   = extractSDLangTabOrAttrib(header_sdlang, "date", "created");
-  _conf_composite.meta.date_issued                    = extractSDLangTabOrAttrib(header_sdlang, "date", "issued");
-  _conf_composite.meta.date_modified                  = extractSDLangTabOrAttrib(header_sdlang, "date", "modified");
-  _conf_composite.meta.date_published                 = extractSDLangTabOrAttrib(header_sdlang, "date", "published");
-  _conf_composite.meta.date_valid                     = extractSDLangTabOrAttrib(header_sdlang, "date", "valid");
-}
-if ("identifier" in header_sdlang.maybe.tags) {
-  _conf_composite.meta.identifier_isbn                = extractSDLangTabOrAttrib(header_sdlang, "identifier", "isbn");
-  _conf_composite.meta.identifier_oclc                = extractSDLangTabOrAttrib(header_sdlang, "identifier", "oclc");
-  _conf_composite.meta.identifier_pg                  = extractSDLangTabOrAttrib(header_sdlang, "identifier", "pg");
-}
-if ("links" in header_sdlang.maybe.tags) {
-  // _conf_composite.meta.links                         = extractSDLangTabOrAttrib(header_sdlang, "links", "");
-}
-if ("notes" in header_sdlang.maybe.tags) {
-  _conf_composite.meta.notes_abstract                 = extractSDLangTabOrAttrib(header_sdlang, "notes", "abstract");
-  _conf_composite.meta.notes_description              = extractSDLangTabOrAttrib(header_sdlang, "notes", "description");
-}
-if ("original" in header_sdlang.maybe.tags) {
-  _conf_composite.meta.original_language              = extractSDLangTabOrAttrib(header_sdlang, "original", "language");
-  _conf_composite.meta.original_language_char         = extractSDLangTabOrAttrib(header_sdlang, "original", "language_char");
-  _conf_composite.meta.original_source                = extractSDLangTabOrAttrib(header_sdlang, "original", "source");
-  _conf_composite.meta.original_title                 = extractSDLangTabOrAttrib(header_sdlang, "original", "title");
-}
-if ("publisher" in header_sdlang.maybe.tags) {
-  // _conf_composite.meta.publisher                     = extractSDLangTabOrAttrib(header_sdlang, "publisher", "");
-}
-if ("rights" in header_sdlang.maybe.tags) {
-  _conf_composite.meta.rights_copyright               = extractSDLangTabOrAttrib(header_sdlang, "rights", "copyright");
-  _conf_composite.meta.rights_copyright_text          = extractSDLangTabOrAttrib(header_sdlang, "rights", "copyright_text");
-  _conf_composite.meta.rights_copyright_audio         = extractSDLangTabOrAttrib(header_sdlang, "rights", "copyright_audio");
-  _conf_composite.meta.rights_copyright_cover         = extractSDLangTabOrAttrib(header_sdlang, "rights", "copyright_cover");
-  _conf_composite.meta.rights_copyright_illustrations = extractSDLangTabOrAttrib(header_sdlang, "rights", "copyright_illustrations");
-  _conf_composite.meta.rights_copyright_photographs   = extractSDLangTabOrAttrib(header_sdlang, "rights", "copyright_photographs");
-  _conf_composite.meta.rights_copyright_translation   = extractSDLangTabOrAttrib(header_sdlang, "rights", "copyright_translation");
-  _conf_composite.meta.rights_copyright_video         = extractSDLangTabOrAttrib(header_sdlang, "rights", "copyright_video");
-  _conf_composite.meta.rights_license                 = extractSDLangTabOrAttrib(header_sdlang, "rights", "license");
-}
-if (_conf_composite.meta.creator_author.empty) {
-  if ("creator" in header_sdlang.maybe.tags) {
-    _conf_composite.meta.creator_author               = extractSDLangTabOrAttrib(header_sdlang, "creator", "author");
-    _conf_composite.meta.creator_author_email         = extractSDLangTabOrAttrib(header_sdlang, "creator", "author_email");
-    _conf_composite.meta.creator_illustrator          = extractSDLangTabOrAttrib(header_sdlang, "creator", "illustrator");
-    _conf_composite.meta.creator_translator           = extractSDLangTabOrAttrib(header_sdlang, "creator", "translator");
-  }
-  // dochead_meta["creator"]["author_raw"] = dochead_meta["creator"]["author"];
-  string[] authors_arr;
-  auto authors_raw_arr = _conf_composite.meta.creator_author.split(rgx.arr_delimiter);
-  foreach (author_raw; authors_raw_arr) {
-    authors_arr ~= author_raw.replace(rgx.raw_author_munge, "$2 $1");
-  }
-  _conf_composite.meta.creator_author = join(authors_arr, ", ").chomp.chomp;
-}
-if (_conf_composite.meta.title_main.empty) {
-  if ("title" in header_sdlang.maybe.tags) {
-    _conf_composite.meta.title_edition                = extractSDLangTabOrAttrib(header_sdlang, "title", "edition");
-    // _conf_composite.meta.title_full                  = extractSDLangTabOrAttrib(header_sdlang, "title", "full");
-    _conf_composite.meta.title_language               = extractSDLangTabOrAttrib(header_sdlang, "title", "language");
-    _conf_composite.meta.title_main                   = extractSDLangTabOrAttrib(header_sdlang, "title", "main");
-    _conf_composite.meta.title_note                   = extractSDLangTabOrAttrib(header_sdlang, "title", "note");
-    _conf_composite.meta.title_sub                    = extractSDLangTabOrAttrib(header_sdlang, "title", "sub");
-    _conf_composite.meta.title_subtitle               = extractSDLangTabOrAttrib(header_sdlang, "title", "subtitle");
-  }
-  if (_conf_composite.meta.title_main.empty) {
-    Tag _maintag = header_sdlang.getTag("title");
-    if (_maintag !is null) {
-      if ("main" in _maintag.maybe.tags) {
-        _conf_composite.meta.title_main
-          = to!string(_maintag.getTagValues("main"));
-      } else if ("main" !in _maintag.maybe.attributes) {
-        _conf_composite.meta.title_main
-          = (_maintag.values[0]).to!string; // test that this exists
-      }
-    }
-  }
-  if ((!(_conf_composite.meta.title_subtitle.empty))
-  && (_conf_composite.meta.title_sub.empty)) {
-    _conf_composite.meta.title_sub = _conf_composite.meta.title_subtitle;
-  }
-  _conf_composite.meta.title_full = (_conf_composite.meta.title_sub.empty)
-  ? _conf_composite.meta.title_main
-  : format(
-      "%s - %s",
-      _conf_composite.meta.title_main,
-      _conf_composite.meta.title_sub,
-    );
-}
-#+END_SRC
-
-** 3. module conf files make composite
-*** TODO 0. module template
-
-#+BEGIN_SRC d :tangle ../src/sdp/meta/conf_make_meta_sdlang.d
-/++
-  return composite make from config files
-+/
-<<meta_conf_make_meta_sdl_to_composite_struct>>
-template confFilesSDLtoStruct() {
-  import
-    std.exception,
-    std.regex,
-    std.stdio,
-    std.string,
-    std.traits,
-    std.typecons,
-    std.utf,
-    std.conv : to;
-  import
-    sdp.meta.conf_make_meta_structs,
-    sdp.meta.rgx;
-  <<meta_conf_make_meta_sdl_to_composite>>
-}
-#+END_SRC
-
-*** _sdlang to parse_ composite make
-
-#+name: meta_conf_make_meta_sdl_to_composite
-#+BEGIN_SRC d
-auto configParseSDL(T)(
-  T _text
-){
-  Tag sdl_root;
-  try {
-    sdl_root = parseSource(_text.to!string);
-  }
-  catch(ParseException e) {
-    stderr.writeln("SDLang problem with this document header:");
-    stderr.writeln(_src_header);
-    // Error messages of the form:
-    // myFile.sdl(5:28): Error: Invalid integer suffix.
-    stderr.writeln(e.msg);
-  }
-  debug(sdlang) {
-    writeln("header SDL:");
-    writeln(__LINE__, ": ",  sdl_root.toSDLDocument());
-    writeln(__LINE__, ": ",  sdl_root.maybe.namespaces);
-    writeln("header make sdlang: ", sdl_root.toSDLDocument());
-    writeln(__LINE__, ": ", sdl_root.getTagValues("title"));
-    writeln(__LINE__, ": ", sdl_root.getTagValues("creator"));
-    Tag creator = sdl_root.getTag("creator");
-    if (creator !is null) {
-      if ("author" in creator.maybe.tags) {
-        writeln(__LINE__, ": ", creator.getTagValues("author"));
-      } else if ("author" in creator.maybe.attributes) {
-        writeln(__LINE__, ": ", creator.maybe.attributes["author"][0].value);
-      }
-    }
-  }
-  return sdl_root; // sdlang.ast.Tag
-}
-#+END_SRC
-
-*** _sdlang to struct_ composite make
-
-#+name: meta_conf_make_meta_sdl_to_composite
-#+BEGIN_SRC d
-auto confFilesSDLtoStruct(S,L)(
-  S sdl_root_config_share,
-  L sdl_root_config_local,
-){
-  mixin SiSUmakeMetaStructsSDLang;
-  ConfCompositePlus _conf_composite;
-  foreach (conf_sdlang; [sdl_root_config_share, sdl_root_config_local]) {
-    if ("make" in conf_sdlang.maybe.tags) {
-      confCompositeMakeBuild _mk;
-      _conf_composite.make_str.bold               = extractSDLangTabOrAttrib(conf_sdlang, "make", "bold"); // TODO
-      _conf_composite.make_str.breaks             = extractSDLangTabOrAttrib(conf_sdlang, "make", "breaks");
-      _conf_composite.make_str.cover_image        = extractSDLangTabOrAttrib(conf_sdlang, "make", "cover_image");
-      _conf_composite.make_str.css                = extractSDLangTabOrAttrib(conf_sdlang, "make", "css");
-      _conf_composite.make_str.emphasis           = extractSDLangTabOrAttrib(conf_sdlang, "make", "emphasis"); // TODO
-      _conf_composite.make_str.footer             = extractSDLangTabOrAttrib(conf_sdlang, "make", "footer");
-      _conf_composite.make_str.headings           = extractSDLangTabOrAttrib(conf_sdlang, "make", "headings");
-      _conf_composite.make_str.home_button_image  = extractSDLangTabOrAttrib(conf_sdlang, "make", "home_button_image");
-      _conf_composite.make_str.home_button_text   = extractSDLangTabOrAttrib(conf_sdlang, "make", "home_button_text");
-      _conf_composite.make_str.italics            = extractSDLangTabOrAttrib(conf_sdlang, "make", "italics"); // TODO
-      _conf_composite.make_str.num_top            = extractSDLangTabOrAttrib(conf_sdlang, "make", "num_top");
-      _conf_composite.make_str.num_depth          = extractSDLangTabOrAttrib(conf_sdlang, "make", "num_depth");
-      _conf_composite.make_str.substitute         = extractSDLangTabOrAttrib(conf_sdlang, "make", "substitute"); // TODO
-      _conf_composite.make_str.texpdf_font        = extractSDLangTabOrAttrib(conf_sdlang, "make", "texpdf_font");
-      _conf_composite.make.bold_rgxmatch          = _mk.bold_rgxmatch(_conf_composite.make_str.bold); //
-      _conf_composite.make.breaks                 = _mk.breaks(_conf_composite.make_str.breaks);
-      _conf_composite.make.cover_image            = _mk.cover_image(_conf_composite.make_str.cover_image);
-      _conf_composite.make.css                    = _mk.css(_conf_composite.make_str.css);
-      _conf_composite.make.emphasis_rgxmatch      = _mk.emphasis_rgxmatch(_conf_composite.make_str.emphasis);
-      _conf_composite.make.footer                 = _mk.footer(_conf_composite.make_str.footer);
-      _conf_composite.make.headings               = _mk.headings(_conf_composite.make_str.headings);
-      _conf_composite.make.home_button_image      = _mk.home_button_image(_conf_composite.make_str.home_button_image);
-      _conf_composite.make.home_button_text       = _mk.home_button_text(_conf_composite.make_str.home_button_text);
-      _conf_composite.make.italics_rgxmatch       = _mk.italics_rgxmatch(_conf_composite.make_str.italics);
-      _conf_composite.make.num_top                = _mk.num_top(_conf_composite.make_str.num_top);
-      _conf_composite.make.num_depth              = _mk.num_depth(_conf_composite.make_str.num_depth);
-      _conf_composite.make.substitute             = _mk.substitute(_conf_composite.make_str.substitute); // TODO
-      _conf_composite.make.texpdf_font            = _mk.texpdf_font(_conf_composite.make_str.texpdf_font);
-    }
-  }
-  return _conf_composite;
-}
-#+END_SRC
-
-** 4. SDLang default make meta structs            :module:sdp:meta_defaults:
-
-#+name: tangle_defaults
-#+BEGIN_SRC d :tangle ../src/sdp/meta/conf_make_meta_sdlang.d
-/++
-  default settings
-+/
-template SiSUmakeMetaStructsSDLang() {
-  <<meta_defaults_imports>>
-  string extractSDLangTabOrAttrib(S)(
-    S conf_sdlang,
-    string maintab,
-    string atab
-  ) {
-    string _conf_composite_string = "";
-    if (maintab in conf_sdlang.maybe.tags) {
-      auto _maintag = conf_sdlang.getTag(maintab);
-      if (
-        (atab in _maintag.maybe.tags)
-        && (_maintag.getTagValues(atab).length > 0)
-      ) {
-        debug(configsdlang) {
-          writeln(
-            "  ", __LINE__,
-            ": sdl tag, ",
-            maintab, ":", atab, ": ",
-            _maintag.getTagValues(atab)[0]
-          );
-        }
-        if (_maintag.getTagValues(atab).length == 1) {
-          writeln((_maintag.getTagValues(atab)[0]).to!string);
-          _conf_composite_string
-            = (_maintag.getTagValues(atab)[0]).to!string;
-        } else if (_maintag.getTagValues(atab).length > 1) {
-          string _tmp = "";
-          foreach (st; _maintag.getTagValues(atab)) {
-            writeln(st.to!string, ";");
-            _tmp ~= st.to!string ~ ";";
-          }
-          _conf_composite_string = _tmp;
-        }
-      } else if (
-        (atab in _maintag.maybe.attributes)
-        && (_maintag.attributes[atab][0].value.length > 0)
-      ) {
-        debug(configsdlang) {
-          writeln(
-            "  ", __LINE__,
-            ": sdl attrib, ",
-            maintab, ":", atab, ": ",
-            _maintag.attributes[atab][0].value
-          );
-        }
-        _conf_composite_string
-          = (_maintag.attributes[atab][0].value).to!string;
-      }
-    }
-    return _conf_composite_string;
-  }
-}
-#+END_SRC
-
 * __END__
 ** notes headers
 
diff --git a/org/meta_read_source_files.org b/org/meta_read_source_files.org
index b97eb36..0879ab5 100644
--- a/org/meta_read_source_files.org
+++ b/org/meta_read_source_files.org
@@ -37,12 +37,11 @@ import
 +/
 module sdp.meta.read_config_files;
 <<meta_config_file_in>>
-<<meta_config_file_sdl>>
 <<meta_config_file_toml>>
 <<meta_config_file_hub>>
 #+END_SRC
 
-*** 0. read config files (config_local_site & sisu_document_make) toml or sdlang
+*** 0. read config files (config_local_site & sisu_document_make) toml
 **** 1. site configuration
 
 #+name: meta_config_file_hub
@@ -54,7 +53,7 @@ static template readConfigSite() {
     string conf_filename = "NONE";
     auto _conf_file_details = ConfigFilePaths!()(_manifest, _env);
     auto possible_config_path_locations = _conf_file_details.possible_config_path_locations.config_local_site;
-    foreach(conf_fn; [_conf_file_details.config_filename_site_toml, _conf_file_details.config_filename_site_sdl]) {
+    foreach(conf_fn; [_conf_file_details.config_filename_site_toml]) {
       foreach(pth; possible_config_path_locations) {
         auto conf_file = asNormalizedPath(chainPath(to!string(pth), conf_fn)).array;
         conf_filename = conf_fn;
@@ -106,7 +105,7 @@ static template readConfigDoc() {
     string conf_filename = "NONE";
     auto _conf_file_details = ConfigFilePaths!()(_manifest, _env);
     auto possible_config_path_locations = _conf_file_details.possible_config_path_locations.sisu_document_make;
-    foreach(conf_fn; [_conf_file_details.config_filename_document_toml, _conf_file_details.config_filename_document_sdl]) {
+    foreach(conf_fn; [_conf_file_details.config_filename_document_toml]) {
       foreach(pth; possible_config_path_locations) {
         auto conf_file = asNormalizedPath(chainPath(to!string(pth), conf_fn)).array;
         conf_filename = conf_fn;
@@ -146,136 +145,7 @@ static template readConfigDoc() {
 }
 #+END_SRC
 
-** A. SDLang
-*** 1. SDLang read config files (config_local_site & sisu_document_make) :file:config:
-**** SDLang config_local_site
-
-#+name: meta_config_file_in
-#+BEGIN_SRC d
-static template configReadInSiteSDL() {
-  <<imports_std>>
-  final string configReadInSiteSDL(M,E)(M manifest, E env) {
-    auto conf_file_details = ConfigFilePaths!()(manifest, env);
-    string conf_sdl = conf_file_details.config_filename_site_sdl;
-    auto possible_config_path_locations = conf_file_details.possible_config_path_locations.config_local_site;
-    string config_file_str;
-    debug(io) {
-      writeln("WARNING (io debug) in config filename: ", conf_sdl);
-      writeln("WARNING (io debug) in config possible path locations: ", possible_config_path_locations);
-    }
-    foreach(pth; possible_config_path_locations) {
-      auto conf_file = asNormalizedPath(chainPath(to!string(pth), conf_sdl)).array;
-      if (config_file_str.length > 0) {
-        break;
-      }
-      try {
-        if (exists(conf_file)) {
-          debug(io) {
-            writeln("WARNING (io debug) in config file found: ", conf_file);
-          }
-          config_file_str = conf_file.readText;
-          break;
-        }
-      }
-      catch (ErrnoException ex) {
-      }
-      catch (FileException ex) {
-      }
-    }
-    return config_file_str;
-  }
-}
-#+END_SRC
-
-**** SDLang sisu_document_make
-
-#+name: meta_config_file_in
-#+BEGIN_SRC d
-static template configReadInDocSDL() {
-  <<imports_std>>
-  final string configReadInDocSDL(M,E)(M manifest, E env) {
-    auto conf_file_details = ConfigFilePaths!()(manifest, env);
-    string conf_sdl = conf_file_details.config_filename_document_sdl;
-    auto possible_config_path_locations = conf_file_details.possible_config_path_locations.sisu_document_make;
-    string config_file_str;
-    debug(io) {
-      writeln("WARNING (io debug) in config filename: ", conf_sdl);
-      writeln("WARNING (io debug) in config possible path locations: ", possible_config_path_locations);
-    }
-    foreach(pth; possible_config_path_locations) {
-      auto conf_file = asNormalizedPath(chainPath(to!string(pth), conf_sdl)).array;
-      if (config_file_str.length > 0) {
-        break;
-      }
-      try {
-        if (exists(conf_file)) {
-          debug(io) {
-            writeln("WARNING (io debug) in config file found: ", conf_file);
-          }
-          config_file_str = conf_file.readText;
-          break;
-        }
-      }
-      catch (ErrnoException ex) {
-      }
-      catch (FileException ex) {
-      }
-    }
-    return config_file_str;
-  }
-}
-#+END_SRC
-
-*** 2. SDLang config files get (sdlang root tag)
-
-#+name: meta_config_file_sdl
-#+BEGIN_SRC d
-static template configSDLang() {
-  import sdlang;
-  <<imports_std>>
-  auto configSDLang(string configuration, string conf_sdl_filename) {
-    Tag sdl_root_conf;
-    try {
-      sdl_root_conf = parseSource(configuration);
-    }
-    catch(ParseException e) {
-      stderr.writeln("SDLang problem with content for ", conf_sdl_filename);
-      stderr.writeln(e.msg);
-    }
-    return sdl_root_conf;
-  }
-}
-#+END_SRC
-
-*** 3. SDLang config (config_local_site & sisu_document_make) :file:config:hub:
-
-#+name: meta_config_file_hub
-#+BEGIN_SRC d
-static template configReadSiteSDLang() {
-  <<imports_std>>
-  import sdlang;
-  final auto configReadSiteSDLang(M,E)(M manifest, E env) {
-    auto configuration = configReadInSiteSDL!()(manifest, env);
-    auto conf_file_details = ConfigFilePaths!()(manifest, env);
-    string conf_sdl = conf_file_details.config_filename_site_sdl;
-    auto sdl_root = configSDLang!()(configuration, conf_sdl);
-    return sdl_root;
-  }
-}
-static template configReadDocSDLang() {
-  <<imports_std>>
-  import sdlang;
-  final auto configReadDocSDLang(M,E)(M manifest, E env) {
-    auto configuration = configReadInDocSDL!()(manifest, env);
-    auto conf_file_details = ConfigFilePaths!()(manifest, env);
-    string conf_sdl = conf_file_details.config_filename_document_sdl;
-    auto sdl_root = configSDLang!()(configuration, conf_sdl);
-    return sdl_root;
-  }
-}
-#+END_SRC
-
-** B. TOML
+** A. TOML
 *** 1. TOML read config files (config_local_site & sisu_document_make) :file:config:
 **** TOML config_local_site
 
@@ -485,7 +355,6 @@ static template SiSUrawMarkupContent() {
     <<meta_markup_source_raw_get_insert_source_line_array>>
   }
   struct Inserts {
-    import sdp.meta.conf_make_meta_sdlang;
     auto scan_subdoc_source(O)(
       O        _opt_action,
       char[][] markup_sourcefile_insert_content,
diff --git a/org/sdp.org b/org/sdp.org
index 4d6971e..8530c4a 100644
--- a/org/sdp.org
+++ b/org/sdp.org
@@ -26,7 +26,7 @@ struct Version {
   int minor;
   int patch;
 }
-enum ver = Version(0, 24, 0);
+enum ver = Version(0, 25, 0);
 #+END_SRC
 
 ** compilation restrictions (supported compilers)
@@ -117,7 +117,6 @@ import
   sdp.meta.metadoc_summary,
   sdp.meta.metadoc_from_src,
   sdp.meta.conf_make_meta_structs,
-  sdp.meta.conf_make_meta_sdlang,
   sdp.meta.conf_make_meta_toml,
   sdp.meta.conf_make_meta_json,
   sdp.meta.defaults,
@@ -154,9 +153,6 @@ check:
 - http://github.com/Abscissa/SDLang-D
 - https://github.com/abscissa/libInputVisitor
 
-sdlang.parser,
-sdlang.exceptions;
-
 std.conv,
 std.variant,
 
@@ -183,8 +179,6 @@ mixin CompileTimeInfo;
 #+NAME: sdp_mixin
 #+BEGIN_SRC d
 mixin SiSUrgxInit;
-mixin SiSUmakeMetaStructsSDLang;
-mixin SiSUextractSDLang;
 mixin contentJSONtoSiSUstruct;
 mixin SiSUnode;
 mixin SiSUbiblio;
@@ -529,26 +523,15 @@ foreach(arg; args[1..$]) {
 }
 #+END_SRC
 
-**** config files load & read (toml or sdlang)
+**** config files load & read
 
 #+NAME: sdp_conf_files
 #+BEGIN_SRC d
-auto _config_document_struct = readConfigDoc!()(_manifest, _env); // document config file
+auto _config_document_struct = readConfigDoc!()(_manifest, _env);    // document config file
 auto _config_local_site_struct = readConfigSite!()(_manifest, _env); // local site config
 ConfCompositePlus _make_and_meta_struct;
-switch (_config_local_site_struct.filetype) {
-case "toml" :
-  _make_and_meta_struct = configParseTOMLreturnSiSUstruct!()(_make_and_meta_struct, _config_document_struct);
-  _make_and_meta_struct = configParseTOMLreturnSiSUstruct!()(_make_and_meta_struct, _config_local_site_struct);
-  break;
-case "sdl" :
-  auto sdl_root_config_document = parseSDLangConfig!()(_config_document_struct.content, _config_document_struct.filename);
-  auto sdl_root_config_local_site = parseSDLangConfig!()(_config_local_site_struct.content, _config_local_site_struct.filename);
-  _make_and_meta_struct = confFilesSDLtoStruct!()(sdl_root_config_document, sdl_root_config_local_site);
-  break;
-default :
-  break;
-}
+_make_and_meta_struct = configParseTOMLreturnSiSUstruct!()(_make_and_meta_struct, _config_document_struct);
+_make_and_meta_struct = configParseTOMLreturnSiSUstruct!()(_make_and_meta_struct, _config_local_site_struct);
 #+END_SRC
 
 ** 2a. actions independent of processing files
@@ -757,8 +740,8 @@ debug(header_and_body) {
 }
 #+END_SRC
 
-** 2. _document metadata_ & _make instructions_ (struct from toml or sdlang)        >>
-header: toml or sdlang
+** 2. _document metadata_ & _make instructions_ (struct from toml)                  >>
+header: toml
 - [[./meta_conf_make_meta.org][meta_conf_make_meta]]
 
 - read _document header_, split into:
@@ -775,18 +758,13 @@ header: toml or sdlang
 #+BEGIN_SRC d
 /+ ↓ split header into make and meta +/
 debug(steps) {
-  writeln("step2 commence → (read document header - toml or sdlang, return struct)");
+  writeln("step2 commence → (read document header - toml, return struct)");
 }
 _make_and_meta_struct =
-((_header_body_insertfilelist_imagelist[headBody.header]).match(rgx.toml_header_meta_title))
-? docHeaderMakeAndMetaTupTomlExtractAndConvertToStruct!()(
-    _make_and_meta_struct,
-    _header_body_insertfilelist_imagelist[headBody.header]
-  )
-: docHeaderMakeAndMetaTupSDLangExtractAndConvertToStruct!()(
-    _make_and_meta_struct,
-    _header_body_insertfilelist_imagelist[headBody.header]
-  );
+docHeaderMakeAndMetaTupTomlExtractAndConvertToStruct!()(
+  _make_and_meta_struct,
+  _header_body_insertfilelist_imagelist[headBody.header]
+);
 debug(steps) {
   writeln("- step2 complete");
 }
diff --git a/src/sdp/meta/conf_make_meta_json.d b/src/sdp/meta/conf_make_meta_json.d
index 0471dbf..c5585ce 100644
--- a/src/sdp/meta/conf_make_meta_json.d
+++ b/src/sdp/meta/conf_make_meta_json.d
@@ -75,7 +75,28 @@ static template contentJSONtoSiSUstruct() {
         _struct_composite.make_str.num_depth  = _json.object["num_depth"][""].str;
       }
       if ("substitute" in _json.object["make"]) {
-        _struct_composite.make_str.substitute  = _json.object["make"]["substitute"].arrayNoRef;
+        string[][] _sub;
+        if (
+          (_json.object["make"]["substitute"].type().to!string == "ARRAY")
+          && (_json.object["make"]["substitute"][0].type().to!string == "ARRAY")
+        ) {
+          foreach (substitute_pair; _json.object["make"]["substitute"].arrayNoRef) {
+            if ((substitute_pair.type().to!string) == "ARRAY") {
+              if (!empty(substitute_pair[0].str) && !empty(substitute_pair[1].str)) {
+                _sub ~= [ substitute_pair[0].str,  substitute_pair[1].str];
+              }
+            }
+          }
+        } else if (
+          (_json.object["make"]["substitute"].type().to!string == "ARRAY")
+          && (_json.object["make"]["substitute"][0].type().to!string == "STRING")
+        ) {
+           if (!empty(_json.object["make"]["substitute"][0].str) && !empty(_json.object["make"]["substitute"][1].str)) {
+             _sub = [[_json.object["make"]["substitute"][0].str, _json.object["make"]["substitute"][1].str]];
+           }
+        }
+        // writeln(_sub);
+        _struct_composite.make_str.substitute  = _sub;
       }
       if ("texpdf_font" in _json.object["make"]) {
         _struct_composite.make_str.texpdf_font  = _json.object["make"]["texpdf_font"].str;
diff --git a/src/sdp/meta/conf_make_meta_structs.d b/src/sdp/meta/conf_make_meta_structs.d
index 3253b45..88ec9ed 100644
--- a/src/sdp/meta/conf_make_meta_structs.d
+++ b/src/sdp/meta/conf_make_meta_structs.d
@@ -22,7 +22,7 @@ struct ConfCompositeMakeStr {
   string italics                        = "";
   string num_top                        = "";
   string num_depth                      = "";
-  JSONValue substitute                  = JSONValue( ["", ""] );
+  string[][] substitute;             // = [["", ""]];
   string texpdf_font                    = "";
 }
 struct confCompositeMakeBuild {
@@ -98,7 +98,7 @@ struct confCompositeMakeBuild {
   auto num_depth(string _mk) {
     return _mk;
   }
-  auto substitute(JSONValue _mk) {
+  auto substitute(string[][] _mk) {
     return _mk;
   }
   auto texpdf_font(string _mk) {
@@ -127,7 +127,7 @@ struct ConfCompositeMakeInit {
   auto italics_substitute_html          = "<i>$1</i>";
   string num_top                        = "";
   string num_depth                      = "";
-  auto substitute                       = JSONValue(["", ""]);
+  string[][] substitute;                // = [["", ""]];
   string texpdf_font                    = "";
 }
 struct ConfCompositeSiteLocal {
diff --git a/src/sdp/meta/conf_make_meta_toml.d b/src/sdp/meta/conf_make_meta_toml.d
index 4390c5c..d434f00 100644
--- a/src/sdp/meta/conf_make_meta_toml.d
+++ b/src/sdp/meta/conf_make_meta_toml.d
@@ -64,9 +64,7 @@ static template docHeaderMakeAndMetaTupTomlExtractAndConvertToStruct() {
     Src     header_src,
   ) {
     TOMLDocument _doc;
-    if (header_src.match(rgx.sdlang_header_meta_title)) {
-      writeln("WARNING >>> document header is sdlang (in wrong location JSON)");
-    } else if (header_src.match(rgx.toml_header_meta_title)) {
+    if (header_src.match(rgx.toml_header_meta_title)) {
       debug (json) {
         writeln(">>> document header is toml, convert to JSON");
       }
diff --git a/src/sdp/meta/metadoc.d b/src/sdp/meta/metadoc.d
index 8223029..37545f0 100644
--- a/src/sdp/meta/metadoc.d
+++ b/src/sdp/meta/metadoc.d
@@ -10,7 +10,6 @@ template SiSUabstraction() {
     sdp.meta.metadoc_summary,
     sdp.meta.metadoc_from_src,
     sdp.meta.conf_make_meta_structs,
-    sdp.meta.conf_make_meta_sdlang,
     sdp.meta.conf_make_meta_toml,
     sdp.meta.conf_make_meta_json,
     sdp.meta.defaults,
@@ -21,8 +20,6 @@ template SiSUabstraction() {
     sdp.output.hub,
     sdp.output.paths_source;
   mixin SiSUrgxInit;
-  mixin SiSUmakeMetaStructsSDLang;
-  mixin SiSUextractSDLang;
   mixin contentJSONtoSiSUstruct;
   mixin SiSUnode;
   mixin SiSUbiblio;
@@ -37,22 +34,11 @@ template SiSUabstraction() {
     O _opt_action,
     M _manifest,
   ){
-    auto _config_document_struct = readConfigDoc!()(_manifest, _env); // document config file
+    auto _config_document_struct = readConfigDoc!()(_manifest, _env);    // document config file
     auto _config_local_site_struct = readConfigSite!()(_manifest, _env); // local site config
     ConfCompositePlus _make_and_meta_struct;
-    switch (_config_local_site_struct.filetype) {
-    case "toml" :
-      _make_and_meta_struct = configParseTOMLreturnSiSUstruct!()(_make_and_meta_struct, _config_document_struct);
-      _make_and_meta_struct = configParseTOMLreturnSiSUstruct!()(_make_and_meta_struct, _config_local_site_struct);
-      break;
-    case "sdl" :
-      auto sdl_root_config_document = parseSDLangConfig!()(_config_document_struct.content, _config_document_struct.filename);
-      auto sdl_root_config_local_site = parseSDLangConfig!()(_config_local_site_struct.content, _config_local_site_struct.filename);
-      _make_and_meta_struct = confFilesSDLtoStruct!()(sdl_root_config_document, sdl_root_config_local_site);
-      break;
-    default :
-      break;
-    }
+    _make_and_meta_struct = configParseTOMLreturnSiSUstruct!()(_make_and_meta_struct, _config_document_struct);
+    _make_and_meta_struct = configParseTOMLreturnSiSUstruct!()(_make_and_meta_struct, _config_local_site_struct);
     /+ ↓ read file (filename with path) +/
     /+ ↓ file tuple of header and content +/
     debug(steps) {
@@ -73,18 +59,13 @@ template SiSUabstraction() {
     }
     /+ ↓ split header into make and meta +/
     debug(steps) {
-      writeln("step2 commence → (read document header - toml or sdlang, return struct)");
+      writeln("step2 commence → (read document header - toml, return struct)");
     }
     _make_and_meta_struct =
-    ((_header_body_insertfilelist_imagelist[headBody.header]).match(rgx.toml_header_meta_title))
-    ? docHeaderMakeAndMetaTupTomlExtractAndConvertToStruct!()(
-        _make_and_meta_struct,
-        _header_body_insertfilelist_imagelist[headBody.header]
-      )
-    : docHeaderMakeAndMetaTupSDLangExtractAndConvertToStruct!()(
-        _make_and_meta_struct,
-        _header_body_insertfilelist_imagelist[headBody.header]
-      );
+    docHeaderMakeAndMetaTupTomlExtractAndConvertToStruct!()(
+      _make_and_meta_struct,
+      _header_body_insertfilelist_imagelist[headBody.header]
+    );
     debug(steps) {
       writeln("- step2 complete");
     }
diff --git a/src/sdp/meta/read_config_files.d b/src/sdp/meta/read_config_files.d
index 554f740..74c5a12 100644
--- a/src/sdp/meta/read_config_files.d
+++ b/src/sdp/meta/read_config_files.d
@@ -4,80 +4,6 @@
   meta_config_files.d
 +/
 module sdp.meta.read_config_files;
-static template configReadInSiteSDL() {
-  import
-    sdp.meta,
-    sdp.output.paths_source,
-    std.file,
-    std.path;
-  final string configReadInSiteSDL(M,E)(M manifest, E env) {
-    auto conf_file_details = ConfigFilePaths!()(manifest, env);
-    string conf_sdl = conf_file_details.config_filename_site_sdl;
-    auto possible_config_path_locations = conf_file_details.possible_config_path_locations.config_local_site;
-    string config_file_str;
-    debug(io) {
-      writeln("WARNING (io debug) in config filename: ", conf_sdl);
-      writeln("WARNING (io debug) in config possible path locations: ", possible_config_path_locations);
-    }
-    foreach(pth; possible_config_path_locations) {
-      auto conf_file = asNormalizedPath(chainPath(to!string(pth), conf_sdl)).array;
-      if (config_file_str.length > 0) {
-        break;
-      }
-      try {
-        if (exists(conf_file)) {
-          debug(io) {
-            writeln("WARNING (io debug) in config file found: ", conf_file);
-          }
-          config_file_str = conf_file.readText;
-          break;
-        }
-      }
-      catch (ErrnoException ex) {
-      }
-      catch (FileException ex) {
-      }
-    }
-    return config_file_str;
-  }
-}
-static template configReadInDocSDL() {
-  import
-    sdp.meta,
-    sdp.output.paths_source,
-    std.file,
-    std.path;
-  final string configReadInDocSDL(M,E)(M manifest, E env) {
-    auto conf_file_details = ConfigFilePaths!()(manifest, env);
-    string conf_sdl = conf_file_details.config_filename_document_sdl;
-    auto possible_config_path_locations = conf_file_details.possible_config_path_locations.sisu_document_make;
-    string config_file_str;
-    debug(io) {
-      writeln("WARNING (io debug) in config filename: ", conf_sdl);
-      writeln("WARNING (io debug) in config possible path locations: ", possible_config_path_locations);
-    }
-    foreach(pth; possible_config_path_locations) {
-      auto conf_file = asNormalizedPath(chainPath(to!string(pth), conf_sdl)).array;
-      if (config_file_str.length > 0) {
-        break;
-      }
-      try {
-        if (exists(conf_file)) {
-          debug(io) {
-            writeln("WARNING (io debug) in config file found: ", conf_file);
-          }
-          config_file_str = conf_file.readText;
-          break;
-        }
-      }
-      catch (ErrnoException ex) {
-      }
-      catch (FileException ex) {
-      }
-    }
-    return config_file_str;
-  }
-}
 static template configReadInSiteTOML() {
   import
     sdp.meta,
@@ -152,25 +78,6 @@ static template configReadInDocTOML() {
     return config_file_str;
   }
 }
-static template configSDLang() {
-  import sdlang;
-  import
-    sdp.meta,
-    sdp.output.paths_source,
-    std.file,
-    std.path;
-  auto configSDLang(string configuration, string conf_sdl_filename) {
-    Tag sdl_root_conf;
-    try {
-      sdl_root_conf = parseSource(configuration);
-    }
-    catch(ParseException e) {
-      stderr.writeln("SDLang problem with content for ", conf_sdl_filename);
-      stderr.writeln(e.msg);
-    }
-    return sdl_root_conf;
-  }
-}
 static template configTOML() {
   import toml; //
   import
@@ -201,7 +108,7 @@ static template readConfigSite() {
     string conf_filename = "NONE";
     auto _conf_file_details = ConfigFilePaths!()(_manifest, _env);
     auto possible_config_path_locations = _conf_file_details.possible_config_path_locations.config_local_site;
-    foreach(conf_fn; [_conf_file_details.config_filename_site_toml, _conf_file_details.config_filename_site_sdl]) {
+    foreach(conf_fn; [_conf_file_details.config_filename_site_toml]) {
       foreach(pth; possible_config_path_locations) {
         auto conf_file = asNormalizedPath(chainPath(to!string(pth), conf_fn)).array;
         conf_filename = conf_fn;
@@ -251,7 +158,7 @@ static template readConfigDoc() {
     string conf_filename = "NONE";
     auto _conf_file_details = ConfigFilePaths!()(_manifest, _env);
     auto possible_config_path_locations = _conf_file_details.possible_config_path_locations.sisu_document_make;
-    foreach(conf_fn; [_conf_file_details.config_filename_document_toml, _conf_file_details.config_filename_document_sdl]) {
+    foreach(conf_fn; [_conf_file_details.config_filename_document_toml]) {
       foreach(pth; possible_config_path_locations) {
         auto conf_file = asNormalizedPath(chainPath(to!string(pth), conf_fn)).array;
         conf_filename = conf_fn;
@@ -289,36 +196,6 @@ static template readConfigDoc() {
     return _ConfContent();
   }
 }
-static template configReadSiteSDLang() {
-  import
-    sdp.meta,
-    sdp.output.paths_source,
-    std.file,
-    std.path;
-  import sdlang;
-  final auto configReadSiteSDLang(M,E)(M manifest, E env) {
-    auto configuration = configReadInSiteSDL!()(manifest, env);
-    auto conf_file_details = ConfigFilePaths!()(manifest, env);
-    string conf_sdl = conf_file_details.config_filename_site_sdl;
-    auto sdl_root = configSDLang!()(configuration, conf_sdl);
-    return sdl_root;
-  }
-}
-static template configReadDocSDLang() {
-  import
-    sdp.meta,
-    sdp.output.paths_source,
-    std.file,
-    std.path;
-  import sdlang;
-  final auto configReadDocSDLang(M,E)(M manifest, E env) {
-    auto configuration = configReadInDocSDL!()(manifest, env);
-    auto conf_file_details = ConfigFilePaths!()(manifest, env);
-    string conf_sdl = conf_file_details.config_filename_document_sdl;
-    auto sdl_root = configSDLang!()(configuration, conf_sdl);
-    return sdl_root;
-  }
-}
 static template configReadSiteTOML() {
   import
     sdp.meta,
diff --git a/src/sdp/meta/read_source_files.d b/src/sdp/meta/read_source_files.d
index cd4a253..5c7d83b 100644
--- a/src/sdp/meta/read_source_files.d
+++ b/src/sdp/meta/read_source_files.d
@@ -155,7 +155,6 @@ static template SiSUrawMarkupContent() {
     }
   }
   struct Inserts {
-    import sdp.meta.conf_make_meta_sdlang;
     auto scan_subdoc_source(O)(
       O        _opt_action,
       char[][] markup_sourcefile_insert_content,
diff --git a/src/sdp/meta/rgx.d b/src/sdp/meta/rgx.d
index 35d6970..4cc1fe1 100644
--- a/src/sdp/meta/rgx.d
+++ b/src/sdp/meta/rgx.d
@@ -53,7 +53,6 @@ static template SiSUrgxInit() {
     static variable_doc_title                             = ctRegex!(`@title`);
     static variable_doc_author                            = ctRegex!(`@author|@creator`);
     static raw_author_munge                               = ctRegex!(`(\S.+?),\s+(.+)`,"i");
-    static sdlang_header_meta_title                       = ctRegex!(`^\s*title\s+["\\]`, "m");
     static toml_header_meta_title                         = ctRegex!(`^\s*(title\s*=\s*"|\[title\])`, "m");
     /+ head +/
     static native_subhead_creator                         = ctRegex!(`^(?:author|translator|illustrator)$`, "m");
diff --git a/src/sdp/output/paths_source.d b/src/sdp/output/paths_source.d
index 3292e6f..475df3e 100644
--- a/src/sdp/output/paths_source.d
+++ b/src/sdp/output/paths_source.d
@@ -311,12 +311,6 @@ template ConfigFilePaths() {
     E   _env,
   ) {
     struct ConfFilePaths {
-      auto config_filename_document_sdl() {
-        return "sisu_document_make.sdl";
-      }
-      auto config_filename_site_sdl() {
-        return "config_local_site.sdl";
-      }
       auto config_filename_document_toml() {
         return "sisu_document_make.toml";
       }
diff --git a/src/sdp/sdp.d b/src/sdp/sdp.d
index 2d0397d..bddcc64 100755
--- a/src/sdp/sdp.d
+++ b/src/sdp/sdp.d
@@ -13,7 +13,6 @@ import
   sdp.meta.metadoc_summary,
   sdp.meta.metadoc_from_src,
   sdp.meta.conf_make_meta_structs,
-  sdp.meta.conf_make_meta_sdlang,
   sdp.meta.conf_make_meta_toml,
   sdp.meta.conf_make_meta_json,
   sdp.meta.defaults,
@@ -32,8 +31,6 @@ homepage    "http://sisudoc.org"
 +/
 void main(string[] args) {
   mixin SiSUrgxInit;
-  mixin SiSUmakeMetaStructsSDLang;
-  mixin SiSUextractSDLang;
   mixin contentJSONtoSiSUstruct;
   mixin SiSUnode;
   mixin SiSUbiblio;
diff --git a/views/version.txt b/views/version.txt
index 6f8094d..ca8d62e 100644
--- a/views/version.txt
+++ b/views/version.txt
@@ -4,7 +4,7 @@ struct Version {
   int minor;
   int patch;
 }
-enum ver = Version(0, 24, 0);
+enum ver = Version(0, 25, 0);
 version (Posix) {
   version (DigitalMars) {
   } else version (LDC) {