maker.org updates, including reggae builds

8 files changed, 1219 insertions, 697 deletions

diff --git a/.gitignore b/.gitignore
index 76a1754..3d4e228 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,29 +6,41 @@
 !version.txt
 !dub*.json
 !dub.sdl
-.dub/**
 !tangle
 !*.org
 !*.d
 !*.txt
-!*.sst
 !conf.sdl
-!sisupod.manifest
-!sisu_document_make.sdl
-!config_local_site.sdl
-!sisu_document_make.toml
-!config_local_site.toml
 !org
 !src
 !src/*
 !data
 !data/*
+!data/toml/*
+!data/sdlang/*
+!data/toml/sisupod/**
+!data/toml/sisudir/**
+!data/sdlang/sisupod/**
+!data/sdlang/sisudir/**
+!*.sst
+!*.ssm
+!**/*.sst
+!**/*.ssm
+!sisupod.manifest
+!sisu_document_make.sdl
+!config_local_site.sdl
+!sisu_document_make.toml
+!config_local_site.toml
 !sisudoc
 !views
 !docs/*.html
-!**/
-**/.#*
+.dub/**
+.reggae/**
 tmp/**
+*_
+*~
+\#*
+*.\#*
 #!*/
 #*~
 #\#*
diff --git a/dub.sdl b/dub.sdl
index 408408b..3f267c4 100644
--- a/dub.sdl
+++ b/dub.sdl
@@ -8,58 +8,38 @@ targetPath        "./bin"
 #sourcePath        "./src/sdp"
 stringImportPaths "./views"
 buildRequirements "allowWarnings"
-dependency        "toml"      version="~>0.4.0-rc.2"
-dependency        "toml:json" version="~>0.4.0-rc.2" # if not possible to parse toml directly go through json
-dependency        "sdlang-d"  version="~>0.10.1"
-dependency        "d2sqlite3" version="~>0.13.1"  # https://code.dlang.org/packages/d2sqlite3  http://biozic.github.io/d2sqlite3/d2sqlite3.html
+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
-configuration "sdp-release" {
-  name                 "release"
+dependency        "archive"   version="~>0.6.0"      # http://code.dlang.org/packages/archive     https://github.com/rcythr/archive
+configuration "build" {
+  name                 "build"
   targetType           "executable"
   platforms            "posix"
-  targetName           "sdp"
+  targetName           "bin/sdp"
   dflags               "-J=views" "-I=src/sdp"
   buildOptions         "verbose" "releaseMode" "optimize" "inline"
   postGenerateCommands "/usr/bin/notify-send -t 0 'D release executable ready' 'sdp'"
 }
-configuration "sdp-debug" {
-  name                 "debuging"
+configuration "reggae" {
+  name                 "build"
   targetType           "executable"
   platforms            "posix"
-  targetName           "sdp-debug"
-  dflags               "-g" "-J=views" "-I=src/sdp"
-  #lflags               "ld.gold"
-  buildRequirements    "allowWarnings"
-  buildOptions         "verbose" "debugMode" "debugInfo" "optimize"
-  debugVersions        "checkdoc" "summary"
-  debugVersions        "dumpdoc"
-  postGenerateCommands "/usr/bin/notify-send -t 0 'D (debug) executable ready' 'sdp-debug'"
-}
-configuration "sdp-tmp" {
-  name                 "tmp"
-  targetType           "executable"
-  platforms            "posix"
-  targetName           "sdp-tmp"
+  targetName           "bin/sdp-rg"
   dflags               "-J=views" "-I=src/sdp"
-  #lflags               "ld.gold"
-  buildRequirements    "allowWarnings"
-  buildOptions         "verbose" "debugMode" "debugInfo" "optimize"
-  debugVersions        "checkdoc" "summary"
-  debugVersions        "tmp"
-  debugVersions        "crap"
-  debugVersions        "header"
-  debugVersions        "header1"
-  postGenerateCommands "/usr/bin/notify-send -t 0 'D (debug) executable ready' 'sdp-tmp'"
+  buildOptions         "verbose" "releaseMode" "optimize" "inline"
+  postGenerateCommands "/usr/bin/notify-send -t 0 'D release executable ready' 'sdp'"
 }
-configuration "sdp-debug-clean" {
-  name                 "debug-clean"
+configuration "sdp-release" {
+  name                 "release"
   targetType           "executable"
   platforms            "posix"
-  targetName           "sdp-debug-clean"
+  targetName           "sdp"
   dflags               "-J=views" "-I=src/sdp"
-  buildOptions         "verbose" "debugMode" "debugInfo" "optimize"
-  postGenerateCommands "/usr/bin/notify-send -t 0 'D (debug) executable ready' 'sdp-debug-clean'"
+  buildOptions         "verbose" "releaseMode" "optimize" "inline"
+  postGenerateCommands "/usr/bin/notify-send -t 0 'D release executable ready' 'sdp'"
 }
 configuration "sdp-dmd" {
   name                 "dmd"
@@ -102,42 +82,6 @@ configuration "sdp-dmd-debug" {
   debugVersions        "dumpdoc"
   postGenerateCommands "/usr/bin/notify-send -t 0 'D (debug) executable ready' 'sdp-dmd-debug'"
 }
-configuration "sdp-dmd-debug-version" {
-  name                 "debuging"
-  targetType           "executable"
-  platforms            "posix"
-  targetName           "sdp-dmd-debug-ver"
-  dflags               "-g" "-J=views" "-I=src/sdp"
-  buildRequirements    "allowWarnings"
-  buildOptions         "verbose" "debugMode" "debugInfo" "optimize"
-  debugVersions        "checkdoc" "summary"
-  debugVersions        "dumpdoc"
-}
-configuration "sdp-dmd-debug-unittest" {
-  name                 "debuging"
-  targetType           "executable"
-  platforms            "posix"
-  targetName           "sdp-dmd-debug"
-  dflags               "-J=views" "-I=src/sdp"
-  buildRequirements    "allowWarnings"
-  buildOptions         "verbose" "debugMode" "debugInfo" "unittests" "optimize"
-  debugVersions        "checkdoc" "summary"
-  debugVersions        "dumpdoc"
-  postGenerateCommands "/usr/bin/notify-send -t 0 'D (debug) executable ready' 'sdp-dmd-debug'"
-}
-configuration "sdp-dmd-debug-docs" {
-  name                 "debuging"
-  targetType           "executable"
-  platforms            "posix"
-  targetName           "sdp-dmd-debug"
-  dflags               "-J=views" "-I=src/sdp"
-  #lflags               "ld.gold"
-  buildRequirements    "allowWarnings"
-  buildOptions         "verbose" "debugMode" "debugInfo" "optimize"
-  debugVersions        "checkdoc" "summary"
-  debugVersions        "dumpdoc"
-  postGenerateCommands "/usr/bin/notify-send -t 0 'D (debug) executable ready' 'sdp-dmd-debug'"
-}
 configuration "sdp-ldc" {
   name                 "ldc"
   targetType           "executable"
@@ -176,38 +120,6 @@ configuration "sdp-ldc-debug" {
   buildRequirements    "allowWarnings"
   buildOptions         "verbose" "debugMode" "debugInfo" "optimize"
   debugVersions        "checkdoc" "summary"
-  postGenerateCommands "time (./bin/sdp-ldc-debug --source --html --epub -v --output-dir=tmp/program-output data/sisupod/sisu-manual )" "/usr/bin/notify-send -t 0 'D (debug) executable ready' 'sdp-ldc-debug'"
-}
-configuration "sdp-ldc-debug-version" {
-  name                 "debuging"
-  targetType           "executable"
-  platforms            "posix"
-  targetName           "sdp-ldc-debug-ver"
-  dflags               "-g" "-J=views" "-I=src/sdp"
-  buildRequirements    "allowWarnings"
-  buildOptions         "verbose" "debugMode" "debugInfo" "optimize"
-  debugVersions        "checkdoc" "summary"
-}
-configuration "sdp-ldc-debug-unittest" {
-  name                 "debuging"
-  targetType           "executable"
-  platforms            "posix"
-  targetName           "sdp-ldc-debug"
-  dflags               "-J=views" "-I=src/sdp"
-  buildRequirements    "allowWarnings"
-  buildOptions         "verbose" "debugMode" "debugInfo" "unittests" "optimize"
-  debugVersions        "checkdoc" "summary"
-  postGenerateCommands "/usr/bin/notify-send -t 0 'D (debug) executable ready' 'sdp-ldc-debug'"
-}
-configuration "sdp-ldc-debug-docs" {
-  name                 "debuging"
-  targetType           "executable"
-  platforms            "posix"
-  targetName           "sdp-ldc-debug"
-  dflags               "-J=views" "-I=src/sdp" "-Dddocs"
-  buildRequirements    "allowWarnings"
-  buildOptions         "verbose" "debugMode" "debugInfo" "optimize"
-  debugVersions        "checkdoc" "summary"
   postGenerateCommands "/usr/bin/notify-send -t 0 'D (debug) executable ready' 'sdp-ldc-debug'"
 }
 configuration "sdp-gdc" {
@@ -253,37 +165,3 @@ configuration "sdp-gdc-debug" {
   debugVersions        "checkdoc" "summary"
   postGenerateCommands "/usr/bin/notify-send -t 0 'D gdc compiled (debug with -g) executable ready' 'sdp-gdc-debug'"
 }
-configuration "sdp-gdc-debug-version" {
-  name                 "debuging"
-  targetType           "executable"
-  platforms            "posix"
-  targetName           "sdp-gdc-debug-ver"
-  dflags               "-O2" "-fbuiltin" "-Wall" "-Werror" "-Wformat=2" "-g" "-J=views" "-I=src/sdp"
-  lflags               "-lz"
-  buildOptions         "verbose" "debugMode" "debugInfo" "optimize"
-  debugVersions        "checkdoc" "summary"
-}
-configuration "sdp-gdc-debug-unittest" {
-  name                 "debuging"
-  targetType           "executable"
-  platforms            "posix"
-  targetName           "sdp-gdc-debug"
-  dflags               "-J=views" "-I=src/sdp" "-Dddocs"
-  lflags               "-lz"
-  buildRequirements    "allowWarnings"
-  buildOptions         "verbose" "debugMode" "debugInfo" "unittests" "optimize"
-  debugVersions        "checkdoc" "summary"
-  postGenerateCommands "/usr/bin/notify-send -t 0 'D (debug) executable ready' 'sdp-gdc-debug'"
-}
-configuration "sdp-gdc-debug-docs" {
-  name                 "debuging"
-  targetType           "executable"
-  platforms            "posix"
-  targetName           "sdp-gdc-debug"
-  dflags               "-J=views" "-I=src/sdp" "-Dddocs"
-  lflags               "-lz"
-  buildRequirements    "allowWarnings"
-  buildOptions         "verbose" "debugMode" "debugInfo" "optimize"
-  debugVersions        "checkdoc" "summary"
-  postGenerateCommands "/usr/bin/notify-send -t 0 'D (debug) executable ready' 'sdp-gdc-debug'"
-}
diff --git a/dub.selections.json b/dub.selections.json
index 8ada484..4ae7074 100644
--- a/dub.selections.json
+++ b/dub.selections.json
@@ -4,8 +4,8 @@
 		"archive": "0.6.0",
 		"d2sqlite3": "0.13.1",
 		"libinputvisitor": "1.2.2",
-		"sdlang-d": "0.10.1",
-		"taggedalgebraic": "0.10.7",
+		"sdlang-d": "0.10.2",
+		"taggedalgebraic": "0.10.9",
 		"toml": "0.4.0-rc.4",
 		"unit-threaded": "0.6.36"
 	}
diff --git a/makefile b/makefile
index b7f3ffe..bb0a85e 100644
--- a/makefile
+++ b/makefile
@@ -15,6 +15,33 @@ 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_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
 
@@ -42,6 +69,36 @@ 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
 
@@ -72,12 +129,19 @@ 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:
+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:
+markup_pod_samples_sdl:
 	find data/sdlang/sisupod -name sisupod.manifest | sort
-markup_dir_samples:
+markup_dir_samples_sdl:
 	find data/sdlang/sisudir/media/text -name *.ss[tm] | sort
 all: dmd ldc gdc
 all_ver: dmd_ver ldc_ver gdc_ver
@@ -92,6 +156,7 @@ dmd_ver:
 	$(DUB) --compiler=dmd --config=sdp-dmd-version
 	mv bin/sdp-dmd-ver bin/sdp-dmd-$(PROJECT_VERSION)
 	notify-send -t 0 'D dmd compiled test release executable ready' 'sdp-dmd-$(PROJECT_VERSION)'
+dmd_clean_ver: clean tangle dmd_ver
 dmd_debug:
 	$(DUB) --compiler=dmd --config=sdp-dmd-debug
 dmd_rel: expunge skel tangle
@@ -101,23 +166,13 @@ dmd_rel_tangle: tangle
 dmd_rel_expunge_tangle: expunge skel tangle dmd_rel_tangle
 dmd_debug_tangle: tangle
 	$(DUB) --compiler=dmd --config=sdp-dmd-debug
-dmd_debug_docs: clean_docs tangle
-	$(DUB) --compiler=dmd --config=sdp-dmd-debug-docs
-dmd_debug_unittest: tangle
-	$(DUB) --compiler=dmd --config=sdp-dmd-debug-unittest
-dmd_debug_clean: tangle
-	$(DUB) --compiler=dmd --config=sdp-debug-clean
-dmd_debug_ver:
-	$(DUB) --compiler=dmd --config=sdp-dmd-debug-version
-	mv bin/sdp-dmd-debug-ver bin/sdp-dmd-debug-$(PROJECT_VERSION)
-	notify-send -t 0 'D dmd compiled test release executable ready' 'sdp-dmd-debug-$(PROJECT_VERSION)'
-dmd_debug_clean_ver: clean tangle dmd_debug_clean_ver
 gdc:
 	$(DUB) --compiler=gdc --config=sdp-gdc
 gdc_ver:
 	$(DUB) --compiler=gdc --config=sdp-gdc-version
 	mv bin/sdp-gdc-ver bin/sdp-gdc-$(PROJECT_VERSION)
 	notify-send -t 0 'D gdc compiled test release executable ready' 'sdp-gdc-$(PROJECT_VERSION)'
+gdc_clean_ver: clean tangle gdc_ver
 gdc_debug:
 	$(DUB) --compiler=gdc --config=sdp-gdc-debug
 gdc_rel: expunge skel tangle
@@ -127,23 +182,13 @@ gdc_rel_tangle: tangle
 gdc_rel_expunge_tangle: expunge skel tangle gdc_rel_tangle
 gdc_debug_tangle: tangle
 	$(DUB) --compiler=gdc --config=sdp-gdc-debug
-gdc_debug_docs: clean_docs tangle
-	$(DUB) --compiler=gdc --config=sdp-gdc-debug-docs
-gdc_debug_unittest: tangle
-	$(DUB) --compiler=gdc --config=sdp-gdc-debug-unittest
-gdc_debug_clean: tangle
-	$(DUB) --compiler=gdc --config=sdp-debug-clean
-gdc_debug_ver:
-	$(DUB) --compiler=gdc --config=sdp-dmd-debug-version
-	mv bin/sdp-gdc-debug-ver bin/sdp-gdc-debug-$(PROJECT_VERSION)
-	notify-send -t 0 'D gdc compiled test release executable ready' 'sdp-gdc-debug-$(PROJECT_VERSION)'
-gdc_debug_clean_ver: clean tangle gdc_debug_ver
 ldc:
 	$(DUB) --compiler=ldc2 --config=sdp-ldc
 ldc_ver:
 	$(DUB) --compiler=ldc2 --config=sdp-ldc-version
 	mv bin/sdp-ldc-ver bin/sdp-ldc-$(PROJECT_VERSION)
 	notify-send -t 0 'D ldc2 compiled test release executable ready' 'sdp-ldc-$(PROJECT_VERSION)'
+ldc_clean_ver: clean tangle ldc_ver
 ldc_debug:
 	$(DUB) --compiler=ldc2 --config=sdp-ldc-debug
 ldc_rel: expunge skel tangle
@@ -153,17 +198,6 @@ ldc_rel_tangle: tangle
 ldc_rel_expunge_tangle: expunge skel tangle ldc_rel_tangle
 ldc_debug_tangle: tangle
 	$(DUB) --compiler=ldc2 --config=sdp-ldc-debug
-ldc_debug_docs: clean_docs tangle
-	$(DUB) --compiler=ldc2 --config=sdp-ldc-debug-docs
-ldc_debug_unittest: tangle
-	$(DUB) --compiler=ldc2 --config=sdp-ldc-debug-unittest
-ldc_debug_clean: tangle
-	$(DUB) --compiler=ldc2 --config=sdp-debug-clean
-ldc_debug_ver:
-	$(DUB) --compiler=ldc2 --config=sdp-ldc-debug-version
-	mv bin/sdp-ldc-debug-ver bin/sdp-ldc-debug-$(PROJECT_VERSION)
-	notify-send -t 0 'D ldc2 compiled test release executable ready' 'sdp-ldc-debug-$(PROJECT_VERSION)'
-ldc_debug_clean_ver: clean tangle ldc_debug_ver
 skel:
 	mkdir -p $(PRG_SRCDIR)/$(PRG_NAME)/meta; \
 	mkdir -p $(PRG_SRCDIR)/$(PRG_NAME)/conf; \
@@ -201,279 +235,560 @@ rebuild: $(PRG_SRCDIR)/$(PRG_SRC) $(PRG_BINDIR)/$(PRG_BIN).o clean build
 makefile_new:
 	make -k tangle_maker
 restart: clean tangle
-dmd_testrun_find:
+ragga:
+	reggae -b binary
+	reggae -b ninja
+	build
+dmd_testrun_find_toml:
+	./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) \
+./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) \
+./bin/sdp-dmd -v --sisupod \
+--output-dir=tmp/program_output_pod
+dmd_testrun_find_toml_pod_html:
+	$(SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND) \
+./bin/sdp-dmd -v --html \
+--output-dir=tmp/program_output_pod
+dmd_testrun_find_toml_pod_epub:
+	$(SiSU_MARKUP_SAMPLES_PODS_TOML_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
+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_pod_source:
+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_pod_sisupod:
+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_pod_html:
+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_pod_epub:
+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_pod_all:
+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_pod_source:
+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:
 	./bin/sdp-dmd -v --source \
 --output-dir=tmp/program_output_pod \
 $(SiSU_MARKUP_SAMPLES_POD_SDL)
-dmd_testrun_paths_pod_sisupod:
+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_pod_html:
+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_pod_epub:
+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_pod_all:
+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)
-gdc_testrun_find:
+gdc_testrun_find_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_find_toml_pod_source:
+	$(SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND) \
+./bin/sdp-gdc -v --source \
+--output-dir=tmp/program_output_pod
+gdc_testrun_find_toml_pod_sisupod:
+	$(SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND) \
+./bin/sdp-gdc -v --sisupod \
+--output-dir=tmp/program_output_pod
+gdc_testrun_find_toml_pod_html:
+	$(SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND) \
+./bin/sdp-gdc -v --html \
+--output-dir=tmp/program_output_pod
+gdc_testrun_find_toml_pod_epub:
+	$(SiSU_MARKUP_SAMPLES_PODS_TOML_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
+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_pod_source:
+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_pod_sisupod:
+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_pod_html:
+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_pod_epub:
+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_pod_all:
+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:
+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)
+gdc_testrun_paths_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_paths_pod_source:
+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_pod_sisupod:
+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_pod_html:
+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_pod_epub:
+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_pod_all:
+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:
+ldc_testrun_find_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_find_toml_pod_source:
+	$(SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND) \
+	./bin/sdp-ldc -v --source \
+--output-dir=tmp/program_output_pod
+ldc_testrun_find_toml_pod_sisupod:
+	$(SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND) \
+	./bin/sdp-ldc -v --sisupod \
+--output-dir=tmp/program_output_pod
+ldc_testrun_find_toml_pod_html:
+	$(SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND) \
+	./bin/sdp-ldc -v --html \
+--output-dir=tmp/program_output_pod
+ldc_testrun_find_toml_pod_epub:
+	$(SiSU_MARKUP_SAMPLES_PODS_TOML_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
+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_pod_source:
+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_pod_sisupod:
+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_pod_html:
+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_pod_epub:
+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_pod_all:
+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:
+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:
+	./bin/sdp-ldc -v --source \
+--output-dir=tmp/program_output_pod \
+$(SiSU_MARKUP_SAMPLES_POD_TOML)
+ldc_testrun_paths_toml_pod_sisupod:
+	./bin/sdp-ldc -v --sisupod \
+--output-dir=tmp/program_output_pod \
+$(SiSU_MARKUP_SAMPLES_POD_TOML)
+ldc_testrun_paths_toml_pod_html:
+	./bin/sdp-ldc -v --html \
+--output-dir=tmp/program_output_pod \
+$(SiSU_MARKUP_SAMPLES_POD_TOML)
+ldc_testrun_paths_toml_pod_epub:
+	./bin/sdp-ldc -v --epub \
+--output-dir=tmp/program_output_pod \
+$(SiSU_MARKUP_SAMPLES_POD_TOML)
+ldc_testrun_paths_toml_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_pod_source:
+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_pod_sisupod:
+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_pod_html:
+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_pod_epub:
+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_pod_all:
+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_dir_source:
+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) \
 ./bin/sdp-dmd -v --source \
 --output-dir=tmp/program_output_dir
-dmd_testrun_find_dir_sisupod:
+dmd_testrun_find_sdl_dir_sisupod:
 	$(SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND) \
 ./bin/sdp-dmd -v --sisupod \
 --output-dir=tmp/program_output_dir
-dmd_testrun_find_dir_html:
+dmd_testrun_find_sdl_dir_html:
 	$(SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND) \
 ./bin/sdp-dmd -v --html \
 --output-dir=tmp/program_output_dir
-dmd_testrun_find_dir_epub:
+dmd_testrun_find_sdl_dir_epub:
 	$(SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND) \
 ./bin/sdp-dmd -v --epub \
 --output-dir=tmp/program_output_dir
-dmd_testrun_find_dir_all:
+dmd_testrun_find_sdl_dir_all:
 	$(SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND) \
 ./bin/sdp-dmd -v --source --html --epub --sqlite-discrete \
 --sqlite-create --sqlite-update \
 --output-dir=tmp/program_output_dir
-dmd_testrun_filelist_dir_source:
+dmd_testrun_filelist_toml_dir_source:
+	./bin/sdp-dmd -v --source \
+--output-dir=tmp/program_output_dir \
+$(SiSU_MARKUP_SAMPLES_DIR_TOML)
+dmd_testrun_filelist_toml_dir_sisupod:
+	./bin/sdp-dmd -v --sisupod \
+--output-dir=tmp/program_output_dir \
+$(SiSU_MARKUP_SAMPLES_DIR_TOML)
+dmd_testrun_filelist_toml_dir_html:
+	./bin/sdp-dmd -v --html \
+--output-dir=tmp/program_output_dir \
+$(SiSU_MARKUP_SAMPLES_DIR_TOML)
+dmd_testrun_filelist_toml_dir_epub:
+	./bin/sdp-dmd -v --epub \
+--output-dir=tmp/program_output_dir \
+$(SiSU_MARKUP_SAMPLES_DIR_TOML)
+dmd_testrun_filelist_toml_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_dir_sisupod:
+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_dir_html:
+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_dir_epub:
+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_dir_all:
+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_dir_source:
+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:
 	./bin/sdp-gdc -v --source \
 --output-dir=tmp/program_output_dir \
 $(SiSU_MARKUP_SAMPLES_DIR_SDL)
-gdc_testrun_find_dir_sisupod:
+gdc_testrun_find_sdl_dir_sisupod:
 	$(SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND) \
 ./bin/sdp-gdc -v --sisupod \
 --output-dir=tmp/program_output_dir
-gdc_testrun_find_dir_html:
+gdc_testrun_find_sdl_dir_html:
 	$(SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND) \
 ./bin/sdp-gdc -v --html \
 --output-dir=tmp/program_output_dir
-gdc_testrun_find_dir_epub:
+gdc_testrun_find_sdl_dir_epub:
 	$(SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND) \
 ./bin/sdp-gdc -v --epub \
 --output-dir=tmp/program_output_dir
-gdc_testrun_find_dir_all:
+gdc_testrun_find_sdl_dir_all:
 	$(SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND) \
 ./bin/sdp-gdc -v --source --html --epub --sqlite-discrete \
 --sqlite-create --sqlite-update \
 --output-dir=tmp/program_output_dir
-gdc_testrun_filelist_dir_source:
+gdc_testrun_filelist_toml_dir_source:
+	./bin/sdp-gdc -v --source \
+--output-dir=tmp/program_output_dir \
+$(SiSU_MARKUP_SAMPLES_DIR_TOML)
+gdc_testrun_filelist_toml_dir_sisupod:
+	./bin/sdp-gdc -v --sisupod \
+--output-dir=tmp/program_output_dir \
+$(SiSU_MARKUP_SAMPLES_DIR_TOML)
+gdc_testrun_filelist_toml_dir_html:
+	./bin/sdp-gdc -v --html \
+--output-dir=tmp/program_output_dir \
+$(SiSU_MARKUP_SAMPLES_DIR_TOML)
+gdc_testrun_filelist_toml_dir_epub:
+	./bin/sdp-gdc -v --epub \
+--output-dir=tmp/program_output_dir \
+$(SiSU_MARKUP_SAMPLES_DIR_TOML)
+gdc_testrun_filelist_toml_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_dir_sisupod:
+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_dir_html:
+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_dir_epub:
+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_dir_all:
+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_dir_source:
+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
+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_dir_sisupod:
+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_dir_html:
+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_dir_epub:
+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_dir_all:
+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_dir_source:
+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:
 	./bin/sdp-ldc -v --source \
 --output-dir=tmp/program_output_dir \
 $(SiSU_MARKUP_SAMPLES_DIR_SDL)
-ldc_testrun_filelist_dir_sisupod:
+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_dir_html:
+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_dir_epub:
+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_dir_all:
+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 \
diff --git a/maker.org b/maker.org
index 21fbd50..fdbeea9 100644
--- a/maker.org
+++ b/maker.org
@@ -14,7 +14,7 @@
 
 [[./org/sdp.org][sdp.org]]  [[./org/][org/]]
 
-* sdp makefile                                                     :makefile:
+* makefile                                                         :makefile:
 ** settings [+2]                                                  :settings:
 *** git version stamp                                         :git:version:
 
@@ -57,6 +57,36 @@ 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
 
@@ -89,6 +119,39 @@ data/sdlang/sisupod/viral_spiral.david_bollier
 **** 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
 
@@ -143,20 +206,39 @@ 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:
+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
 #+END_SRC
 
 #+BEGIN_SRC makefile :tangle makefile
-markup_pod_samples:
+markup_pod_samples_sdl:
 	find data/sdlang/sisupod -name sisupod.manifest | sort
 #+END_SRC
 
 #+BEGIN_SRC makefile :tangle makefile
-markup_dir_samples:
+markup_dir_samples_sdl:
 	find data/sdlang/sisudir/media/text -name *.ss[tm] | sort
 #+END_SRC
 
@@ -215,6 +297,7 @@ dmd_ver:
 	$(DUB) --compiler=dmd --config=sdp-dmd-version
 	mv bin/sdp-dmd-ver bin/sdp-dmd-$(PROJECT_VERSION)
 	notify-send -t 0 'D dmd compiled test release executable ready' 'sdp-dmd-$(PROJECT_VERSION)'
+dmd_clean_ver: clean tangle dmd_ver
 #+END_SRC
 
 ******** debug                                                 :debug:
@@ -234,17 +317,6 @@ dmd_rel_tangle: tangle
 dmd_rel_expunge_tangle: expunge skel tangle dmd_rel_tangle
 dmd_debug_tangle: tangle
 	$(DUB) --compiler=dmd --config=sdp-dmd-debug
-dmd_debug_docs: clean_docs tangle
-	$(DUB) --compiler=dmd --config=sdp-dmd-debug-docs
-dmd_debug_unittest: tangle
-	$(DUB) --compiler=dmd --config=sdp-dmd-debug-unittest
-dmd_debug_clean: tangle
-	$(DUB) --compiler=dmd --config=sdp-debug-clean
-dmd_debug_ver:
-	$(DUB) --compiler=dmd --config=sdp-dmd-debug-version
-	mv bin/sdp-dmd-debug-ver bin/sdp-dmd-debug-$(PROJECT_VERSION)
-	notify-send -t 0 'D dmd compiled test release executable ready' 'sdp-dmd-debug-$(PROJECT_VERSION)'
-dmd_debug_clean_ver: clean tangle dmd_debug_clean_ver
 #+END_SRC
 
 ****** gdc                                                         :gdc:
@@ -263,6 +335,7 @@ gdc_ver:
 	$(DUB) --compiler=gdc --config=sdp-gdc-version
 	mv bin/sdp-gdc-ver bin/sdp-gdc-$(PROJECT_VERSION)
 	notify-send -t 0 'D gdc compiled test release executable ready' 'sdp-gdc-$(PROJECT_VERSION)'
+gdc_clean_ver: clean tangle gdc_ver
 #+END_SRC
 
 ******** debug                                                 :debug:
@@ -282,17 +355,6 @@ gdc_rel_tangle: tangle
 gdc_rel_expunge_tangle: expunge skel tangle gdc_rel_tangle
 gdc_debug_tangle: tangle
 	$(DUB) --compiler=gdc --config=sdp-gdc-debug
-gdc_debug_docs: clean_docs tangle
-	$(DUB) --compiler=gdc --config=sdp-gdc-debug-docs
-gdc_debug_unittest: tangle
-	$(DUB) --compiler=gdc --config=sdp-gdc-debug-unittest
-gdc_debug_clean: tangle
-	$(DUB) --compiler=gdc --config=sdp-debug-clean
-gdc_debug_ver:
-	$(DUB) --compiler=gdc --config=sdp-dmd-debug-version
-	mv bin/sdp-gdc-debug-ver bin/sdp-gdc-debug-$(PROJECT_VERSION)
-	notify-send -t 0 'D gdc compiled test release executable ready' 'sdp-gdc-debug-$(PROJECT_VERSION)'
-gdc_debug_clean_ver: clean tangle gdc_debug_ver
 #+END_SRC
 
 ****** ldc                                                         :ldc:
@@ -311,6 +373,7 @@ ldc_ver:
 	$(DUB) --compiler=ldc2 --config=sdp-ldc-version
 	mv bin/sdp-ldc-ver bin/sdp-ldc-$(PROJECT_VERSION)
 	notify-send -t 0 'D ldc2 compiled test release executable ready' 'sdp-ldc-$(PROJECT_VERSION)'
+ldc_clean_ver: clean tangle ldc_ver
 #+END_SRC
 
 ******** debug                                                 :debug:
@@ -330,17 +393,6 @@ ldc_rel_tangle: tangle
 ldc_rel_expunge_tangle: expunge skel tangle ldc_rel_tangle
 ldc_debug_tangle: tangle
 	$(DUB) --compiler=ldc2 --config=sdp-ldc-debug
-ldc_debug_docs: clean_docs tangle
-	$(DUB) --compiler=ldc2 --config=sdp-ldc-debug-docs
-ldc_debug_unittest: tangle
-	$(DUB) --compiler=ldc2 --config=sdp-ldc-debug-unittest
-ldc_debug_clean: tangle
-	$(DUB) --compiler=ldc2 --config=sdp-debug-clean
-ldc_debug_ver:
-	$(DUB) --compiler=ldc2 --config=sdp-ldc-debug-version
-	mv bin/sdp-ldc-debug-ver bin/sdp-ldc-debug-$(PROJECT_VERSION)
-	notify-send -t 0 'D ldc2 compiled test release executable ready' 'sdp-ldc-debug-$(PROJECT_VERSION)'
-ldc_debug_clean_ver: clean tangle ldc_debug_ver
 #+END_SRC
 
 ***** generic
@@ -396,34 +448,80 @@ makefile_new:
 restart: clean tangle
 #+END_SRC
 
+**** _reggae_ build                                                 :reggae:
+
+#+BEGIN_SRC makefile :tangle makefile
+ragga:
+	reggae -b binary
+	reggae -b ninja
+	build
+#+END_SRC
+
+#+BEGIN_SRC makefile
+ragga:
+	reggae -b binary && reggae -b ninja && build
+#+END_SRC
+
 *** testrun (program against document markup)
 **** pods
 ***** dmd
 ****** find files
+******* toml
 
 #+BEGIN_SRC makefile :tangle makefile
-dmd_testrun_find:
+dmd_testrun_find_toml:
+	./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) \
+./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) \
+./bin/sdp-dmd -v --sisupod \
+--output-dir=tmp/program_output_pod
+dmd_testrun_find_toml_pod_html:
+	$(SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND) \
+./bin/sdp-dmd -v --html \
+--output-dir=tmp/program_output_pod
+dmd_testrun_find_toml_pod_epub:
+	$(SiSU_MARKUP_SAMPLES_PODS_TOML_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_pod_source:
+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_pod_sisupod:
+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_pod_html:
+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_pod_epub:
+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_pod_all:
+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 \
@@ -431,25 +529,52 @@ dmd_testrun_find_pod_all:
 #+END_SRC
 
 ****** path list
+******* toml
+
+#+BEGIN_SRC makefile :tangle makefile
+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)
+#+END_SRC
+
+******* sdlang
 
 #+BEGIN_SRC makefile :tangle makefile
-dmd_testrun_paths_pod_source:
+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_pod_sisupod:
+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_pod_html:
+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_pod_epub:
+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_pod_all:
+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 \
@@ -458,30 +583,62 @@ $(SiSU_MARKUP_SAMPLES_POD_SDL)
 
 ***** gdc
 ****** find files
+******* toml
+
+#+BEGIN_SRC makefile :tangle makefile
+gdc_testrun_find_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_find_toml_pod_source:
+	$(SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND) \
+./bin/sdp-gdc -v --source \
+--output-dir=tmp/program_output_pod
+gdc_testrun_find_toml_pod_sisupod:
+	$(SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND) \
+./bin/sdp-gdc -v --sisupod \
+--output-dir=tmp/program_output_pod
+gdc_testrun_find_toml_pod_html:
+	$(SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND) \
+./bin/sdp-gdc -v --html \
+--output-dir=tmp/program_output_pod
+gdc_testrun_find_toml_pod_epub:
+	$(SiSU_MARKUP_SAMPLES_PODS_TOML_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:
+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_pod_source:
+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_pod_sisupod:
+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_pod_html:
+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_pod_epub:
+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_pod_all:
+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 \
@@ -489,30 +646,62 @@ gdc_testrun_find_pod_all:
 #+END_SRC
 
 ****** path list
+******* toml
 
 #+BEGIN_SRC makefile :tangle makefile
-gdc_testrun_paths:
+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:
 	./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_pod_source:
+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_pod_sisupod:
+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_pod_html:
+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_pod_epub:
+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_pod_all:
+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 \
@@ -521,30 +710,62 @@ $(SiSU_MARKUP_SAMPLES_POD_SDL)
 
 ***** ldc
 ****** find files
+******* toml
 
 #+BEGIN_SRC makefile :tangle makefile
-ldc_testrun_find:
+ldc_testrun_find_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_find_toml_pod_source:
+	$(SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND) \
+	./bin/sdp-ldc -v --source \
+--output-dir=tmp/program_output_pod
+ldc_testrun_find_toml_pod_sisupod:
+	$(SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND) \
+	./bin/sdp-ldc -v --sisupod \
+--output-dir=tmp/program_output_pod
+ldc_testrun_find_toml_pod_html:
+	$(SiSU_MARKUP_SAMPLES_PODS_TOML_FOUND) \
+	./bin/sdp-ldc -v --html \
+--output-dir=tmp/program_output_pod
+ldc_testrun_find_toml_pod_epub:
+	$(SiSU_MARKUP_SAMPLES_PODS_TOML_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_pod_source:
+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_pod_sisupod:
+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_pod_html:
+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_pod_epub:
+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_pod_all:
+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 \
@@ -552,30 +773,62 @@ ldc_testrun_find_pod_all:
 #+END_SRC
 
 ****** path list
+******* toml
 
 #+BEGIN_SRC makefile :tangle makefile
-ldc_testrun_paths:
+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:
+	./bin/sdp-ldc -v --source \
+--output-dir=tmp/program_output_pod \
+$(SiSU_MARKUP_SAMPLES_POD_TOML)
+ldc_testrun_paths_toml_pod_sisupod:
+	./bin/sdp-ldc -v --sisupod \
+--output-dir=tmp/program_output_pod \
+$(SiSU_MARKUP_SAMPLES_POD_TOML)
+ldc_testrun_paths_toml_pod_html:
+	./bin/sdp-ldc -v --html \
+--output-dir=tmp/program_output_pod \
+$(SiSU_MARKUP_SAMPLES_POD_TOML)
+ldc_testrun_paths_toml_pod_epub:
+	./bin/sdp-ldc -v --epub \
+--output-dir=tmp/program_output_pod \
+$(SiSU_MARKUP_SAMPLES_POD_TOML)
+ldc_testrun_paths_toml_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_pod_source:
+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_pod_sisupod:
+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_pod_html:
+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_pod_epub:
+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_pod_all:
+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 \
@@ -585,25 +838,52 @@ $(SiSU_MARKUP_SAMPLES_POD_SDL)
 **** 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_dir_source:
+dmd_testrun_find_sdl_dir_source:
 	$(SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND) \
 ./bin/sdp-dmd -v --source \
 --output-dir=tmp/program_output_dir
-dmd_testrun_find_dir_sisupod:
+dmd_testrun_find_sdl_dir_sisupod:
 	$(SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND) \
 ./bin/sdp-dmd -v --sisupod \
 --output-dir=tmp/program_output_dir
-dmd_testrun_find_dir_html:
+dmd_testrun_find_sdl_dir_html:
 	$(SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND) \
 ./bin/sdp-dmd -v --html \
 --output-dir=tmp/program_output_dir
-dmd_testrun_find_dir_epub:
+dmd_testrun_find_sdl_dir_epub:
 	$(SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND) \
 ./bin/sdp-dmd -v --epub \
 --output-dir=tmp/program_output_dir
-dmd_testrun_find_dir_all:
+dmd_testrun_find_sdl_dir_all:
 	$(SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND) \
 ./bin/sdp-dmd -v --source --html --epub --sqlite-discrete \
 --sqlite-create --sqlite-update \
@@ -611,25 +891,52 @@ dmd_testrun_find_dir_all:
 #+END_SRC
 
 ****** file list
+******* toml
 
 #+BEGIN_SRC makefile :tangle makefile
-dmd_testrun_filelist_dir_source:
+dmd_testrun_filelist_toml_dir_source:
+	./bin/sdp-dmd -v --source \
+--output-dir=tmp/program_output_dir \
+$(SiSU_MARKUP_SAMPLES_DIR_TOML)
+dmd_testrun_filelist_toml_dir_sisupod:
+	./bin/sdp-dmd -v --sisupod \
+--output-dir=tmp/program_output_dir \
+$(SiSU_MARKUP_SAMPLES_DIR_TOML)
+dmd_testrun_filelist_toml_dir_html:
+	./bin/sdp-dmd -v --html \
+--output-dir=tmp/program_output_dir \
+$(SiSU_MARKUP_SAMPLES_DIR_TOML)
+dmd_testrun_filelist_toml_dir_epub:
+	./bin/sdp-dmd -v --epub \
+--output-dir=tmp/program_output_dir \
+$(SiSU_MARKUP_SAMPLES_DIR_TOML)
+dmd_testrun_filelist_toml_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_dir_sisupod:
+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_dir_html:
+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_dir_epub:
+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_dir_all:
+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 \
@@ -638,25 +945,52 @@ $(SiSU_MARKUP_SAMPLES_DIR_SDL)
 
 ***** gdc
 ****** find files
+******* toml
 
 #+BEGIN_SRC makefile :tangle makefile
-gdc_testrun_find_dir_source:
+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:
 	./bin/sdp-gdc -v --source \
 --output-dir=tmp/program_output_dir \
 $(SiSU_MARKUP_SAMPLES_DIR_SDL)
-gdc_testrun_find_dir_sisupod:
+gdc_testrun_find_sdl_dir_sisupod:
 	$(SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND) \
 ./bin/sdp-gdc -v --sisupod \
 --output-dir=tmp/program_output_dir
-gdc_testrun_find_dir_html:
+gdc_testrun_find_sdl_dir_html:
 	$(SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND) \
 ./bin/sdp-gdc -v --html \
 --output-dir=tmp/program_output_dir
-gdc_testrun_find_dir_epub:
+gdc_testrun_find_sdl_dir_epub:
 	$(SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND) \
 ./bin/sdp-gdc -v --epub \
 --output-dir=tmp/program_output_dir
-gdc_testrun_find_dir_all:
+gdc_testrun_find_sdl_dir_all:
 	$(SiSU_MARKUP_SAMPLES_DIR_SDL_FILES_FOUND) \
 ./bin/sdp-gdc -v --source --html --epub --sqlite-discrete \
 --sqlite-create --sqlite-update \
@@ -664,25 +998,52 @@ gdc_testrun_find_dir_all:
 #+END_SRC
 
 ****** file list
+******* toml
 
 #+BEGIN_SRC makefile :tangle makefile
-gdc_testrun_filelist_dir_source:
+gdc_testrun_filelist_toml_dir_source:
+	./bin/sdp-gdc -v --source \
+--output-dir=tmp/program_output_dir \
+$(SiSU_MARKUP_SAMPLES_DIR_TOML)
+gdc_testrun_filelist_toml_dir_sisupod:
+	./bin/sdp-gdc -v --sisupod \
+--output-dir=tmp/program_output_dir \
+$(SiSU_MARKUP_SAMPLES_DIR_TOML)
+gdc_testrun_filelist_toml_dir_html:
+	./bin/sdp-gdc -v --html \
+--output-dir=tmp/program_output_dir \
+$(SiSU_MARKUP_SAMPLES_DIR_TOML)
+gdc_testrun_filelist_toml_dir_epub:
+	./bin/sdp-gdc -v --epub \
+--output-dir=tmp/program_output_dir \
+$(SiSU_MARKUP_SAMPLES_DIR_TOML)
+gdc_testrun_filelist_toml_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_dir_sisupod:
+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_dir_html:
+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_dir_epub:
+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_dir_all:
+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 \
@@ -691,25 +1052,52 @@ $(SiSU_MARKUP_SAMPLES_DIR_SDL)
 
 ***** 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_dir_source:
+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_dir_sisupod:
+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_dir_html:
+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_dir_epub:
+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_dir_all:
+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 \
@@ -717,25 +1105,52 @@ ldc_testrun_find_dir_all:
 #+END_SRC
 
 ****** file list
+******* toml
+
+#+BEGIN_SRC makefile :tangle makefile
+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)
+#+END_SRC
+
+******* sdlang
 
 #+BEGIN_SRC makefile :tangle makefile
-ldc_testrun_filelist_dir_source:
+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_dir_sisupod:
+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_dir_html:
+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_dir_epub:
+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_dir_all:
+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 \
@@ -804,12 +1219,9 @@ gitsnapshot: distclean tangle
 	tangle gitsnapshot
 #+END_SRC
 
-* dub (configuration)                                            :dub:config:
-
+* dub.sdl                                                    :dub:sdl:config:
 Every DUB package should contain a [[http://code.dlang.org/package-format?lang=json][dub.json]] (or [[http://code.dlang.org/package-format?lang=sdl][dub.sdl]])
-
-** dub.sdl                                                         :sdl:sdp:
-*** header                                                         :header:
+** header (including dependencies)                                  :header:
 
 #+BEGIN_SRC sh  :tangle dub.sdl
 name              "sdp"
@@ -822,85 +1234,60 @@ targetPath        "./bin"
 #sourcePath        "./src/sdp"
 stringImportPaths "./views"
 buildRequirements "allowWarnings"
-dependency        "toml"      version="~>0.4.0-rc.2"
-dependency        "toml:json" version="~>0.4.0-rc.2" # if not possible to parse toml directly go through json
-dependency        "sdlang-d"  version="~>0.10.1"
-dependency        "d2sqlite3" version="~>0.13.1"  # https://code.dlang.org/packages/d2sqlite3  http://biozic.github.io/d2sqlite3/d2sqlite3.html
+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
+dependency        "archive"   version="~>0.6.0"      # http://code.dlang.org/packages/archive     https://github.com/rcythr/archive
 #+END_SRC
 
-*** generic                                                       :generic:
-**** sdp-release (sdp)                                           :release:
+** generic                                                         :generic:
+*** build (sdp)                                                   :release:
 
 #+BEGIN_SRC sh  :tangle dub.sdl
-configuration "sdp-release" {
-  name                 "release"
+configuration "build" {
+  name                 "build"
   targetType           "executable"
   platforms            "posix"
-  targetName           "sdp"
+  targetName           "bin/sdp"
   dflags               "-J=views" "-I=src/sdp"
   buildOptions         "verbose" "releaseMode" "optimize" "inline"
   postGenerateCommands "/usr/bin/notify-send -t 0 'D release executable ready' 'sdp'"
 }
 #+END_SRC
 
-**** sdp-debug                                                     :debug:
-
-#+BEGIN_SRC sh  :tangle dub.sdl
-configuration "sdp-debug" {
-  name                 "debuging"
-  targetType           "executable"
-  platforms            "posix"
-  targetName           "sdp-debug"
-  dflags               "-g" "-J=views" "-I=src/sdp"
-  #lflags               "ld.gold"
-  buildRequirements    "allowWarnings"
-  buildOptions         "verbose" "debugMode" "debugInfo" "optimize"
-  debugVersions        "checkdoc" "summary"
-  debugVersions        "dumpdoc"
-  postGenerateCommands "/usr/bin/notify-send -t 0 'D (debug) executable ready' 'sdp-debug'"
-}
-#+END_SRC
-
-**** sdp-tmp
+*** reggae build (sdp)                                            :release:
 
 #+BEGIN_SRC sh  :tangle dub.sdl
-configuration "sdp-tmp" {
-  name                 "tmp"
+configuration "reggae" {
+  name                 "build"
   targetType           "executable"
   platforms            "posix"
-  targetName           "sdp-tmp"
+  targetName           "bin/sdp-rg"
   dflags               "-J=views" "-I=src/sdp"
-  #lflags               "ld.gold"
-  buildRequirements    "allowWarnings"
-  buildOptions         "verbose" "debugMode" "debugInfo" "optimize"
-  debugVersions        "checkdoc" "summary"
-  debugVersions        "tmp"
-  debugVersions        "crap"
-  debugVersions        "header"
-  debugVersions        "header1"
-  postGenerateCommands "/usr/bin/notify-send -t 0 'D (debug) executable ready' 'sdp-tmp'"
+  buildOptions         "verbose" "releaseMode" "optimize" "inline"
+  postGenerateCommands "/usr/bin/notify-send -t 0 'D release executable ready' 'sdp'"
 }
 #+END_SRC
 
-**** sdp-debug-clean                                         :debug:clean:
+*** sdp-release (sdp)                                             :release:
 
 #+BEGIN_SRC sh  :tangle dub.sdl
-configuration "sdp-debug-clean" {
-  name                 "debug-clean"
+configuration "sdp-release" {
+  name                 "release"
   targetType           "executable"
   platforms            "posix"
-  targetName           "sdp-debug-clean"
+  targetName           "sdp"
   dflags               "-J=views" "-I=src/sdp"
-  buildOptions         "verbose" "debugMode" "debugInfo" "optimize"
-  postGenerateCommands "/usr/bin/notify-send -t 0 'D (debug) executable ready' 'sdp-debug-clean'"
+  buildOptions         "verbose" "releaseMode" "optimize" "inline"
+  postGenerateCommands "/usr/bin/notify-send -t 0 'D release executable ready' 'sdp'"
 }
 #+END_SRC
 
-*** dmd                                                               :dmd:
-**** sdp-dmd                                                     :default:
-***** sdp-dmd
+** dmd                                                                 :dmd:
+*** sdp-dmd                                                       :default:
+**** sdp-dmd
 
 #+BEGIN_SRC sh  :tangle dub.sdl
 configuration "sdp-dmd" {
@@ -915,7 +1302,7 @@ configuration "sdp-dmd" {
 }
 #+END_SRC
 
-***** sdp-dmd-version
+**** sdp-dmd-version
 
 #+BEGIN_SRC sh  :tangle dub.sdl
 configuration "sdp-dmd-version" {
@@ -929,7 +1316,7 @@ configuration "sdp-dmd-version" {
 }
 #+END_SRC
 
-***** sdp-dmd-release
+**** sdp-dmd-release
 
 #+BEGIN_SRC sh  :tangle dub.sdl
 configuration "sdp-dmd-release" {
@@ -944,8 +1331,8 @@ configuration "sdp-dmd-release" {
 }
 #+END_SRC
 
-**** sdp-dmd-debug                                                 :debug:
-***** sdp-dmd-debug
+*** sdp-dmd-debug                                                   :debug:
+**** sdp-dmd-debug
 
 #+BEGIN_SRC sh  :tangle dub.sdl
 configuration "sdp-dmd-debug" {
@@ -962,60 +1349,10 @@ configuration "sdp-dmd-debug" {
 }
 #+END_SRC
 
-***** sdp-dmd-debug-version                                     :version:
-
-#+BEGIN_SRC sh  :tangle dub.sdl
-configuration "sdp-dmd-debug-version" {
-  name                 "debuging"
-  targetType           "executable"
-  platforms            "posix"
-  targetName           "sdp-dmd-debug-ver"
-  dflags               "-g" "-J=views" "-I=src/sdp"
-  buildRequirements    "allowWarnings"
-  buildOptions         "verbose" "debugMode" "debugInfo" "optimize"
-  debugVersions        "checkdoc" "summary"
-  debugVersions        "dumpdoc"
-}
-#+END_SRC
-
-***** sdp-dmd-debug-unittest                                   :unittest:
-
-#+BEGIN_SRC sh  :tangle dub.sdl
-configuration "sdp-dmd-debug-unittest" {
-  name                 "debuging"
-  targetType           "executable"
-  platforms            "posix"
-  targetName           "sdp-dmd-debug"
-  dflags               "-J=views" "-I=src/sdp"
-  buildRequirements    "allowWarnings"
-  buildOptions         "verbose" "debugMode" "debugInfo" "unittests" "optimize"
-  debugVersions        "checkdoc" "summary"
-  debugVersions        "dumpdoc"
-  postGenerateCommands "/usr/bin/notify-send -t 0 'D (debug) executable ready' 'sdp-dmd-debug'"
-}
-#+END_SRC
-
-***** sdp-dmd-debug-docs                                           :docs:
 
-#+BEGIN_SRC sh  :tangle dub.sdl
-configuration "sdp-dmd-debug-docs" {
-  name                 "debuging"
-  targetType           "executable"
-  platforms            "posix"
-  targetName           "sdp-dmd-debug"
-  dflags               "-J=views" "-I=src/sdp"
-  #lflags               "ld.gold"
-  buildRequirements    "allowWarnings"
-  buildOptions         "verbose" "debugMode" "debugInfo" "optimize"
-  debugVersions        "checkdoc" "summary"
-  debugVersions        "dumpdoc"
-  postGenerateCommands "/usr/bin/notify-send -t 0 'D (debug) executable ready' 'sdp-dmd-debug'"
-}
-#+END_SRC
-
-*** ldc                                                               :ldc:
-**** sdp-ldc                                                     :default:
-***** sdp-ldc
+** ldc                                                                 :ldc:
+*** sdp-ldc                                                       :default:
+**** sdp-ldc
 
 #+BEGIN_SRC sh  :tangle dub.sdl
 configuration "sdp-ldc" {
@@ -1030,7 +1367,7 @@ configuration "sdp-ldc" {
 }
 #+END_SRC
 
-***** sdp-ldc-version
+**** sdp-ldc-version
 
 #+BEGIN_SRC sh  :tangle dub.sdl
 configuration "sdp-ldc-version" {
@@ -1044,7 +1381,7 @@ configuration "sdp-ldc-version" {
 }
 #+END_SRC
 
-***** sdp-ldc-release
+**** sdp-ldc-release
 
 #+BEGIN_SRC sh  :tangle dub.sdl
 configuration "sdp-ldc-release" {
@@ -1059,8 +1396,8 @@ configuration "sdp-ldc-release" {
 }
 #+END_SRC
 
-**** sdp-ldc-debug                                                 :debug:
-***** sdp-ldc-debug
+*** sdp-ldc-debug                                                   :debug:
+**** sdp-ldc-debug
 
 #+BEGIN_SRC sh  :tangle dub.sdl
 configuration "sdp-ldc-debug" {
@@ -1072,60 +1409,13 @@ configuration "sdp-ldc-debug" {
   buildRequirements    "allowWarnings"
   buildOptions         "verbose" "debugMode" "debugInfo" "optimize"
   debugVersions        "checkdoc" "summary"
-  postGenerateCommands "time (./bin/sdp-ldc-debug --source --html --epub -v --output-dir=tmp/program-output data/sisupod/sisu-manual )" "/usr/bin/notify-send -t 0 'D (debug) executable ready' 'sdp-ldc-debug'"
-}
-#+END_SRC
-
-***** sdp-ldc-debug-version                                     :version:
-
-#+BEGIN_SRC sh  :tangle dub.sdl
-configuration "sdp-ldc-debug-version" {
-  name                 "debuging"
-  targetType           "executable"
-  platforms            "posix"
-  targetName           "sdp-ldc-debug-ver"
-  dflags               "-g" "-J=views" "-I=src/sdp"
-  buildRequirements    "allowWarnings"
-  buildOptions         "verbose" "debugMode" "debugInfo" "optimize"
-  debugVersions        "checkdoc" "summary"
-}
-#+END_SRC
-
-***** sdp-ldc-debug-unittest                                   :unittest:
-
-#+BEGIN_SRC sh  :tangle dub.sdl
-configuration "sdp-ldc-debug-unittest" {
-  name                 "debuging"
-  targetType           "executable"
-  platforms            "posix"
-  targetName           "sdp-ldc-debug"
-  dflags               "-J=views" "-I=src/sdp"
-  buildRequirements    "allowWarnings"
-  buildOptions         "verbose" "debugMode" "debugInfo" "unittests" "optimize"
-  debugVersions        "checkdoc" "summary"
-  postGenerateCommands "/usr/bin/notify-send -t 0 'D (debug) executable ready' 'sdp-ldc-debug'"
-}
-#+END_SRC
-
-***** sdp-ldc-debug-docs                                           :docs:
-
-#+BEGIN_SRC sh  :tangle dub.sdl
-configuration "sdp-ldc-debug-docs" {
-  name                 "debuging"
-  targetType           "executable"
-  platforms            "posix"
-  targetName           "sdp-ldc-debug"
-  dflags               "-J=views" "-I=src/sdp" "-Dddocs"
-  buildRequirements    "allowWarnings"
-  buildOptions         "verbose" "debugMode" "debugInfo" "optimize"
-  debugVersions        "checkdoc" "summary"
   postGenerateCommands "/usr/bin/notify-send -t 0 'D (debug) executable ready' 'sdp-ldc-debug'"
 }
 #+END_SRC
 
-*** gdc                                                               :gdc:
-**** sdp-gdc                                                     :default:
-***** sdp-gdc
+** gdc                                                                 :gdc:
+*** sdp-gdc                                                       :default:
+**** sdp-gdc
 
 #+BEGIN_SRC sh  :tangle dub.sdl
 configuration "sdp-gdc" {
@@ -1141,7 +1431,7 @@ configuration "sdp-gdc" {
 }
 #+END_SRC
 
-***** sdp-gdc-version
+**** sdp-gdc-version
 
 #+BEGIN_SRC sh  :tangle dub.sdl
 configuration "sdp-gdc-version" {
@@ -1156,7 +1446,7 @@ configuration "sdp-gdc-version" {
 }
 #+END_SRC
 
-***** sdp-gdc-release
+**** sdp-gdc-release
 
 #+BEGIN_SRC sh  :tangle dub.sdl
 configuration "sdp-gdc-release" {
@@ -1172,8 +1462,8 @@ configuration "sdp-gdc-release" {
 }
 #+END_SRC
 
-**** sdp-gdc-debug                                                 :debug:
-***** sdp-gdc-debug
+*** sdp-gdc-debug                                                   :debug:
+**** sdp-gdc-debug
 
 #+BEGIN_SRC sh  :tangle dub.sdl
 configuration "sdp-gdc-debug" {
@@ -1189,90 +1479,13 @@ configuration "sdp-gdc-debug" {
 }
 #+END_SRC
 
-***** sdp-gdc-debug-version                                     :version:
-
-#+BEGIN_SRC sh  :tangle dub.sdl
-configuration "sdp-gdc-debug-version" {
-  name                 "debuging"
-  targetType           "executable"
-  platforms            "posix"
-  targetName           "sdp-gdc-debug-ver"
-  dflags               "-O2" "-fbuiltin" "-Wall" "-Werror" "-Wformat=2" "-g" "-J=views" "-I=src/sdp"
-  lflags               "-lz"
-  buildOptions         "verbose" "debugMode" "debugInfo" "optimize"
-  debugVersions        "checkdoc" "summary"
-}
-#+END_SRC
-
-***** sdp-gdc-debug-unittest                                   :unittest:
-
-#+BEGIN_SRC sh  :tangle dub.sdl
-configuration "sdp-gdc-debug-unittest" {
-  name                 "debuging"
-  targetType           "executable"
-  platforms            "posix"
-  targetName           "sdp-gdc-debug"
-  dflags               "-J=views" "-I=src/sdp" "-Dddocs"
-  lflags               "-lz"
-  buildRequirements    "allowWarnings"
-  buildOptions         "verbose" "debugMode" "debugInfo" "unittests" "optimize"
-  debugVersions        "checkdoc" "summary"
-  postGenerateCommands "/usr/bin/notify-send -t 0 'D (debug) executable ready' 'sdp-gdc-debug'"
-}
-#+END_SRC
-
-***** sdp-gdc-debug-docs                                           :docs:
-
-#+BEGIN_SRC sh  :tangle dub.sdl
-configuration "sdp-gdc-debug-docs" {
-  name                 "debuging"
-  targetType           "executable"
-  platforms            "posix"
-  targetName           "sdp-gdc-debug"
-  dflags               "-J=views" "-I=src/sdp" "-Dddocs"
-  lflags               "-lz"
-  buildRequirements    "allowWarnings"
-  buildOptions         "verbose" "debugMode" "debugInfo" "optimize"
-  debugVersions        "checkdoc" "summary"
-  postGenerateCommands "/usr/bin/notify-send -t 0 'D (debug) executable ready' 'sdp-gdc-debug'"
-}
-#+END_SRC
-
-*** +dub.json+                                                         :json:
-
-**** +sdp+
-#+BEGIN_SRC json  :tangle no
-#+BEGIN_SRC json  :tangle dub.json
-{
-  "name"        : "sdp",
-  "targetType"  : "executable",
-  "targetName"  : "sdp",
-  "targetPath"  : "bin",
-  "description" : "sisu document parser.",
-  "authors"     : ["Ralph Amissah"],
-  "homepage"    : "http://sisudoc.org",
-  "license"     : "AGPL-3+",
-  "add-path"    : "./src/sdp",
-  "dependencies": {
-  }
-}
-** dub zfunc                                                         :zfunc:
-*** ,dubdmd                                                           :dmd:
-
-#+BEGIN_SRC sh  :tangle no
-time dub --compiler=dmd -v --force
-#+END_SRC
-
-*** ,dubldc                                                           :ldc:
+* reggaefile.d                                                       :reggae:
 
-#+BEGIN_SRC sh  :tangle no
-time dub --compiler=ldc2 -v --force
-#+END_SRC
-
-*** ,dubgdc                                                           :gdc:
-
-#+BEGIN_SRC sh  :tangle no
-time dub --compiler=gdc -v --force
+#+BEGIN_SRC d  :tangle reggaefile.d
+import reggae;
+alias _compile = dubDefaultTarget!(CompilerFlags("-g -O"));
+alias _dub_conf = dubConfigurationTarget!(Configuration("reggae"));
+mixin build!(_compile, _dub_conf);
 #+END_SRC
 
 * .gitignore                                                      :gitignore:
@@ -1286,36 +1499,48 @@ time dub --compiler=gdc -v --force
 !version.txt
 !dub*.json
 !dub.sdl
-.dub/**
 !tangle
 !*.org
 !*.d
 !*.txt
-!*.sst
 !conf.sdl
-!sisupod.manifest
-!sisu_document_make.sdl
-!config_local_site.sdl
-!sisu_document_make.toml
-!config_local_site.toml
 !org
 !src
 !src/*
 !data
 !data/*
+!data/toml/*
+!data/sdlang/*
+!data/toml/sisupod/**
+!data/toml/sisudir/**
+!data/sdlang/sisupod/**
+!data/sdlang/sisudir/**
+!*.sst
+!*.ssm
+!**/*.sst
+!**/*.ssm
+!sisupod.manifest
+!sisu_document_make.sdl
+!config_local_site.sdl
+!sisu_document_make.toml
+!config_local_site.toml
 !sisudoc
 !views
 !docs/*.html
-!**/
-**/.#*
+.dub/**
+.reggae/**
 tmp/**
+*_
+*~
+\#*
+*.\#*
 #!*/
 #*~
 #\#*
 #*.\#*
 #+END_SRC
 
-* sh script to batch process emacs org babel tangle     :shell_script:tangle:
+* sh script to batch process _emacs org babel tangle_     :shell_script:tangle:
   [[http://orgmode.org/manual/Batch-execution.html]]
 creates a shell batch script called "tangle", that will tangle (emacs org
 babel tangle) org files in ./org/ to create .d source files in ./src/sdp/
@@ -1350,7 +1575,160 @@ emacs --batch -Q -q \
 #+END_SRC
 
 * __END__
-** D build notes                                                     :notes:
+** build
+*** dub
+
+#+BEGIN_SRC sh  :tangle no
+dub build -h
+#+END_SRC
+
+#+BEGIN_SRC sh
+time (dub --compiler=dmd --config=sdp-dmd --debug=steps)
+time (dub --compiler=ldc2 --config=sdp-ldc --debug=steps)
+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)
+#+END_SRC
+
+*** make
+
+#+BEGIN_SRC sh
+time make dmd
+time make gdc
+time make ldc
+time make gdc ldc
+time make all
+time make all_ver
+time make dmd_ver ldc_ver gdc_ver
+
+time make ragga
+
+time make restart
+time make restart ldc
+time make tangle ldc
+#+END_SRC
+
+*** reggae
+
+touch src/sdp/sdp.d
+
+#+BEGIN_SRC sh
+reggae -b binary && reggae -b ninja && build
+#+END_SRC
+
+#+BEGIN_SRC sh
+reggae -b binary && build
+reggae -b ninja && build
+# reggae -b ninja --dc=dmd && build
+reggae -b binary --dc=ldmd2 && build
+reggae -b ninja --dc=ldmd2 && build
+# reggae -b ninja --dc=gdc && build
+reggae -b binary --dc=gdmd && build
+reggae -b ninja --dc=gdmd && build
+#+END_SRC
+
+see/try: dub describe
+
+**** issues
+issue with ldc2
+reggae -b ninja --dc ldc2 && build
+https://github.com/atilaneves/reggae/issues/29
+use ldmd2
+reggae -b ninja --dc ldmd2 && build
+https://stackoverflow.com/questions/35515138/ldc2-vs-ldmd2-whats-the-difference
+
+issue with gdc
+reggae -b ninja --dc gdc && build
+
+** dub zfunc                                                         :zfunc:
+*** ,dubdmd                                                           :dmd:
+
+#+BEGIN_SRC sh  :tangle no
+time dub --compiler=dmd -v --force
+#+END_SRC
+
+*** ,dubldc                                                           :ldc:
+
+#+BEGIN_SRC sh  :tangle no
+time dub --compiler=ldc2 -v --force
+#+END_SRC
+
+*** ,dubgdc                                                           :gdc:
+
+#+BEGIN_SRC sh  :tangle no
+time dub --compiler=gdc -v --force
+#+END_SRC
+
+** git
+*** project version
+
+echo $(git describe --long --tags | sed 's/^[ a-z_-]\+\([0-9.]\+\)/\1/;s/\([^-]*-g\)/r\1/;s/-/./g')
+
+*** what files changed
+git whatchanged --since="1 day ago" --oneline --name-only --pretty=format: | sort -u
+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/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 (~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 )
+
+can point to directory containing sisudoc.txt file (listing which files to process)
+
+time (~sdp2/bin/sdp-ldc --html -v sisudoc)
+# will process source files listed in sisudoc.txt for appropriate files and dir structure
+
+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
+
+find data/toml/sisudir/media/text -name *.ss[tm] | sort | xargs
+
+time ( find data/sdlang/sisupod -name sisupod.manifest | sort | xargs ./bin/sdp-ldc --source --html --epub -v --output-dir=tmp/program-output )
+
+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
+
+*** 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
+
+time make ldc_testrun_paths_pod_sisupod
+time make ldc_testrun_paths_pod_sisupod | ag "^\".+\"|NOT found"
+time make ldc_testrun_find_pod_sisupod
+time make ldc_testrun_find_dir_sisupod
+time make ldc_testrun_filelist_dir_sisupod
+** misc
 *** compilers
 
 - [X] Set D_COMPILER (one of DMD LDC or GDC)
@@ -1383,27 +1761,12 @@ dub fetch sdlang-d
 dub fetch taggedalgebraic
 dub fetch libinputvisitor
 dub fetch unit-threaded ?
+dub fetch reggae
 
 sdp ~master: /home/ralph/grotto/repo/git.repo/utils/sdp-x/
 /home/ralph/.dub/packages/*
 
 **** build
-***** call dub directly
-
-#+BEGIN_SRC sh  :tangle no
-dub build -h
-#+END_SRC
-
-#+BEGIN_SRC sh
-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)
-#+END_SRC
-
 ***** debug flags
 
 #+BEGIN_SRC sh
@@ -1458,65 +1821,3 @@ summary
 table
 toc
 #+END_SRC
-
-*** make
-**** TODO build
-
-#+BEGIN_SRC sh
-time make dmd
-time make gdc
-time make ldc
-time make gdc ldc
-time make all
-time make all_ver
-time make restart
-time make restart ldc
-time make tangle ldc
-#+END_SRC
-
-** git
-*** project version
-
-echo $(git describe --long --tags | sed 's/^[ a-z_-]\+\([0-9.]\+\)/\1/;s/\([^-]*-g\)/r\1/;s/-/./g')
-
-*** what files changed
-git whatchanged --since="1 day ago" --oneline --name-only --pretty=format: | sort -u
-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/sdlang/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 )
-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 (~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 )
-
-can point to directory containing sisudoc.txt file (listing which files to process)
-
-time (~sdp2/bin/sdp-ldc --html -v sisudoc)
-# will process source files listed in sisudoc.txt for appropriate files and dir structure
-
-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/sdlang/sisupod -name sisupod.manifest | sort | xargs ./bin/sdp-ldc --source --html --epub -v --output-dir=tmp/program-output )
-
-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
-
-*** list markup files
-find data/sdlang/sisupod -name sisupod.manifest | sort
-find data/sdlang/sisudir/media/text -name *.ss[tm] | sort
-
-time make ldc_testrun_paths_pod_sisupod
-time make ldc_testrun_paths_pod_sisupod | ag "^\".+\"|NOT found"
-time make ldc_testrun_find_pod_sisupod
-time make ldc_testrun_find_dir_sisupod
-time make ldc_testrun_filelist_dir_sisupod
diff --git a/org/sdp.org b/org/sdp.org
index dbc5cda..6ed2639 100644
--- a/org/sdp.org
+++ b/org/sdp.org
@@ -595,7 +595,7 @@ enforce(
 );
 #+END_SRC
 
-*** 1. _document abstraction_ [#A]
+*** 1. _document abstraction_                                                      >>
 
 - return tuple of:
   - doc_abstraction (the document)
@@ -603,11 +603,17 @@ enforce(
 
 #+NAME: sdp_each_file_do_abstraction
 #+BEGIN_SRC d
+debug(steps) {
+  writeln("stepX commence → (document abstraction)");
+}
 auto t = SiSUabstraction!()(_env, _opt_action, manifest);
 static assert(!isTypeTuple!(t));
 static assert(t.length==2);
 auto doc_abstraction = t[dAM.abstraction];
 auto doc_matters = t[dAM.matters];
+debug(steps) {
+  writeln("- stepX complete");
+}
 #+END_SRC
 
 *** 2. _output processing_ (post abstraction processing)                          >>
diff --git a/reggaefile.d b/reggaefile.d
new file mode 100644
index 0000000..48188f2
--- /dev/null
+++ b/reggaefile.d
@@ -0,0 +1,4 @@
+import reggae;
+alias _compile = dubDefaultTarget!(CompilerFlags("-g -O"));
+alias _dub_conf = dubConfigurationTarget!(Configuration("reggae"));
+mixin build!(_compile, _dub_conf);
diff --git a/src/sdp/sdp.d b/src/sdp/sdp.d
index e4bf4a9..b54ea3c 100755
--- a/src/sdp/sdp.d
+++ b/src/sdp/sdp.d
@@ -375,11 +375,17 @@ void main(string[] args) {
           "not a sisu markup filename: «" ~
           manifest.src.filename ~ "»"
         );
+        debug(steps) {
+          writeln("stepX commence → (document abstraction)");
+        }
         auto t = SiSUabstraction!()(_env, _opt_action, manifest);
         static assert(!isTypeTuple!(t));
         static assert(t.length==2);
         auto doc_abstraction = t[dAM.abstraction];
         auto doc_matters = t[dAM.matters];
+        debug(steps) {
+          writeln("- stepX complete");
+        }
         /+ ↓ debugs +/
         if (doc_matters.opt.action.verbose) {
           SiSUabstractionSummary!()(doc_abstraction, doc_matters);