0.25.0 remove sdlang (headers, conf, make doc)

1 files changed, 192 insertions, 533 deletions

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\""; \