diff options
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | dub.sdl | 104 | ||||
| -rw-r--r-- | makefile | 202 | ||||
| -rw-r--r-- | maker.org | 485 | ||||
| -rw-r--r-- | meson.build | 67 | ||||
| -rw-r--r-- | org/compile_time_info.org | 25 | ||||
| -rw-r--r-- | org/default_misc.org | 25 | ||||
| -rw-r--r-- | org/default_paths.org | 29 | ||||
| -rw-r--r-- | org/default_regex.org | 31 | ||||
| -rw-r--r-- | org/default_shared.org | 19 | ||||
| -rw-r--r-- | org/doc_reform.org (renamed from org/sdp.org) | 175 | ||||
| -rw-r--r-- | org/imports.org | 31 | ||||
| -rw-r--r-- | org/meta_abstraction.org | 51 | ||||
| -rw-r--r-- | org/meta_conf_make_meta.org | 67 | ||||
| -rw-r--r-- | org/meta_debugs.org | 21 | ||||
| -rw-r--r-- | org/output_hub.org | 33 | ||||
| -rw-r--r-- | org/output_sisupod.org | 23 | ||||
| -rw-r--r-- | org/output_sqlite.org | 37 | ||||
| -rw-r--r-- | org/output_xmls.org | 43 | ||||
| -rw-r--r-- | org/output_xmls_css.org | 17 | ||||
| -rw-r--r-- | org/output_zip.org | 14 | ||||
| -rw-r--r-- | org/source_files_read.org | 40 | ||||
| -rw-r--r-- | src/doc_reform/conf/compile_time_info.d (renamed from src/sdp/conf/compile_time_info.d) | 2 | ||||
| -rwxr-xr-x | src/doc_reform/doc_reform.d (renamed from src/sdp/sdp.d) | 36 | ||||
| -rw-r--r-- | src/doc_reform/meta/conf_make_meta_json.d (renamed from src/sdp/meta/conf_make_meta_json.d) | 8 | ||||
| -rw-r--r-- | src/doc_reform/meta/conf_make_meta_structs.d (renamed from src/sdp/meta/conf_make_meta_structs.d) | 18 | ||||
| -rw-r--r-- | src/doc_reform/meta/conf_make_meta_toml.d (renamed from src/sdp/meta/conf_make_meta_toml.d) | 12 | ||||
| -rw-r--r-- | src/doc_reform/meta/defaults.d (renamed from src/sdp/meta/defaults.d) | 2 | ||||
| -rw-r--r-- | src/doc_reform/meta/doc_debugs.d (renamed from src/sdp/meta/doc_debugs.d) | 6 | ||||
| -rw-r--r-- | src/doc_reform/meta/metadoc.d (renamed from src/sdp/meta/metadoc.d) | 28 | ||||
| -rw-r--r-- | src/doc_reform/meta/metadoc_from_src.d (renamed from src/sdp/meta/metadoc_from_src.d) | 30 | ||||
| -rw-r--r-- | src/doc_reform/meta/metadoc_summary.d (renamed from src/sdp/meta/metadoc_summary.d) | 6 | ||||
| -rw-r--r-- | src/doc_reform/meta/object_setter.d (renamed from src/sdp/meta/object_setter.d) | 2 | ||||
| -rw-r--r-- | src/doc_reform/meta/package.d (renamed from src/sdp/meta/package.d) | 6 | ||||
| -rw-r--r-- | src/doc_reform/meta/rgx.d (renamed from src/sdp/meta/rgx.d) | 4 | ||||
| -rw-r--r-- | src/doc_reform/output/create_zip_file.d (renamed from src/sdp/output/create_zip_file.d) | 2 | ||||
| -rw-r--r-- | src/doc_reform/output/defaults.d (renamed from src/sdp/output/defaults.d) | 2 | ||||
| -rw-r--r-- | src/doc_reform/output/epub3.d (renamed from src/sdp/output/epub3.d) | 10 | ||||
| -rw-r--r-- | src/doc_reform/output/html.d (renamed from src/sdp/output/html.d) | 10 | ||||
| -rw-r--r-- | src/doc_reform/output/hub.d (renamed from src/sdp/output/hub.d) | 34 | ||||
| -rw-r--r-- | src/doc_reform/output/package.d (renamed from src/sdp/output/package.d) | 12 | ||||
| -rw-r--r-- | src/doc_reform/output/paths_output.d (renamed from src/sdp/output/paths_output.d) | 4 | ||||
| -rw-r--r-- | src/doc_reform/output/rgx.d (renamed from src/sdp/output/rgx.d) | 4 | ||||
| -rw-r--r-- | src/doc_reform/output/source_sisupod.d (renamed from src/sdp/output/source_sisupod.d) | 8 | ||||
| -rw-r--r-- | src/doc_reform/output/sqlite.d (renamed from src/sdp/output/sqlite.d) | 6 | ||||
| -rw-r--r-- | src/doc_reform/output/xmls.d (renamed from src/sdp/output/xmls.d) | 14 | ||||
| -rw-r--r-- | src/doc_reform/output/xmls_css.d (renamed from src/sdp/output/xmls_css.d) | 2 | ||||
| -rw-r--r-- | src/doc_reform/share/defaults.d (renamed from src/sdp/share/defaults.d) | 2 | ||||
| -rw-r--r-- | src/doc_reform/source/paths_source.d (renamed from src/sdp/source/paths_source.d) | 4 | ||||
| -rw-r--r-- | src/doc_reform/source/read_config_files.d (renamed from src/sdp/source/read_config_files.d) | 30 | ||||
| -rw-r--r-- | src/doc_reform/source/read_source_files.d (renamed from src/sdp/source/read_source_files.d) | 17 | ||||
| -rw-r--r-- | views/version.txt | 2 |
52 files changed, 923 insertions, 943 deletions
@@ -14,8 +14,8 @@ !conf.sdl !org !src -!src/sdp -!src/sdp/* +!src/doc_reform +!src/doc_reform/* !data !data/* !data/sisupod/** @@ -1,11 +1,11 @@ -name "sdp" +name "doc-reform" description "sisu document parser" homepage "http://sisudoc.org" authors "Ralph Amissah" copyright "Copyright © 2016 Ralph Amissah" license "AGPL-3+" targetPath "./bin" -#sourcePath "./src/sdp" +#sourcePath "./src/doc_reform" stringImportPaths "./views" buildRequirements "allowWarnings" dependency "archive" version="~>0.6.0" # http://code.dlang.org/packages/archive https://github.com/rcythr/archive @@ -14,136 +14,136 @@ dependency "d2sqlite3" version="~>0.16.2" # https://code.dlang.o dependency "imageformats" version="~>7.0.0" # https://code.dlang.org/packages/imageformats https://github.com/lgvz/imageformats dependency "toml" version="~>1.0.0-rc.3" # https://code.dlang.org/packages/toml https://github.com/toml-lang/toml/wiki dependency "toml:json" version="~>1.0.0-rc.3" -configuration "sdp-release" { +configuration "doc-reform-release" { name "release" targetType "executable" platforms "posix" - targetName "sdp" - dflags "-J=views" "-I=src/sdp" + targetName "doc-reform" + dflags "-J=views" "-I=src/doc_reform" buildOptions "verbose" "releaseMode" "optimize" "inline" - postGenerateCommands "/usr/bin/notify-send -t 0 'D release executable ready' 'sdp'" + postGenerateCommands "/usr/bin/notify-send -t 0 'D release executable ready' 'doc-reform'" } -configuration "sdp-dmd" { +configuration "doc-reform-dmd" { name "dmd" targetType "executable" platforms "posix" - targetName "sdp-dmd" - dflags "-J=views" "-I=src/sdp" + targetName "doc-reform-dmd" + dflags "-J=views" "-I=src/doc_reform" buildRequirements "allowWarnings" buildOptions "verbose" "inline" # "optimize" # "releaseMode" - postGenerateCommands "/usr/bin/notify-send -t 0 'D dmd compiled test release executable ready' 'sdp-dmd'" + postGenerateCommands "/usr/bin/notify-send -t 0 'D dmd compiled test release executable ready' 'doc-reform-dmd'" } -configuration "sdp-dmd-version" { +configuration "doc-reform-dmd-version" { name "dmd" targetType "executable" platforms "posix" - targetName "sdp-dmd-ver" - dflags "-J=views" "-I=src/sdp" + targetName "doc-reform-dmd-ver" + dflags "-J=views" "-I=src/doc_reform" buildRequirements "allowWarnings" buildOptions "verbose" "optimize" "inline" # "releaseMode" } -configuration "sdp-dmd-release" { +configuration "doc-reform-dmd-release" { name "dmd" targetType "executable" platforms "posix" - targetName "sdp-dmd" - dflags "-J=views" "-I=src/sdp" + targetName "doc-reform-dmd" + dflags "-J=views" "-I=src/doc_reform" buildRequirements "allowWarnings" buildOptions "verbose" "optimize" "inline" "releaseMode" - postGenerateCommands "/usr/bin/notify-send -t 0 'D dmd compiled test release executable ready' 'sdp-dmd'" + postGenerateCommands "/usr/bin/notify-send -t 0 'D dmd compiled test release executable ready' 'doc-reform-dmd'" } -configuration "sdp-dmd-debug" { +configuration "doc-reform-dmd-debug" { name "debuging" targetType "executable" platforms "posix" - targetName "sdp-dmd-debug" - dflags "-g" "-J=views" "-I=src/sdp" + targetName "doc-reform-dmd-debug" + dflags "-J=views" "-I=src/doc_reform" 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'" + postGenerateCommands "/usr/bin/notify-send -t 0 'D (debug) executable ready' 'doc-reform-dmd-debug'" } -configuration "sdp-ldc" { +configuration "doc-reform-ldc" { name "ldc" targetType "executable" platforms "posix" - targetName "sdp-ldc" - dflags "-O2" "-J=views" "-I=src/sdp" + targetName "doc-reform-ldc" + dflags "-O2" "-J=views" "-I=src/doc_reform" buildRequirements "allowWarnings" buildOptions "verbose" "optimize" "inline" # "releaseMode" - postGenerateCommands "/usr/bin/notify-send -t 0 'D ldc2 compiled test release executable ready' 'sdp-ldc'" + postGenerateCommands "/usr/bin/notify-send -t 0 'D ldc2 compiled test release executable ready' 'doc-reform-ldc'" } -configuration "sdp-ldc-version" { +configuration "doc-reform-ldc-version" { name "ldc" targetType "executable" platforms "posix" - targetName "sdp-ldc-ver" - dflags "-O2" "-J=views" "-I=src/sdp" + targetName "doc-reform-ldc-ver" + dflags "-O2" "-J=views" "-I=src/doc_reform" buildRequirements "allowWarnings" buildOptions "verbose" "optimize" "inline" # "releaseMode" } -configuration "sdp-ldc-release" { +configuration "doc-reform-ldc-release" { name "ldc" targetType "executable" platforms "posix" - targetName "sdp-ldc" - dflags "-O2" "-J=views" "-I=src/sdp" + targetName "doc-reform-ldc" + dflags "-O2" "-J=views" "-I=src/doc_reform" buildRequirements "allowWarnings" buildOptions "verbose" "optimize" "inline" "releaseMode" - postGenerateCommands "/usr/bin/notify-send -t 0 'D ldc2 compiled test release executable ready' 'sdp-ldc'" + postGenerateCommands "/usr/bin/notify-send -t 0 'D ldc2 compiled test release executable ready' 'doc-reform-ldc'" } -configuration "sdp-ldc-debug" { +configuration "doc-reform-ldc-debug" { name "debuging" targetType "executable" platforms "posix" - targetName "sdp-ldc-debug" - dflags "-g" "-J=views" "-I=src/sdp" + targetName "doc-reform-ldc-debug" + dflags "-J=views" "-I=src/doc_reform" buildRequirements "allowWarnings" buildOptions "verbose" "debugMode" "debugInfo" "optimize" debugVersions "checkdoc" "summary" - postGenerateCommands "/usr/bin/notify-send -t 0 'D (debug) executable ready' 'sdp-ldc-debug'" + postGenerateCommands "/usr/bin/notify-send -t 0 'D (debug) executable ready' 'doc-reform-ldc-debug'" } -configuration "sdp-gdc" { +configuration "doc-reform-gdc" { name "gdc" targetType "executable" platforms "posix" - targetName "sdp-gdc" - dflags "-O2" "-J=views" "-I=src/sdp" + targetName "doc-reform-gdc" + dflags "-O2" "-J=views" "-I=src/doc_reform" lflags "-lz" buildRequirements "allowWarnings" - buildOptions "verbose" "optimize" "inline" # "releaseMode" - postGenerateCommands "/usr/bin/notify-send -t 0 'D gdc compiled test release executable ready' 'sdp-gdc'" + buildOptions "optimize" "inline" # "releaseMode" + postGenerateCommands "/usr/bin/notify-send -t 0 'D gdc compiled test release executable ready' 'doc-reform-gdc'" } -configuration "sdp-gdc-version" { +configuration "doc-reform-gdc-version" { name "gdc" targetType "executable" platforms "posix" - targetName "sdp-gdc-ver" - dflags "-O2" "-J=views" "-I=src/sdp" + targetName "doc-reform-gdc-ver" + dflags "-O2" "-J=views" "-I=src/doc_reform" lflags "-lz" buildRequirements "allowWarnings" buildOptions "verbose" "optimize" "inline" # "releaseMode" } -configuration "sdp-gdc-release" { +configuration "doc-reform-gdc-release" { name "gdc" targetType "executable" platforms "posix" - targetName "sdp-gdc" - dflags "-O2" "-J=views" "-I=src/sdp" + targetName "doc-reform-gdc" + dflags "-O2" "-J=views" "-I=src/doc_reform" lflags "-lz" buildRequirements "allowWarnings" buildOptions "verbose" "optimize" "inline" "releaseMode" - postGenerateCommands "/usr/bin/notify-send -t 0 'D gdc compiled test release executable ready' 'sdp-gdc'" + postGenerateCommands "/usr/bin/notify-send -t 0 'D gdc compiled test release executable ready' 'doc-reform-gdc'" } -configuration "sdp-gdc-debug" { +configuration "doc-reform-gdc-debug" { name "debuging" targetType "executable" platforms "posix" - targetName "sdp-gdc-debug" - dflags "-O2" "-fbuiltin" "-Wall" "-Werror" "-Wformat=2" "-g" "-J=views" "-I=src/sdp" + targetName "doc-reform-gdc-debug" + dflags "-O2" "-fbuiltin" "-Wall" "-Werror" "-Wformat=2" "-g" "-J=views" "-I=src/doc_reform" lflags "-lz" buildOptions "verbose" "debugMode" "debugInfo" "optimize" debugVersions "checkdoc" "summary" - postGenerateCommands "/usr/bin/notify-send -t 0 'D gdc compiled (debug with -g) executable ready' 'sdp-gdc-debug'" + postGenerateCommands "/usr/bin/notify-send -t 0 'D gdc compiled (debug with -g) executable ready' 'doc-reform-gdc-debug'" } @@ -1,7 +1,9 @@ PROJECT_VERSION :=$(shell echo `git describe --long --tags | sed -e "s/^[ a-z_-]\+\([0-9.]\+\)/\1/;s/\([^-]*-g\)/r\1/;s/-/./g"`) DUB=dub DUB_FLAGS=-v --force --compiler= -PRG_NAME=sdp +PRG_NAME=doc-reform +PRG_NICKAME=rad +PRG_NAME_DIR=$(shell echo `echo $(PRG_NAME) | sed -e "s/-/_/g"`) PRG_SRC=$(PRG_NAME).d PRG_SRCDIR=./src PRG_BIN=$(PRG_NAME) @@ -102,66 +104,68 @@ all_ver_clean: clean tangle dmd_ver ldc_ver gdc_ver all_debug_ver: dmd_debug_ver gdc_debug_ver ldc_debug_ver all_debug_clean_ver: clean tangle dmd_debug_ver gdc_debug_ver ldc_debug_ver dmd: - $(DUB) --compiler=dmd --config=sdp-dmd + $(DUB) --compiler=dmd --config=doc-reform-dmd 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)' + $(DUB) --compiler=dmd --config=doc-reform-dmd-version + mv bin/doc-reform-dmd-ver bin/doc-reform-dmd-$(PROJECT_VERSION) + notify-send -t 0 'D dmd compiled test release executable ready' 'doc-reform-dmd-$(PROJECT_VERSION)' dmd_clean_ver: clean tangle dmd_ver dmd_debug: - $(DUB) --compiler=dmd --config=sdp-dmd-debug + $(DUB) --compiler=dmd --config=doc-reform-dmd-debug dmd_rel: expunge skel tangle - $(DUB) --compiler=dmd --config=sdp-release + $(DUB) --compiler=dmd --config=doc-reform-release dmd_rel_tangle: tangle - $(DUB) --compiler=dmd --config=sdp-dmd + $(DUB) --compiler=dmd --config=doc-reform-dmd dmd_rel_expunge_tangle: expunge skel tangle dmd_rel_tangle dmd_debug_tangle: tangle - $(DUB) --compiler=dmd --config=sdp-dmd-debug + $(DUB) --compiler=dmd --config=doc-reform-dmd-debug gdc: - $(DUB) --compiler=gdc --config=sdp-gdc + $(DUB) --compiler=gdc --config=doc-reform-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)' + $(DUB) --compiler=gdc --config=doc-reform-gdc-version + mv bin/doc-reform-gdc-ver bin/doc-reform-gdc-$(PROJECT_VERSION) + notify-send -t 0 'D gdc compiled test release executable ready' 'doc-reform-gdc-$(PROJECT_VERSION)' gdc_clean_ver: clean tangle gdc_ver gdc_debug: - $(DUB) --compiler=gdc --config=sdp-gdc-debug + $(DUB) --compiler=gdc --config=doc-reform-gdc-debug gdc_rel: expunge skel tangle - $(DUB) --compiler=gdc --config=sdp-release + $(DUB) --compiler=gdc --config=doc-reform-release gdc_rel_tangle: tangle - $(DUB) --compiler=gdc --config=sdp-gdc + $(DUB) --compiler=gdc --config=doc-reform-gdc gdc_rel_expunge_tangle: expunge skel tangle gdc_rel_tangle gdc_debug_tangle: tangle - $(DUB) --compiler=gdc --config=sdp-gdc-debug + $(DUB) --compiler=gdc --config=doc-reform-gdc-debug ldc: - $(DUB) --compiler=ldc2 --config=sdp-ldc + $(DUB) --compiler=ldc2 --config=doc-reform-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)' + $(DUB) --compiler=ldc2 --config=doc-reform-ldc-version + mv bin/doc-reform-ldc-ver bin/doc-reform-ldc-$(PROJECT_VERSION) + notify-send -t 0 'D ldc2 compiled test release executable ready' 'doc-reform-ldc-$(PROJECT_VERSION)' ldc_clean_ver: clean tangle ldc_ver ldc_debug: - $(DUB) --compiler=ldc2 --config=sdp-ldc-debug + $(DUB) --compiler=ldc2 --config=doc-reform-ldc-debug ldc_rel: expunge skel tangle - $(DUB) --compiler=ldc2 --config=sdp-release + $(DUB) --compiler=ldc2 --config=doc-reform-release ldc_rel_tangle: tangle - $(DUB) --compiler=ldc2 --config=sdp-ldc + $(DUB) --compiler=ldc2 --config=doc-reform-ldc ldc_rel_expunge_tangle: expunge skel tangle ldc_rel_tangle ldc_debug_tangle: tangle - $(DUB) --compiler=ldc2 --config=sdp-ldc-debug + $(DUB) --compiler=ldc2 --config=doc-reform-ldc-debug +reinit: clean skel tangle skel: mkdir -p build; \ mkdir -p subprojects; \ - mkdir -p $(PRG_SRCDIR)/$(PRG_NAME)/conf; \ - mkdir -p $(PRG_SRCDIR)/$(PRG_NAME)/meta; \ - mkdir -p $(PRG_SRCDIR)/$(PRG_NAME)/output; \ - mkdir -p $(PRG_SRCDIR)/$(PRG_NAME)/share; \ - mkdir -p $(PRG_SRCDIR)/$(PRG_NAME)/source; \ - mkdir -p $(PRG_SRCDIR)/$(PRG_NAME); \ + mkdir -p $(PRG_SRCDIR)/$(PRG_NAME_DIR)/conf; \ + mkdir -p $(PRG_SRCDIR)/$(PRG_NAME_DIR)/meta; \ + mkdir -p $(PRG_SRCDIR)/$(PRG_NAME_DIR)/output; \ + mkdir -p $(PRG_SRCDIR)/$(PRG_NAME_DIR)/share; \ + mkdir -p $(PRG_SRCDIR)/$(PRG_NAME_DIR)/source; \ + mkdir -p $(PRG_SRCDIR)/$(PRG_NAME_DIR); \ mkdir -p $(PRG_BINDIR); init: skel clean: rm -rf build; \ + rm -rf subprojects; \ rm -rf $(PRG_SRCDIR); \ rm -rf $(PRG_DOCDIR); clean_bin: @@ -172,15 +176,17 @@ clean_docs: rm -rf $(PRG_DOCDIR) expunge: rm -f dub.selections.json; \ + rm -rf build; \ + rm -rf subprojects; \ rm -rf $(PRG_SRCDIR); \ rm -rf $(PRG_BINDIR); \ rm -rf $(PRG_DOCDIR); distclean: expunge distclean_and_init: expunge - mkdir -p $(PRG_SRCDIR)/$(PRG_NAME); \ + mkdir -p $(PRG_SRCDIR)/$(PRG_NAME_DIR); \ mkdir -p $(PRG_BINDIR); ver: - echo sdp-$(PROJECT_VERSION) + echo doc-reform-$(PROJECT_VERSION) clean_tangle_build: clean tangle build tangle_build: tangle build build: $(PRG_SRCDIR)/$(PRG_SRC) @@ -194,279 +200,279 @@ restart: clean tangle find_pods: $(SiSU_MARKUP_SAMPLES_FIND_PODS) dmd_testrun_find: - ./bin/sdp-dmd -v --source --html --epub --sqlite-discrete \ + ./bin/doc-reform-dmd -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_pod \ data/sisupod/sisu-manual dmd_testrun_find_pod_source: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ -./bin/sdp-ldc -v --source --html --epub \ +./bin/doc-reform-ldc -v --source --html --epub \ --output-dir=tmp/program_output_pod dmd_testrun_find_pod_sisupod: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ -./bin/sdp-dmd -v --sisupod \ +./bin/doc-reform-dmd -v --sisupod \ --output-dir=tmp/program_output_pod dmd_testrun_find_pod_html: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ -./bin/sdp-dmd -v --html \ +./bin/doc-reform-dmd -v --html \ --output-dir=tmp/program_output_pod dmd_testrun_find_pod_epub: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ -./bin/sdp-dmd -v --epub \ +./bin/doc-reform-dmd -v --epub \ --output-dir=tmp/program_output_pod dmd_testrun_find_pod_all: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ -./bin/sdp-dmd -v --source --html --epub --sqlite-discrete \ +./bin/doc-reform-dmd -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_pod dmd_testrun_paths_pod_source: - ./bin/sdp-dmd -v --source \ + ./bin/doc-reform-dmd -v --source \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) dmd_testrun_paths_pod_sisupod: - ./bin/sdp-dmd -v --sisupod \ + ./bin/doc-reform-dmd -v --sisupod \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) dmd_testrun_paths_pod_html: - ./bin/sdp-dmd -v --html \ + ./bin/doc-reform-dmd -v --html \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) dmd_testrun_paths_pod_epub: - ./bin/sdp-dmd -v --epub \ + ./bin/doc-reform-dmd -v --epub \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) dmd_testrun_paths_pod_all: - ./bin/sdp-dmd -v --source --html --epub --sqlite-discrete \ + ./bin/doc-reform-dmd -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) gdc_testrun_find: - ./bin/sdp-gdc -v --source --html --epub --sqlite-discrete \ + ./bin/doc-reform-gdc -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_pod \ data/sisupod/sisu-manual gdc_testrun_find_pod_source: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ -./bin/sdp-gdc -v --source \ +./bin/doc-reform-gdc -v --source \ --output-dir=tmp/program_output_pod gdc_testrun_find_pod_sisupod: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ -./bin/sdp-gdc -v --sisupod \ +./bin/doc-reform-gdc -v --sisupod \ --output-dir=tmp/program_output_pod gdc_testrun_find_pod_html: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ -./bin/sdp-gdc -v --html \ +./bin/doc-reform-gdc -v --html \ --output-dir=tmp/program_output_pod gdc_testrun_find_pod_epub: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ -./bin/sdp-gdc -v --epub \ +./bin/doc-reform-gdc -v --epub \ --output-dir=tmp/program_output_pod gdc_testrun_find_pod_all: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ -./bin/sdp-gdc -v --source --html --epub --sqlite-discrete \ +./bin/doc-reform-gdc -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_pod gdc_testrun_paths: - ./bin/sdp-gdc -v --source --html --epub --sqlite-discrete \ + ./bin/doc-reform-gdc -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_pod \ data/sisupod/sisu-manual gdc_testrun_paths_pod_source: - ./bin/sdp-gdc -v --source \ + ./bin/doc-reform-gdc -v --source \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) gdc_testrun_paths_pod_sisupod: - ./bin/sdp-gdc -v --sisupod \ + ./bin/doc-reform-gdc -v --sisupod \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) gdc_testrun_paths_pod_html: - ./bin/sdp-gdc -v --html \ + ./bin/doc-reform-gdc -v --html \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) gdc_testrun_paths_pod_epub: - ./bin/sdp-gdc -v --epub \ + ./bin/doc-reform-gdc -v --epub \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) gdc_testrun_paths_pod_all: - ./bin/sdp-gdc -v --source --html --epub --sqlite-discrete \ + ./bin/doc-reform-gdc -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) ldc_testrun_find: - ./bin/sdp-ldc -v --source --html --epub --sqlite-discrete \ + ./bin/doc-reform-ldc -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_pod \ data/sisupod/sisu-manual ldc_testrun_find_pod_source: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ - ./bin/sdp-ldc -v --source \ + ./bin/doc-reform-ldc -v --source \ --output-dir=tmp/program_output_pod ldc_testrun_find_pod_sisupod: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ - ./bin/sdp-ldc -v --sisupod \ + ./bin/doc-reform-ldc -v --sisupod \ --output-dir=tmp/program_output_pod ldc_testrun_find_pod_html: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ - ./bin/sdp-ldc -v --html \ + ./bin/doc-reform-ldc -v --html \ --output-dir=tmp/program_output_pod ldc_testrun_find_pod_epub: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ - ./bin/sdp-ldc -v --epub \ + ./bin/doc-reform-ldc -v --epub \ --output-dir=tmp/program_output_pod ldc_testrun_find_pod_all: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ - ./bin/sdp-ldc -v --source --html --epub --sqlite-discrete \ + ./bin/doc-reform-ldc -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_pod ldc_testrun_paths: - ./bin/sdp-ldc -v --source --html --epub --sqlite-discrete \ + ./bin/doc-reform-ldc -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_pod \ data/sisupod/sisu-manual ldc_testrun_paths_pod_source: - ./bin/sdp-ldc -v --source \ + ./bin/doc-reform-ldc -v --source \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) ldc_testrun_paths_pod_sisupod: - ./bin/sdp-ldc -v --sisupod \ + ./bin/doc-reform-ldc -v --sisupod \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) ldc_testrun_paths_pod_html: - ./bin/sdp-ldc -v --html \ + ./bin/doc-reform-ldc -v --html \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) ldc_testrun_paths_pod_epub: - ./bin/sdp-ldc -v --epub \ + ./bin/doc-reform-ldc -v --epub \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) ldc_testrun_paths_pod_all: - ./bin/sdp-ldc -v --source --html --epub --sqlite-discrete \ + ./bin/doc-reform-ldc -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) dmd_testrun_find_dir_source: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/sdp-dmd -v --source \ +./bin/doc-reform-dmd -v --source \ --output-dir=tmp/program_output_dir dmd_testrun_find_dir_sisupod: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/sdp-dmd -v --sisupod \ +./bin/doc-reform-dmd -v --sisupod \ --output-dir=tmp/program_output_dir dmd_testrun_find_dir_html: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/sdp-dmd -v --html \ +./bin/doc-reform-dmd -v --html \ --output-dir=tmp/program_output_dir dmd_testrun_find_dir_epub: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/sdp-dmd -v --epub \ +./bin/doc-reform-dmd -v --epub \ --output-dir=tmp/program_output_dir dmd_testrun_find_dir_all: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/sdp-dmd -v --source --html --epub --sqlite-discrete \ +./bin/doc-reform-dmd -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_dir dmd_testrun_filelist_dir_source: - ./bin/sdp-dmd -v --source \ + ./bin/doc-reform-dmd -v --source \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) dmd_testrun_filelist_dir_sisupod: - ./bin/sdp-dmd -v --sisupod \ + ./bin/doc-reform-dmd -v --sisupod \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) dmd_testrun_filelist_dir_html: - ./bin/sdp-dmd -v --html \ + ./bin/doc-reform-dmd -v --html \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) dmd_testrun_filelist_dir_epub: - ./bin/sdp-dmd -v --epub \ + ./bin/doc-reform-dmd -v --epub \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) dmd_testrun_filelist_dir_all: - ./bin/sdp-dmd -v --source --html --epub --sqlite-discrete \ + ./bin/doc-reform-dmd -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) gdc_testrun_find_dir_source: - ./bin/sdp-gdc -v --source \ + ./bin/doc-reform-gdc -v --source \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) gdc_testrun_find_dir_sisupod: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/sdp-gdc -v --sisupod \ +./bin/doc-reform-gdc -v --sisupod \ --output-dir=tmp/program_output_dir gdc_testrun_find_dir_html: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/sdp-gdc -v --html \ +./bin/doc-reform-gdc -v --html \ --output-dir=tmp/program_output_dir gdc_testrun_find_dir_epub: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/sdp-gdc -v --epub \ +./bin/doc-reform-gdc -v --epub \ --output-dir=tmp/program_output_dir gdc_testrun_find_dir_all: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/sdp-gdc -v --source --html --epub --sqlite-discrete \ +./bin/doc-reform-gdc -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_dir gdc_testrun_filelist_dir_source: - ./bin/sdp-gdc -v --source \ + ./bin/doc-reform-gdc -v --source \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) gdc_testrun_filelist_dir_sisupod: - ./bin/sdp-gdc -v --sisupod \ + ./bin/doc-reform-gdc -v --sisupod \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) gdc_testrun_filelist_dir_html: - ./bin/sdp-gdc -v --html \ + ./bin/doc-reform-gdc -v --html \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) gdc_testrun_filelist_dir_epub: - ./bin/sdp-gdc -v --epub \ + ./bin/doc-reform-gdc -v --epub \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) gdc_testrun_filelist_dir_all: - ./bin/sdp-gdc -v --source --html --epub --sqlite-discrete \ + ./bin/doc-reform-gdc -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) ldc_testrun_find_dir_source: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/sdp-ldc -v --source \ +./bin/doc-reform-ldc -v --source \ --output-dir=tmp/program_output_dir ldc_testrun_find_dir_sisupod: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/sdp-ldc -v --sisupod \ +./bin/doc-reform-ldc -v --sisupod \ --output-dir=tmp/program_output_dir ldc_testrun_find_dir_html: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/sdp-ldc -v --html \ +./bin/doc-reform-ldc -v --html \ --output-dir=tmp/program_output_dir ldc_testrun_find_dir_epub: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/sdp-ldc -v --epub \ +./bin/doc-reform-ldc -v --epub \ --output-dir=tmp/program_output_dir ldc_testrun_find_dir_all: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/sdp-ldc -v --source --html --epub --sqlite-discrete \ +./bin/doc-reform-ldc -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_dir ldc_testrun_filelist_dir_source: - ./bin/sdp-ldc -v --source \ + ./bin/doc-reform-ldc -v --source \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) ldc_testrun_filelist_dir_sisupod: - ./bin/sdp-ldc -v --sisupod \ + ./bin/doc-reform-ldc -v --sisupod \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) ldc_testrun_filelist_dir_html: - ./bin/sdp-ldc -v --html \ + ./bin/doc-reform-ldc -v --html \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) ldc_testrun_filelist_dir_epub: - ./bin/sdp-ldc -v --epub \ + ./bin/doc-reform-ldc -v --epub \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) ldc_testrun_filelist_dir_all: - ./bin/sdp-ldc -v --source --html --epub --sqlite-discrete \ + ./bin/doc-reform-ldc -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) @@ -12,7 +12,7 @@ #+FILETAGS: :sdp:rel:makefile: #+TAGS: assert(a) class(c) debug(d) mixin(m) sdp(s) tangle(T) template(t) WEB(W) noexport(n) -[[./org/sdp.org][sdp.org]] [[./org/][org/]] +[[./org/doc_reform.org][doc_reform.org]] [[./org/][org/]] * makefile :makefile: ** settings [+2] :settings: @@ -32,7 +32,9 @@ DUB_FLAGS=-v --force --compiler= *** Project Details :project:sdp: #+BEGIN_SRC makefile :tangle makefile -PRG_NAME=sdp +PRG_NAME=doc-reform +PRG_NICKAME=rad +PRG_NAME_DIR=$(shell echo `echo $(PRG_NAME) | sed -e "s/-/_/g"`) PRG_SRC=$(PRG_NAME).d PRG_SRCDIR=./src PRG_BIN=$(PRG_NAME) @@ -230,16 +232,16 @@ all_debug_clean_ver: clean tangle dmd_debug_ver gdc_debug_ver ldc_debug_ver #+BEGIN_SRC makefile :tangle makefile dmd: - $(DUB) --compiler=dmd --config=sdp-dmd + $(DUB) --compiler=dmd --config=doc-reform-dmd #+END_SRC ******** version :version: #+BEGIN_SRC makefile :tangle makefile 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)' + $(DUB) --compiler=dmd --config=doc-reform-dmd-version + mv bin/doc-reform-dmd-ver bin/doc-reform-dmd-$(PROJECT_VERSION) + notify-send -t 0 'D dmd compiled test release executable ready' 'doc-reform-dmd-$(PROJECT_VERSION)' dmd_clean_ver: clean tangle dmd_ver #+END_SRC @@ -247,19 +249,19 @@ dmd_clean_ver: clean tangle dmd_ver #+BEGIN_SRC makefile :tangle makefile dmd_debug: - $(DUB) --compiler=dmd --config=sdp-dmd-debug + $(DUB) --compiler=dmd --config=doc-reform-dmd-debug #+END_SRC ******* clean & tangle :clean:tangle: #+BEGIN_SRC makefile :tangle makefile dmd_rel: expunge skel tangle - $(DUB) --compiler=dmd --config=sdp-release + $(DUB) --compiler=dmd --config=doc-reform-release dmd_rel_tangle: tangle - $(DUB) --compiler=dmd --config=sdp-dmd + $(DUB) --compiler=dmd --config=doc-reform-dmd dmd_rel_expunge_tangle: expunge skel tangle dmd_rel_tangle dmd_debug_tangle: tangle - $(DUB) --compiler=dmd --config=sdp-dmd-debug + $(DUB) --compiler=dmd --config=doc-reform-dmd-debug #+END_SRC ****** gdc :gdc: @@ -268,16 +270,16 @@ dmd_debug_tangle: tangle #+BEGIN_SRC makefile :tangle makefile gdc: - $(DUB) --compiler=gdc --config=sdp-gdc + $(DUB) --compiler=gdc --config=doc-reform-gdc #+END_SRC ******** version :version: #+BEGIN_SRC makefile :tangle makefile 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)' + $(DUB) --compiler=gdc --config=doc-reform-gdc-version + mv bin/doc-reform-gdc-ver bin/doc-reform-gdc-$(PROJECT_VERSION) + notify-send -t 0 'D gdc compiled test release executable ready' 'doc-reform-gdc-$(PROJECT_VERSION)' gdc_clean_ver: clean tangle gdc_ver #+END_SRC @@ -285,19 +287,19 @@ gdc_clean_ver: clean tangle gdc_ver #+BEGIN_SRC makefile :tangle makefile gdc_debug: - $(DUB) --compiler=gdc --config=sdp-gdc-debug + $(DUB) --compiler=gdc --config=doc-reform-gdc-debug #+END_SRC ******* clean & tangle :clean:tangle: #+BEGIN_SRC makefile :tangle makefile gdc_rel: expunge skel tangle - $(DUB) --compiler=gdc --config=sdp-release + $(DUB) --compiler=gdc --config=doc-reform-release gdc_rel_tangle: tangle - $(DUB) --compiler=gdc --config=sdp-gdc + $(DUB) --compiler=gdc --config=doc-reform-gdc gdc_rel_expunge_tangle: expunge skel tangle gdc_rel_tangle gdc_debug_tangle: tangle - $(DUB) --compiler=gdc --config=sdp-gdc-debug + $(DUB) --compiler=gdc --config=doc-reform-gdc-debug #+END_SRC ****** ldc :ldc: @@ -306,16 +308,16 @@ gdc_debug_tangle: tangle #+BEGIN_SRC makefile :tangle makefile ldc: - $(DUB) --compiler=ldc2 --config=sdp-ldc + $(DUB) --compiler=ldc2 --config=doc-reform-ldc #+END_SRC ******** version :version: #+BEGIN_SRC makefile :tangle makefile 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)' + $(DUB) --compiler=ldc2 --config=doc-reform-ldc-version + mv bin/doc-reform-ldc-ver bin/doc-reform-ldc-$(PROJECT_VERSION) + notify-send -t 0 'D ldc2 compiled test release executable ready' 'doc-reform-ldc-$(PROJECT_VERSION)' ldc_clean_ver: clean tangle ldc_ver #+END_SRC @@ -323,38 +325,40 @@ ldc_clean_ver: clean tangle ldc_ver #+BEGIN_SRC makefile :tangle makefile ldc_debug: - $(DUB) --compiler=ldc2 --config=sdp-ldc-debug + $(DUB) --compiler=ldc2 --config=doc-reform-ldc-debug #+END_SRC ******* clean & tangle :clean:tangle: #+BEGIN_SRC makefile :tangle makefile ldc_rel: expunge skel tangle - $(DUB) --compiler=ldc2 --config=sdp-release + $(DUB) --compiler=ldc2 --config=doc-reform-release ldc_rel_tangle: tangle - $(DUB) --compiler=ldc2 --config=sdp-ldc + $(DUB) --compiler=ldc2 --config=doc-reform-ldc ldc_rel_expunge_tangle: expunge skel tangle ldc_rel_tangle ldc_debug_tangle: tangle - $(DUB) --compiler=ldc2 --config=sdp-ldc-debug + $(DUB) --compiler=ldc2 --config=doc-reform-ldc-debug #+END_SRC ***** generic ****** init clean distclean etc. :clean: #+BEGIN_SRC makefile :tangle makefile +reinit: clean skel tangle skel: mkdir -p build; \ mkdir -p subprojects; \ - mkdir -p $(PRG_SRCDIR)/$(PRG_NAME)/conf; \ - mkdir -p $(PRG_SRCDIR)/$(PRG_NAME)/meta; \ - mkdir -p $(PRG_SRCDIR)/$(PRG_NAME)/output; \ - mkdir -p $(PRG_SRCDIR)/$(PRG_NAME)/share; \ - mkdir -p $(PRG_SRCDIR)/$(PRG_NAME)/source; \ - mkdir -p $(PRG_SRCDIR)/$(PRG_NAME); \ + mkdir -p $(PRG_SRCDIR)/$(PRG_NAME_DIR)/conf; \ + mkdir -p $(PRG_SRCDIR)/$(PRG_NAME_DIR)/meta; \ + mkdir -p $(PRG_SRCDIR)/$(PRG_NAME_DIR)/output; \ + mkdir -p $(PRG_SRCDIR)/$(PRG_NAME_DIR)/share; \ + mkdir -p $(PRG_SRCDIR)/$(PRG_NAME_DIR)/source; \ + mkdir -p $(PRG_SRCDIR)/$(PRG_NAME_DIR); \ mkdir -p $(PRG_BINDIR); init: skel clean: rm -rf build; \ + rm -rf subprojects; \ rm -rf $(PRG_SRCDIR); \ rm -rf $(PRG_DOCDIR); clean_bin: @@ -365,12 +369,14 @@ clean_docs: rm -rf $(PRG_DOCDIR) expunge: rm -f dub.selections.json; \ + rm -rf build; \ + rm -rf subprojects; \ rm -rf $(PRG_SRCDIR); \ rm -rf $(PRG_BINDIR); \ rm -rf $(PRG_DOCDIR); distclean: expunge distclean_and_init: expunge - mkdir -p $(PRG_SRCDIR)/$(PRG_NAME); \ + mkdir -p $(PRG_SRCDIR)/$(PRG_NAME_DIR); \ mkdir -p $(PRG_BINDIR); #+END_SRC @@ -378,7 +384,7 @@ distclean_and_init: expunge #+BEGIN_SRC makefile :tangle makefile ver: - echo sdp-$(PROJECT_VERSION) + echo doc-reform-$(PROJECT_VERSION) #+END_SRC ****** tangle build rebuild :clean:tangle:build: @@ -396,14 +402,6 @@ makefile_new: restart: clean tangle #+END_SRC -**** _meson_ build :meson: - -#+BEGIN_SRC makefile :tangle build/makefile -meson: - meson --buildtype=debugoptimized - ninja -#+END_SRC - *** testrun (program against document markup) **** pods ****** find files @@ -418,29 +416,29 @@ find_pods: #+BEGIN_SRC makefile :tangle makefile dmd_testrun_find: - ./bin/sdp-dmd -v --source --html --epub --sqlite-discrete \ + ./bin/doc-reform-dmd -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_pod \ data/sisupod/sisu-manual dmd_testrun_find_pod_source: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ -./bin/sdp-ldc -v --source --html --epub \ +./bin/doc-reform-ldc -v --source --html --epub \ --output-dir=tmp/program_output_pod dmd_testrun_find_pod_sisupod: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ -./bin/sdp-dmd -v --sisupod \ +./bin/doc-reform-dmd -v --sisupod \ --output-dir=tmp/program_output_pod dmd_testrun_find_pod_html: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ -./bin/sdp-dmd -v --html \ +./bin/doc-reform-dmd -v --html \ --output-dir=tmp/program_output_pod dmd_testrun_find_pod_epub: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ -./bin/sdp-dmd -v --epub \ +./bin/doc-reform-dmd -v --epub \ --output-dir=tmp/program_output_pod dmd_testrun_find_pod_all: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ -./bin/sdp-dmd -v --source --html --epub --sqlite-discrete \ +./bin/doc-reform-dmd -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_pod #+END_SRC @@ -449,23 +447,23 @@ dmd_testrun_find_pod_all: #+BEGIN_SRC makefile :tangle makefile dmd_testrun_paths_pod_source: - ./bin/sdp-dmd -v --source \ + ./bin/doc-reform-dmd -v --source \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) dmd_testrun_paths_pod_sisupod: - ./bin/sdp-dmd -v --sisupod \ + ./bin/doc-reform-dmd -v --sisupod \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) dmd_testrun_paths_pod_html: - ./bin/sdp-dmd -v --html \ + ./bin/doc-reform-dmd -v --html \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) dmd_testrun_paths_pod_epub: - ./bin/sdp-dmd -v --epub \ + ./bin/doc-reform-dmd -v --epub \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) dmd_testrun_paths_pod_all: - ./bin/sdp-dmd -v --source --html --epub --sqlite-discrete \ + ./bin/doc-reform-dmd -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) @@ -476,29 +474,29 @@ $(SiSU_MARKUP_SAMPLES_POD) #+BEGIN_SRC makefile :tangle makefile gdc_testrun_find: - ./bin/sdp-gdc -v --source --html --epub --sqlite-discrete \ + ./bin/doc-reform-gdc -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_pod \ data/sisupod/sisu-manual gdc_testrun_find_pod_source: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ -./bin/sdp-gdc -v --source \ +./bin/doc-reform-gdc -v --source \ --output-dir=tmp/program_output_pod gdc_testrun_find_pod_sisupod: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ -./bin/sdp-gdc -v --sisupod \ +./bin/doc-reform-gdc -v --sisupod \ --output-dir=tmp/program_output_pod gdc_testrun_find_pod_html: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ -./bin/sdp-gdc -v --html \ +./bin/doc-reform-gdc -v --html \ --output-dir=tmp/program_output_pod gdc_testrun_find_pod_epub: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ -./bin/sdp-gdc -v --epub \ +./bin/doc-reform-gdc -v --epub \ --output-dir=tmp/program_output_pod gdc_testrun_find_pod_all: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ -./bin/sdp-gdc -v --source --html --epub --sqlite-discrete \ +./bin/doc-reform-gdc -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_pod #+END_SRC @@ -507,28 +505,28 @@ gdc_testrun_find_pod_all: #+BEGIN_SRC makefile :tangle makefile gdc_testrun_paths: - ./bin/sdp-gdc -v --source --html --epub --sqlite-discrete \ + ./bin/doc-reform-gdc -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_pod \ data/sisupod/sisu-manual gdc_testrun_paths_pod_source: - ./bin/sdp-gdc -v --source \ + ./bin/doc-reform-gdc -v --source \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) gdc_testrun_paths_pod_sisupod: - ./bin/sdp-gdc -v --sisupod \ + ./bin/doc-reform-gdc -v --sisupod \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) gdc_testrun_paths_pod_html: - ./bin/sdp-gdc -v --html \ + ./bin/doc-reform-gdc -v --html \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) gdc_testrun_paths_pod_epub: - ./bin/sdp-gdc -v --epub \ + ./bin/doc-reform-gdc -v --epub \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) gdc_testrun_paths_pod_all: - ./bin/sdp-gdc -v --source --html --epub --sqlite-discrete \ + ./bin/doc-reform-gdc -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) @@ -539,29 +537,29 @@ $(SiSU_MARKUP_SAMPLES_POD) #+BEGIN_SRC makefile :tangle makefile ldc_testrun_find: - ./bin/sdp-ldc -v --source --html --epub --sqlite-discrete \ + ./bin/doc-reform-ldc -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_pod \ data/sisupod/sisu-manual ldc_testrun_find_pod_source: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ - ./bin/sdp-ldc -v --source \ + ./bin/doc-reform-ldc -v --source \ --output-dir=tmp/program_output_pod ldc_testrun_find_pod_sisupod: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ - ./bin/sdp-ldc -v --sisupod \ + ./bin/doc-reform-ldc -v --sisupod \ --output-dir=tmp/program_output_pod ldc_testrun_find_pod_html: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ - ./bin/sdp-ldc -v --html \ + ./bin/doc-reform-ldc -v --html \ --output-dir=tmp/program_output_pod ldc_testrun_find_pod_epub: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ - ./bin/sdp-ldc -v --epub \ + ./bin/doc-reform-ldc -v --epub \ --output-dir=tmp/program_output_pod ldc_testrun_find_pod_all: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ - ./bin/sdp-ldc -v --source --html --epub --sqlite-discrete \ + ./bin/doc-reform-ldc -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_pod #+END_SRC @@ -570,28 +568,28 @@ ldc_testrun_find_pod_all: #+BEGIN_SRC makefile :tangle makefile ldc_testrun_paths: - ./bin/sdp-ldc -v --source --html --epub --sqlite-discrete \ + ./bin/doc-reform-ldc -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_pod \ data/sisupod/sisu-manual ldc_testrun_paths_pod_source: - ./bin/sdp-ldc -v --source \ + ./bin/doc-reform-ldc -v --source \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) ldc_testrun_paths_pod_sisupod: - ./bin/sdp-ldc -v --sisupod \ + ./bin/doc-reform-ldc -v --sisupod \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) ldc_testrun_paths_pod_html: - ./bin/sdp-ldc -v --html \ + ./bin/doc-reform-ldc -v --html \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) ldc_testrun_paths_pod_epub: - ./bin/sdp-ldc -v --epub \ + ./bin/doc-reform-ldc -v --epub \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) ldc_testrun_paths_pod_all: - ./bin/sdp-ldc -v --source --html --epub --sqlite-discrete \ + ./bin/doc-reform-ldc -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) @@ -604,23 +602,23 @@ $(SiSU_MARKUP_SAMPLES_POD) #+BEGIN_SRC makefile :tangle makefile dmd_testrun_find_dir_source: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/sdp-dmd -v --source \ +./bin/doc-reform-dmd -v --source \ --output-dir=tmp/program_output_dir dmd_testrun_find_dir_sisupod: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/sdp-dmd -v --sisupod \ +./bin/doc-reform-dmd -v --sisupod \ --output-dir=tmp/program_output_dir dmd_testrun_find_dir_html: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/sdp-dmd -v --html \ +./bin/doc-reform-dmd -v --html \ --output-dir=tmp/program_output_dir dmd_testrun_find_dir_epub: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/sdp-dmd -v --epub \ +./bin/doc-reform-dmd -v --epub \ --output-dir=tmp/program_output_dir dmd_testrun_find_dir_all: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/sdp-dmd -v --source --html --epub --sqlite-discrete \ +./bin/doc-reform-dmd -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_dir #+END_SRC @@ -629,23 +627,23 @@ dmd_testrun_find_dir_all: #+BEGIN_SRC makefile :tangle makefile dmd_testrun_filelist_dir_source: - ./bin/sdp-dmd -v --source \ + ./bin/doc-reform-dmd -v --source \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) dmd_testrun_filelist_dir_sisupod: - ./bin/sdp-dmd -v --sisupod \ + ./bin/doc-reform-dmd -v --sisupod \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) dmd_testrun_filelist_dir_html: - ./bin/sdp-dmd -v --html \ + ./bin/doc-reform-dmd -v --html \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) dmd_testrun_filelist_dir_epub: - ./bin/sdp-dmd -v --epub \ + ./bin/doc-reform-dmd -v --epub \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) dmd_testrun_filelist_dir_all: - ./bin/sdp-dmd -v --source --html --epub --sqlite-discrete \ + ./bin/doc-reform-dmd -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) @@ -656,24 +654,24 @@ $(SiSU_MARKUP_SAMPLES_DIR) #+BEGIN_SRC makefile :tangle makefile gdc_testrun_find_dir_source: - ./bin/sdp-gdc -v --source \ + ./bin/doc-reform-gdc -v --source \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) gdc_testrun_find_dir_sisupod: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/sdp-gdc -v --sisupod \ +./bin/doc-reform-gdc -v --sisupod \ --output-dir=tmp/program_output_dir gdc_testrun_find_dir_html: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/sdp-gdc -v --html \ +./bin/doc-reform-gdc -v --html \ --output-dir=tmp/program_output_dir gdc_testrun_find_dir_epub: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/sdp-gdc -v --epub \ +./bin/doc-reform-gdc -v --epub \ --output-dir=tmp/program_output_dir gdc_testrun_find_dir_all: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/sdp-gdc -v --source --html --epub --sqlite-discrete \ +./bin/doc-reform-gdc -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_dir #+END_SRC @@ -682,23 +680,23 @@ gdc_testrun_find_dir_all: #+BEGIN_SRC makefile :tangle makefile gdc_testrun_filelist_dir_source: - ./bin/sdp-gdc -v --source \ + ./bin/doc-reform-gdc -v --source \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) gdc_testrun_filelist_dir_sisupod: - ./bin/sdp-gdc -v --sisupod \ + ./bin/doc-reform-gdc -v --sisupod \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) gdc_testrun_filelist_dir_html: - ./bin/sdp-gdc -v --html \ + ./bin/doc-reform-gdc -v --html \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) gdc_testrun_filelist_dir_epub: - ./bin/sdp-gdc -v --epub \ + ./bin/doc-reform-gdc -v --epub \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) gdc_testrun_filelist_dir_all: - ./bin/sdp-gdc -v --source --html --epub --sqlite-discrete \ + ./bin/doc-reform-gdc -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) @@ -710,23 +708,23 @@ $(SiSU_MARKUP_SAMPLES_DIR) #+BEGIN_SRC makefile :tangle makefile ldc_testrun_find_dir_source: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/sdp-ldc -v --source \ +./bin/doc-reform-ldc -v --source \ --output-dir=tmp/program_output_dir ldc_testrun_find_dir_sisupod: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/sdp-ldc -v --sisupod \ +./bin/doc-reform-ldc -v --sisupod \ --output-dir=tmp/program_output_dir ldc_testrun_find_dir_html: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/sdp-ldc -v --html \ +./bin/doc-reform-ldc -v --html \ --output-dir=tmp/program_output_dir ldc_testrun_find_dir_epub: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/sdp-ldc -v --epub \ +./bin/doc-reform-ldc -v --epub \ --output-dir=tmp/program_output_dir ldc_testrun_find_dir_all: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/sdp-ldc -v --source --html --epub --sqlite-discrete \ +./bin/doc-reform-ldc -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_dir #+END_SRC @@ -735,23 +733,23 @@ ldc_testrun_find_dir_all: #+BEGIN_SRC makefile :tangle makefile ldc_testrun_filelist_dir_source: - ./bin/sdp-ldc -v --source \ + ./bin/doc-reform-ldc -v --source \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) ldc_testrun_filelist_dir_sisupod: - ./bin/sdp-ldc -v --sisupod \ + ./bin/doc-reform-ldc -v --sisupod \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) ldc_testrun_filelist_dir_html: - ./bin/sdp-ldc -v --html \ + ./bin/doc-reform-ldc -v --html \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) ldc_testrun_filelist_dir_epub: - ./bin/sdp-ldc -v --epub \ + ./bin/doc-reform-ldc -v --epub \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) ldc_testrun_filelist_dir_all: - ./bin/sdp-ldc -v --source --html --epub --sqlite-discrete \ + ./bin/doc-reform-ldc -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) @@ -824,14 +822,14 @@ Every DUB package should contain a [[http://code.dlang.org/package-format?lang=j ** header (including dependencies) :header: #+BEGIN_SRC sh :tangle dub.sdl -name "sdp" +name "doc-reform" description "sisu document parser" homepage "http://sisudoc.org" authors "Ralph Amissah" copyright "Copyright © 2016 Ralph Amissah" license "AGPL-3+" targetPath "./bin" -#sourcePath "./src/sdp" +#sourcePath "./src/doc_reform" stringImportPaths "./views" buildRequirements "allowWarnings" dependency "archive" version="~>0.6.0" # http://code.dlang.org/packages/archive https://github.com/rcythr/archive @@ -850,211 +848,211 @@ configuration "build" { name "build" targetType "executable" platforms "posix" - targetName "bin/sdp" - dflags "-J=views" "-I=src/sdp" + targetName "bin/doc-reform" + dflags "-J=views" "-I=src/doc_reform" buildOptions "verbose" "releaseMode" "optimize" "inline" - postGenerateCommands "/usr/bin/notify-send -t 0 'D release executable ready' 'sdp'" + postGenerateCommands "/usr/bin/notify-send -t 0 'D release executable ready' 'doc-reform'" } #+END_SRC -*** sdp-release (sdp) :release: +*** doc-reform-release (sdp) :release: #+BEGIN_SRC sh :tangle dub.sdl -configuration "sdp-release" { +configuration "doc-reform-release" { name "release" targetType "executable" platforms "posix" - targetName "sdp" - dflags "-J=views" "-I=src/sdp" + targetName "doc-reform" + dflags "-J=views" "-I=src/doc_reform" buildOptions "verbose" "releaseMode" "optimize" "inline" - postGenerateCommands "/usr/bin/notify-send -t 0 'D release executable ready' 'sdp'" + postGenerateCommands "/usr/bin/notify-send -t 0 'D release executable ready' 'doc-reform'" } #+END_SRC ** dmd :dmd: -*** sdp-dmd +*** doc-reform-dmd #+BEGIN_SRC sh :tangle dub.sdl -configuration "sdp-dmd" { +configuration "doc-reform-dmd" { name "dmd" targetType "executable" platforms "posix" - targetName "sdp-dmd" - dflags "-J=views" "-I=src/sdp" + targetName "doc-reform-dmd" + dflags "-J=views" "-I=src/doc_reform" buildRequirements "allowWarnings" buildOptions "verbose" "inline" # "optimize" # "releaseMode" - postGenerateCommands "/usr/bin/notify-send -t 0 'D dmd compiled test release executable ready' 'sdp-dmd'" + postGenerateCommands "/usr/bin/notify-send -t 0 'D dmd compiled test release executable ready' 'doc-reform-dmd'" } #+END_SRC -*** sdp-dmd-version +*** doc-reform-dmd-version #+BEGIN_SRC sh :tangle dub.sdl -configuration "sdp-dmd-version" { +configuration "doc-reform-dmd-version" { name "dmd" targetType "executable" platforms "posix" - targetName "sdp-dmd-ver" - dflags "-J=views" "-I=src/sdp" + targetName "doc-reform-dmd-ver" + dflags "-J=views" "-I=src/doc_reform" buildRequirements "allowWarnings" buildOptions "verbose" "optimize" "inline" # "releaseMode" } #+END_SRC -*** sdp-dmd-release +*** doc-reform-dmd-release #+BEGIN_SRC sh :tangle dub.sdl -configuration "sdp-dmd-release" { +configuration "doc-reform-dmd-release" { name "dmd" targetType "executable" platforms "posix" - targetName "sdp-dmd" - dflags "-J=views" "-I=src/sdp" + targetName "doc-reform-dmd" + dflags "-J=views" "-I=src/doc_reform" buildRequirements "allowWarnings" buildOptions "verbose" "optimize" "inline" "releaseMode" - postGenerateCommands "/usr/bin/notify-send -t 0 'D dmd compiled test release executable ready' 'sdp-dmd'" + postGenerateCommands "/usr/bin/notify-send -t 0 'D dmd compiled test release executable ready' 'doc-reform-dmd'" } #+END_SRC -*** sdp-dmd-debug +*** doc-reform-dmd-debug #+BEGIN_SRC sh :tangle dub.sdl -configuration "sdp-dmd-debug" { +configuration "doc-reform-dmd-debug" { name "debuging" targetType "executable" platforms "posix" - targetName "sdp-dmd-debug" - dflags "-g" "-J=views" "-I=src/sdp" + targetName "doc-reform-dmd-debug" + dflags "-J=views" "-I=src/doc_reform" 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'" + postGenerateCommands "/usr/bin/notify-send -t 0 'D (debug) executable ready' 'doc-reform-dmd-debug'" } #+END_SRC ** ldc :ldc: -*** sdp-ldc +*** doc-reform-ldc #+BEGIN_SRC sh :tangle dub.sdl -configuration "sdp-ldc" { +configuration "doc-reform-ldc" { name "ldc" targetType "executable" platforms "posix" - targetName "sdp-ldc" - dflags "-O2" "-J=views" "-I=src/sdp" + targetName "doc-reform-ldc" + dflags "-O2" "-J=views" "-I=src/doc_reform" buildRequirements "allowWarnings" buildOptions "verbose" "optimize" "inline" # "releaseMode" - postGenerateCommands "/usr/bin/notify-send -t 0 'D ldc2 compiled test release executable ready' 'sdp-ldc'" + postGenerateCommands "/usr/bin/notify-send -t 0 'D ldc2 compiled test release executable ready' 'doc-reform-ldc'" } #+END_SRC -*** sdp-ldc-version +*** doc-reform-ldc-version #+BEGIN_SRC sh :tangle dub.sdl -configuration "sdp-ldc-version" { +configuration "doc-reform-ldc-version" { name "ldc" targetType "executable" platforms "posix" - targetName "sdp-ldc-ver" - dflags "-O2" "-J=views" "-I=src/sdp" + targetName "doc-reform-ldc-ver" + dflags "-O2" "-J=views" "-I=src/doc_reform" buildRequirements "allowWarnings" buildOptions "verbose" "optimize" "inline" # "releaseMode" } #+END_SRC -*** sdp-ldc-release +*** doc-reform-ldc-release #+BEGIN_SRC sh :tangle dub.sdl -configuration "sdp-ldc-release" { +configuration "doc-reform-ldc-release" { name "ldc" targetType "executable" platforms "posix" - targetName "sdp-ldc" - dflags "-O2" "-J=views" "-I=src/sdp" + targetName "doc-reform-ldc" + dflags "-O2" "-J=views" "-I=src/doc_reform" buildRequirements "allowWarnings" buildOptions "verbose" "optimize" "inline" "releaseMode" - postGenerateCommands "/usr/bin/notify-send -t 0 'D ldc2 compiled test release executable ready' 'sdp-ldc'" + postGenerateCommands "/usr/bin/notify-send -t 0 'D ldc2 compiled test release executable ready' 'doc-reform-ldc'" } #+END_SRC -*** sdp-ldc-debug +*** doc-reform-ldc-debug #+BEGIN_SRC sh :tangle dub.sdl -configuration "sdp-ldc-debug" { +configuration "doc-reform-ldc-debug" { name "debuging" targetType "executable" platforms "posix" - targetName "sdp-ldc-debug" - dflags "-g" "-J=views" "-I=src/sdp" + targetName "doc-reform-ldc-debug" + dflags "-J=views" "-I=src/doc_reform" buildRequirements "allowWarnings" buildOptions "verbose" "debugMode" "debugInfo" "optimize" debugVersions "checkdoc" "summary" - postGenerateCommands "/usr/bin/notify-send -t 0 'D (debug) executable ready' 'sdp-ldc-debug'" + postGenerateCommands "/usr/bin/notify-send -t 0 'D (debug) executable ready' 'doc-reform-ldc-debug'" } #+END_SRC ** gdc :gdc: -*** sdp-gdc +*** doc-reform-gdc #+BEGIN_SRC sh :tangle dub.sdl -configuration "sdp-gdc" { +configuration "doc-reform-gdc" { name "gdc" targetType "executable" platforms "posix" - targetName "sdp-gdc" - dflags "-O2" "-J=views" "-I=src/sdp" + targetName "doc-reform-gdc" + dflags "-O2" "-J=views" "-I=src/doc_reform" lflags "-lz" buildRequirements "allowWarnings" - buildOptions "verbose" "optimize" "inline" # "releaseMode" - postGenerateCommands "/usr/bin/notify-send -t 0 'D gdc compiled test release executable ready' 'sdp-gdc'" + buildOptions "optimize" "inline" # "releaseMode" + postGenerateCommands "/usr/bin/notify-send -t 0 'D gdc compiled test release executable ready' 'doc-reform-gdc'" } #+END_SRC -*** sdp-gdc-version +*** doc-reform-gdc-version #+BEGIN_SRC sh :tangle dub.sdl -configuration "sdp-gdc-version" { +configuration "doc-reform-gdc-version" { name "gdc" targetType "executable" platforms "posix" - targetName "sdp-gdc-ver" - dflags "-O2" "-J=views" "-I=src/sdp" + targetName "doc-reform-gdc-ver" + dflags "-O2" "-J=views" "-I=src/doc_reform" lflags "-lz" buildRequirements "allowWarnings" buildOptions "verbose" "optimize" "inline" # "releaseMode" } #+END_SRC -*** sdp-gdc-release +*** doc-reform-gdc-release #+BEGIN_SRC sh :tangle dub.sdl -configuration "sdp-gdc-release" { +configuration "doc-reform-gdc-release" { name "gdc" targetType "executable" platforms "posix" - targetName "sdp-gdc" - dflags "-O2" "-J=views" "-I=src/sdp" + targetName "doc-reform-gdc" + dflags "-O2" "-J=views" "-I=src/doc_reform" lflags "-lz" buildRequirements "allowWarnings" buildOptions "verbose" "optimize" "inline" "releaseMode" - postGenerateCommands "/usr/bin/notify-send -t 0 'D gdc compiled test release executable ready' 'sdp-gdc'" + postGenerateCommands "/usr/bin/notify-send -t 0 'D gdc compiled test release executable ready' 'doc-reform-gdc'" } #+END_SRC -*** sdp-gdc-debug +*** doc-reform-gdc-debug #+BEGIN_SRC sh :tangle dub.sdl -configuration "sdp-gdc-debug" { +configuration "doc-reform-gdc-debug" { name "debuging" targetType "executable" platforms "posix" - targetName "sdp-gdc-debug" - dflags "-O2" "-fbuiltin" "-Wall" "-Werror" "-Wformat=2" "-g" "-J=views" "-I=src/sdp" + targetName "doc-reform-gdc-debug" + dflags "-O2" "-fbuiltin" "-Wall" "-Werror" "-Wformat=2" "-g" "-J=views" "-I=src/doc_reform" lflags "-lz" buildOptions "verbose" "debugMode" "debugInfo" "optimize" debugVersions "checkdoc" "summary" - postGenerateCommands "/usr/bin/notify-send -t 0 'D gdc compiled (debug with -g) executable ready' 'sdp-gdc-debug'" + postGenerateCommands "/usr/bin/notify-send -t 0 'D gdc compiled (debug with -g) executable ready' 'doc-reform-gdc-debug'" } #+END_SRC @@ -1084,42 +1082,39 @@ http://mesonbuild.com/Dependencies.html#Dub ** * projects #+BEGIN_SRC sh :tangle meson.build -project('sdp', 'd', +project('doc-reform', 'd', license: 'GPL3', version: '0.26.5', meson_version: '>=0.46' ) -#if meson.get_compiler('d').get_id() == 'gcc' -# error('sdp cannot be compiled with GDC at time. Sorry.') -#endif -sdp_sources = [ 'src/sdp/sdp.d', - 'src/sdp/conf/compile_time_info.d', - 'src/sdp/meta/conf_make_meta_json.d', - 'src/sdp/meta/conf_make_meta_structs.d', - 'src/sdp/meta/conf_make_meta_toml.d', - 'src/sdp/meta/defaults.d', - 'src/sdp/meta/doc_debugs.d', - 'src/sdp/meta/metadoc.d', - 'src/sdp/meta/metadoc_from_src.d', - 'src/sdp/meta/metadoc_summary.d', - 'src/sdp/meta/object_setter.d', - 'src/sdp/meta/package.d', - 'src/sdp/meta/rgx.d', - 'src/sdp/output/create_zip_file.d', - 'src/sdp/output/defaults.d', - 'src/sdp/output/epub3.d', - 'src/sdp/output/html.d', - 'src/sdp/output/hub.d', - 'src/sdp/output/package.d', - 'src/sdp/output/paths_output.d', - 'src/sdp/output/rgx.d', - 'src/sdp/output/source_sisupod.d', - 'src/sdp/output/sqlite.d', - 'src/sdp/output/xmls_css.d', - 'src/sdp/output/xmls.d', - 'src/sdp/source/paths_source.d', - 'src/sdp/source/read_config_files.d', - 'src/sdp/source/read_source_files.d', +doc_reform_sources = [ 'src/doc_reform/doc_reform.d', + 'src/doc_reform/conf/compile_time_info.d', + 'src/doc_reform/meta/conf_make_meta_json.d', + 'src/doc_reform/meta/conf_make_meta_structs.d', + 'src/doc_reform/meta/conf_make_meta_toml.d', + 'src/doc_reform/meta/defaults.d', + 'src/doc_reform/meta/doc_debugs.d', + 'src/doc_reform/meta/metadoc.d', + 'src/doc_reform/meta/metadoc_from_src.d', + 'src/doc_reform/meta/metadoc_summary.d', + 'src/doc_reform/meta/object_setter.d', + 'src/doc_reform/meta/package.d', + 'src/doc_reform/meta/rgx.d', + 'src/doc_reform/output/create_zip_file.d', + 'src/doc_reform/output/defaults.d', + 'src/doc_reform/output/epub3.d', + 'src/doc_reform/output/html.d', + 'src/doc_reform/output/hub.d', + 'src/doc_reform/output/package.d', + 'src/doc_reform/output/paths_output.d', + 'src/doc_reform/output/rgx.d', + 'src/doc_reform/output/source_sisupod.d', + 'src/doc_reform/output/sqlite.d', + 'src/doc_reform/output/xmls_css.d', + 'src/doc_reform/output/xmls.d', + 'src/doc_reform/source/paths_source.d', + 'src/doc_reform/source/read_config_files.d', + 'src/doc_reform/source/read_source_files.d', ] source_root = meson.source_root() sources_dir = include_directories('src/') @@ -1128,9 +1123,9 @@ dep_archive = dependency('archive', version: '>= 0.6.0', fallback: dep_d2sqlite3 = dependency('d2sqlite3', version: '>= 0.16.2', fallback: ['d2sqlite3', 'd2sqlite3_dep']) dep_imageformats = dependency('imageformats-d', version: '>= 7.0.0', fallback: ['imageformats-d', 'imageformats_dep']) dep_toml = dependency('toml-d', version: '>= 1.0.0', fallback: ['toml-d', 'toml_dep']) -# executable -sdp_exe = executable('sdp', - [sdp_sources], +# Executable +doc_reform_exe = executable('rad', + [doc_reform_sources], include_directories : [sources_dir], d_import_dirs: [include_directories('views')], dependencies : [ @@ -1179,12 +1174,12 @@ toml - https://github.com/ximion/toml.git #+END_SRC -*** toml-d +*** archived -#+BEGIN_SRC sh :tangle subprojects/toml-d.wrap +#+BEGIN_SRC sh :tangle subprojects/archived.wrap [wrap-git] -directory = toml-d -url = https://github.com/ximion/toml.git +directory = archived +url = https://github.com/ximion/archive.git revision = head #+END_SRC @@ -1197,21 +1192,21 @@ url = https://github.com/ximion/d2sqlite3.git revision = head #+END_SRC -*** archived +*** imageformats-d -#+BEGIN_SRC sh :tangle subprojects/archived.wrap +#+BEGIN_SRC sh :tangle subprojects/imageformats-d.wrap [wrap-git] -directory = archived -url = https://github.com/ximion/archive.git +directory = imageformats-d +url = https://github.com/ximion/imageformats.git revision = head #+END_SRC -*** imageformats-d +*** toml-d -#+BEGIN_SRC sh :tangle subprojects/imageformats-d.wrap +#+BEGIN_SRC sh :tangle subprojects/toml-d.wrap [wrap-git] -directory = imageformats-d -url = https://github.com/ximion/imageformats.git +directory = toml-d +url = https://github.com/ximion/toml.git revision = head #+END_SRC @@ -1234,8 +1229,8 @@ revision = head !conf.sdl !org !src -!src/sdp -!src/sdp/* +!src/doc_reform +!src/doc_reform/* !data !data/* !data/sisupod/** @@ -1273,7 +1268,7 @@ tmp/** * 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/ +babel tangle) org files in ./org/ to create .d source files in ./src/doc_reform/ (similar functionality is contained within the "makefile" created by this "maker.org" file make tangle) @@ -1313,16 +1308,16 @@ 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=dmd --config=doc-reform-dmd --debug=steps) +time (dub --compiler=ldc2 --config=doc-reform-ldc --debug=steps) +time (dub --compiler=gdc --config=doc-reform-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 --debug=io) -time (dub --compiler=gdc --config=sdp-gdc-debug --debug=io) -time (dub --compiler=dmd --config=sdp-dmd-debug --debug=io) +time (dub --compiler=ldc2 --config=doc-reform-ldc --debug=checkdoc --debug=summary --debug=dumpdoc) +time (dub --compiler=ldc2 --config=doc-reform-ldc --debug=io) +time (dub --compiler=ldc2 --config=doc-reform-ldc --debug=checkdoc --debug=summary --debug=dumpdoc --debug=io) +time (dub --compiler=ldc2 --config=doc-reform-ldc-debug --debug=io) +time (dub --compiler=gdc --config=doc-reform-gdc-debug --debug=io) +time (dub --compiler=dmd --config=doc-reform-dmd-debug --debug=io) #+END_SRC *** make @@ -1373,27 +1368,27 @@ 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/sisupod/sisu-manual/media/text/en/sisu_markup.sst ) +time (./bin/doc-reform-ldc --source --html -v --output-dir=tmp/program-output data/sisupod/sisu-manual/media/text/en/sisu_markup.sst ) -time (./bin/sdp-ldc --source --html -v --output-dir=tmp/program-output data/sisupod/sisu-manual ) -time (./bin/sdp-ldc --source --html -v --output-dir=tmp/program-output data/sisupod/the_wealth_of_networks.yochai_benkler ) -time (./bin/sdp-ldc --source --html -v --output-dir=tmp/program-output data/sisupod/live-manual ) +time (./bin/doc-reform-ldc --source --html -v --output-dir=tmp/program-output data/sisupod/sisu-manual ) +time (./bin/doc-reform-ldc --source --html -v --output-dir=tmp/program-output data/sisupod/the_wealth_of_networks.yochai_benkler ) +time (./bin/doc-reform-ldc --source --html -v --output-dir=tmp/program-output data/sisupod/live-manual ) -time (~sdp2/bin/sdp-ldc --sisupod --source --html --epub --sqlite-create --sqlite-update -v sisudoc/media/text/en/sisu_markup_stress_test.sst sisudoc/media/text/en/the_wealth_of_networks.yochai_benkler.sst ) +time (~sdp2/bin/doc-reform-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) +time (~sdp2/bin/doc-reform-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 (~sdp2/bin/doc-reform-ldc --html --lang=en,es -v sisudoc) -time ( find data/sisupod -name sisupod.manifest | sort | xargs ./bin/sdp-ldc --source --html --epub -v --output-dir=tmp/program-output ) +time ( find data/sisupod -name sisupod.manifest | sort | xargs ./bin/doc-reform-ldc --source --html --epub -v --output-dir=tmp/program-output ) -time ( find data/sisupod -maxdepth 2 -name sisupod.manifest | sort | xargs ./bin/sdp-ldc --source --html --epub -v --output-dir=tmp/program-output ) -time ( find data/sisudir/media/text -name *.ss[tm] | sort | xargs ./bin/sdp-ldc --source --html --epub -v --output-dir=tmp/program-output ) +time ( find data/sisupod -maxdepth 2 -name sisupod.manifest | sort | xargs ./bin/doc-reform-ldc --source --html --epub -v --output-dir=tmp/program-output ) +time ( find data/sisudir/media/text -name *.ss[tm] | sort | xargs ./bin/doc-reform-ldc --source --html --epub -v --output-dir=tmp/program-output ) find data/sisupod -maxdepth 2 -name sisupod.manifest | sort | xargs @@ -1442,7 +1437,7 @@ dub fetch taggedalgebraic dub fetch libinputvisitor dub fetch unit-threaded ? -sdp ~master: /home/ralph/grotto/repo/git.repo/utils/sdp-x/ +sdp ~master: /home/ralph/grotto/repo/git.repo/utils/doc-reform-x/ /home/ralph/.dub/packages/* **** build diff --git a/meson.build b/meson.build index 7588167..14e3353 100644 --- a/meson.build +++ b/meson.build @@ -1,39 +1,36 @@ -project('sdp', 'd', +project('doc-reform', 'd', license: 'GPL3', version: '0.26.5', meson_version: '>=0.46' ) -#if meson.get_compiler('d').get_id() == 'gcc' -# error('sdp cannot be compiled with GDC at time. Sorry.') -#endif -sdp_sources = [ 'src/sdp/sdp.d', - 'src/sdp/conf/compile_time_info.d', - 'src/sdp/meta/conf_make_meta_json.d', - 'src/sdp/meta/conf_make_meta_structs.d', - 'src/sdp/meta/conf_make_meta_toml.d', - 'src/sdp/meta/defaults.d', - 'src/sdp/meta/doc_debugs.d', - 'src/sdp/meta/metadoc.d', - 'src/sdp/meta/metadoc_from_src.d', - 'src/sdp/meta/metadoc_summary.d', - 'src/sdp/meta/object_setter.d', - 'src/sdp/meta/package.d', - 'src/sdp/meta/rgx.d', - 'src/sdp/output/create_zip_file.d', - 'src/sdp/output/defaults.d', - 'src/sdp/output/epub3.d', - 'src/sdp/output/html.d', - 'src/sdp/output/hub.d', - 'src/sdp/output/package.d', - 'src/sdp/output/paths_output.d', - 'src/sdp/output/rgx.d', - 'src/sdp/output/source_sisupod.d', - 'src/sdp/output/sqlite.d', - 'src/sdp/output/xmls_css.d', - 'src/sdp/output/xmls.d', - 'src/sdp/source/paths_source.d', - 'src/sdp/source/read_config_files.d', - 'src/sdp/source/read_source_files.d', +doc_reform_sources = [ 'src/doc_reform/doc_reform.d', + 'src/doc_reform/conf/compile_time_info.d', + 'src/doc_reform/meta/conf_make_meta_json.d', + 'src/doc_reform/meta/conf_make_meta_structs.d', + 'src/doc_reform/meta/conf_make_meta_toml.d', + 'src/doc_reform/meta/defaults.d', + 'src/doc_reform/meta/doc_debugs.d', + 'src/doc_reform/meta/metadoc.d', + 'src/doc_reform/meta/metadoc_from_src.d', + 'src/doc_reform/meta/metadoc_summary.d', + 'src/doc_reform/meta/object_setter.d', + 'src/doc_reform/meta/package.d', + 'src/doc_reform/meta/rgx.d', + 'src/doc_reform/output/create_zip_file.d', + 'src/doc_reform/output/defaults.d', + 'src/doc_reform/output/epub3.d', + 'src/doc_reform/output/html.d', + 'src/doc_reform/output/hub.d', + 'src/doc_reform/output/package.d', + 'src/doc_reform/output/paths_output.d', + 'src/doc_reform/output/rgx.d', + 'src/doc_reform/output/source_sisupod.d', + 'src/doc_reform/output/sqlite.d', + 'src/doc_reform/output/xmls_css.d', + 'src/doc_reform/output/xmls.d', + 'src/doc_reform/source/paths_source.d', + 'src/doc_reform/source/read_config_files.d', + 'src/doc_reform/source/read_source_files.d', ] source_root = meson.source_root() sources_dir = include_directories('src/') @@ -42,9 +39,9 @@ dep_archive = dependency('archive', version: '>= 0.6.0', fallback: dep_d2sqlite3 = dependency('d2sqlite3', version: '>= 0.16.2', fallback: ['d2sqlite3', 'd2sqlite3_dep']) dep_imageformats = dependency('imageformats-d', version: '>= 7.0.0', fallback: ['imageformats-d', 'imageformats_dep']) dep_toml = dependency('toml-d', version: '>= 1.0.0', fallback: ['toml-d', 'toml_dep']) -# executable -sdp_exe = executable('sdp', - [sdp_sources], +# Executable +doc_reform_exe = executable('rad', + [doc_reform_sources], include_directories : [sources_dir], d_import_dirs: [include_directories('views')], dependencies : [ diff --git a/org/compile_time_info.org b/org/compile_time_info.org index 281bfe1..49702a2 100644 --- a/org/compile_time_info.org +++ b/org/compile_time_info.org @@ -1,8 +1,8 @@ -#+TITLE: sdp compile time info +#+TITLE: doc_reform compile time info +#+DESCRIPTION: documents - structuring, publishing in multiple formats & search +#+FILETAGS: :doc_reform:compile: #+AUTHOR: Ralph Amissah #+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] -#+DESCRIPTION: documents - structuring, publishing in multiple formats & search -#+KEYWORDS #+LANGUAGE: en #+STARTUP: indent content #+OPTIONS: H:3 num:nil toc:t \n:nil @:t ::t |:t ^:nil _:nil -:t f:t *:t <:t @@ -11,26 +11,25 @@ #+PROPERTY: header-args :padline no :exports code :noweb yes #+EXPORT_SELECT_TAGS: export #+EXPORT_EXCLUDE_TAGS: noexport -#+FILETAGS: :sdp:niu:compile:info: -#+TAGS: assert(a) class(c) debug(d) mixin(m) sdp(s) tangle(T) template(t) WEB(W) noexport(n) +#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n) -[[./sdp.org][sdp]] [[./][org/]] -* compilation info :module:sdp:compile_time_info: +[[./doc_reform.org][doc_reform]] [[./][org/]] +* compilation info :module:doc_reform:compile_time_info: [[../maker.org][maker.org makefile]] -[[./sdp.org][sdp hub]] [[./][org/]] +[[./doc_reform.org][doc_reform hub]] [[./][org/]] e.g. do on linux bsd osx not windows: version(Windows) {} else { ... } ** 0. module template -#+begin_src d :tangle ../src/sdp/conf/compile_time_info.d +#+begin_src d :tangle ../src/doc_reform/conf/compile_time_info.d /++ compile_time_info +/ -module sdp.conf.compile_time_info; +module doc_reform.conf.compile_time_info; template CompileTimeInfo() { - <<sdp_compile_time_info>> + <<doc_reform_compile_time_info>> } #+end_src @@ -39,7 +38,7 @@ OS type shows during compilation *** set os flags -#+name: sdp_compile_time_info +#+name: doc_reform_compile_time_info #+BEGIN_SRC d version(Windows) { pragma(msg, "[ Windows compilation ]"); @@ -97,7 +96,7 @@ static if(sysWindows) { ** 64 bit compilation? -#+name: sdp_compile_time_info +#+name: doc_reform_compile_time_info #+BEGIN_SRC d version(D_LP64) { enum bits = "64 bit"; diff --git a/org/default_misc.org b/org/default_misc.org index 05496f1..55fa418 100644 --- a/org/default_misc.org +++ b/org/default_misc.org @@ -1,8 +1,8 @@ -#+TITLE: sdp defaults misc +#+TITLE: doc_reform defaults misc +#+DESCRIPTION: documents - structuring, publishing in multiple formats & search +#+FILETAGS: :doc_reform:default:misc: #+AUTHOR: Ralph Amissah #+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] -#+DESCRIPTION: documents - structuring, publishing in multiple formats & search -#+KEYWORDS #+LANGUAGE: en #+STARTUP: indent content #+OPTIONS: H:3 num:nil toc:t \n:nil @:t ::t |:t ^:nil _:nil -:t f:t *:t <:t @@ -11,19 +11,18 @@ #+PROPERTY: header-args :padline no :exports code :noweb yes #+EXPORT_SELECT_TAGS: export #+EXPORT_EXCLUDE_TAGS: noexport -#+FILETAGS: :sdp:rel:meta: -#+TAGS: assert(a) class(c) debug(d) mixin(m) sdp(s) tangle(T) template(t) WEB(W) noexport(n) +#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n) -[[./sdp.org][sdp]] [[./][org/]] -* 0. meta defaults :module:sdp:meta_defaults: +[[./doc_reform.org][doc_reform]] [[./][org/]] +* 0. meta defaults :module:meta: ** 0. module template #+name: tangle_defaults -#+BEGIN_SRC d :tangle ../src/sdp/meta/defaults.d +#+BEGIN_SRC d :tangle ../src/doc_reform/meta/defaults.d /++ default settings +/ -module sdp.meta.defaults; +module doc_reform.meta.defaults; <<meta_defaults_template_init_flags>> <<meta_defaults_template_node>> <<meta_defaults_template_biblio>> @@ -169,15 +168,15 @@ template SiSUbiblio() { } #+END_SRC -* 1. output defaults :module:sdp:defaults: +* 1. output defaults :module:output: ** 0. module template #+name: tangle_defaults -#+BEGIN_SRC d :tangle ../src/sdp/output/defaults.d +#+BEGIN_SRC d :tangle ../src/doc_reform/output/defaults.d /++ default settings +/ -module sdp.output.defaults; +module doc_reform.output.defaults; <<defaults_template_init_flags>> <<defaults_template_markup>> <<defaults_template_language_codes>> @@ -209,7 +208,7 @@ import #+END_SRC ** defaults shared by meta & output (generic) -*** template: internal markup :markup: +*** template: internal markup :markup: 21 special characters used: diff --git a/org/default_paths.org b/org/default_paths.org index a37b542..9859758 100644 --- a/org/default_paths.org +++ b/org/default_paths.org @@ -1,8 +1,8 @@ -#+TITLE: sdp default paths +#+TITLE: doc_reform default paths +#+DESCRIPTION: documents - structuring, publishing in multiple formats & search +#+FILETAGS: :doc_reform:paths: #+AUTHOR: Ralph Amissah #+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] -#+DESCRIPTION: documents - structuring, publishing in multiple formats & search -#+KEYWORDS #+LANGUAGE: en #+STARTUP: indent content #+OPTIONS: H:3 num:nil toc:t \n:nil @:t ::t |:t ^:nil _:nil -:t f:t *:t <:t @@ -11,27 +11,26 @@ #+PROPERTY: header-args :padline no :exports code :noweb yes #+EXPORT_SELECT_TAGS: export #+EXPORT_EXCLUDE_TAGS: noexport -#+FILETAGS: :sdp:rel:path:file: -#+TAGS: assert(a) class(c) debug(d) mixin(m) sdp(s) tangle(T) template(t) WEB(W) noexport(n) +#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n) -[[./sdp.org][sdp]] [[./][org/]] -* 0. source paths :module:sdp:paths_source: +[[./doc_reform.org][doc_reform]] [[./][org/]] +* 0. source paths :module:doc_reform:paths_source: ** 0. module template -#+BEGIN_SRC d :tangle ../src/sdp/source/paths_source.d +#+BEGIN_SRC d :tangle ../src/doc_reform/source/paths_source.d /++ read configuration files<BR> - read config files<BR> meta_config_files.d +/ -module sdp.source.paths_source; +module doc_reform.source.paths_source; import std.array, std.file, std.path, std.regex, std.stdio, std.conv : to; -import sdp.meta.rgx; +import doc_reform.meta.rgx; <<template_paths_src>> <<template_paths_sisupod>> <<template_paths_sisupod_shallow>> @@ -91,7 +90,7 @@ template PodManifest() { } #+END_SRC -** _path matters (pod, manifest and source files)_ :manifest: +** _path matters (pod, manifest and source files)_ :manifest: tree sisupod sisupod @@ -902,19 +901,19 @@ template SiSUpathsSisupods() { } #+END_SRC -* 1. output paths :module:sdp:paths_output: +* 1. output paths :module:doc_reform:paths_output: ** 0. module template -#+BEGIN_SRC d :tangle ../src/sdp/output/paths_output.d +#+BEGIN_SRC d :tangle ../src/doc_reform/output/paths_output.d /++ default settings +/ -module sdp.output.paths_output; +module doc_reform.output.paths_output; import std.array, std.path, std.regex, std.stdio; -import sdp.meta.rgx; +import doc_reform.meta.rgx; <<template_paths_out>> <<template_paths_html>> <<template_paths_epub>> diff --git a/org/default_regex.org b/org/default_regex.org index 939aa8a..933a1b1 100644 --- a/org/default_regex.org +++ b/org/default_regex.org @@ -1,8 +1,8 @@ -#+TITLE: sdp regex defaults +#+TITLE: doc_reform regex defaults +#+DESCRIPTION: documents - structuring, publishing in multiple formats & search +#+FILETAGS: :doc_reform:regex: #+AUTHOR: Ralph Amissah #+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] -#+DESCRIPTION: documents - structuring, publishing in multiple formats & search -#+KEYWORDS #+LANGUAGE: en #+STARTUP: indent content #+OPTIONS: H:3 num:nil toc:t \n:nil @:t ::t |:t ^:nil _:nil -:t f:t *:t <:t @@ -11,12 +11,11 @@ #+PROPERTY: header-args :padline no :exports code :noweb yes #+EXPORT_SELECT_TAGS: export #+EXPORT_EXCLUDE_TAGS: noexport -#+FILETAGS: :sdp:rel:meta: -#+TAGS: assert(a) class(c) debug(d) mixin(m) sdp(s) tangle(T) template(t) WEB(W) noexport(n) +#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n) -[[./sdp.org][sdp]] [[./][org/]] -* 0. meta ctRegex :module:sdp:meta_rgx: -[[./sdp.org][sdp]] [[./][org/]] +[[./doc_reform.org][doc_reform]] [[./][org/]] +* 0. meta ctRegex :module: +[[./doc_reform.org][doc_reform]] [[./][org/]] http://dlang.org/phobos/std_regex.html - Plain string, in which case it's compiled to bytecode before matching. - Regex!char (wchar/dchar) that contains a pattern in the form of compiled bytecode. @@ -31,13 +30,13 @@ http://dlang.org/phobos/std_regex.html ** 0. module template #+name: tangle_meta_rgx -#+BEGIN_SRC d :tangle ../src/sdp/meta/rgx.d +#+BEGIN_SRC d :tangle ../src/doc_reform/meta/rgx.d /++ regex: regular expressions used in sisu document parser +/ -module sdp.meta.rgx; +module doc_reform.meta.rgx; static template SiSUrgxInit() { - import sdp.meta.defaults; + import doc_reform.meta.defaults; static struct Rgx { <<meta_rgx>> <<prgmkup_rgx>> @@ -369,8 +368,8 @@ auto language_code_and_filename = ctRegex!("(?:^|[/])(am|bg|bn|br|ca|cs|cy|da|de|el|en|eo|es|et|eu|fi|fr|ga|gl|he|hi|hr|hy|ia|is|it|ja|ko|la|lo|lt|lv|ml|mr|nl|no|nn|oc|pl|pt|pt_BR|ro|ru|sa|se|sk|sl|sq|sr|sv|ta|te|th|tk|tr|uk|ur|vi|zh)/[A-Za-z0-9._-].+?[.](?:sst|ssm)$"); #+END_SRC -* 1. output ctRegex :module:sdp:output_rgx: -[[./sdp.org][sdp]] [[./][org/]] +* 1. output ctRegex :module:doc_reform:output_rgx: +[[./doc_reform.org][doc_reform]] [[./][org/]] http://dlang.org/phobos/std_regex.html - Plain string, in which case it's compiled to bytecode before matching. - Regex!char (wchar/dchar) that contains a pattern in the form of compiled bytecode. @@ -379,13 +378,13 @@ http://dlang.org/phobos/std_regex.html ** 0. module template #+name: tangle_meta_rgx -#+BEGIN_SRC d :tangle ../src/sdp/output/rgx.d +#+BEGIN_SRC d :tangle ../src/doc_reform/output/rgx.d /++ regex: regular expressions used in sisu document parser +/ -module sdp.output.rgx; +module doc_reform.output.rgx; static template SiSUoutputRgxInit() { - import sdp.output.defaults; + import doc_reform.output.defaults; static struct Rgx { <<prgmkup_rgx>> <<sp_ch_xhtml_rgx>> diff --git a/org/default_shared.org b/org/default_shared.org index 113b98b..e94ab60 100644 --- a/org/default_shared.org +++ b/org/default_shared.org @@ -1,8 +1,8 @@ -#+TITLE: sdp shared +#+TITLE: doc_reform shared +#+DESCRIPTION: documents - structuring, publishing in multiple formats & search +#+FILETAGS: :doc_reform:default:shared: #+AUTHOR: Ralph Amissah #+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] -#+DESCRIPTION: documents - structuring, publishing in multiple formats & search -#+KEYWORDS #+LANGUAGE: en #+STARTUP: indent content #+OPTIONS: H:3 num:nil toc:t \n:nil @:t ::t |:t ^:nil _:nil -:t f:t *:t <:t @@ -11,22 +11,21 @@ #+PROPERTY: header-args :padline no :exports code :noweb yes #+EXPORT_SELECT_TAGS: export #+EXPORT_EXCLUDE_TAGS: noexport -#+FILETAGS: :sdp:rel:meta: -#+TAGS: assert(a) class(c) debug(d) mixin(m) sdp(s) tangle(T) template(t) WEB(W) noexport(n) +#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n) -[[./sdp.org][sdp]] [[./][org/]] -* 0. shared :module:sdp:shared: +[[./doc_reform.org][doc_reform]] [[./][org/]] +* 0. shared :module:doc_reform:shared: ** 0. module template -#+BEGIN_SRC d :tangle ../src/sdp/share/defaults.d +#+BEGIN_SRC d :tangle ../src/doc_reform/share/defaults.d /++ shared default settings +/ -module sdp.share.defaults; +module doc_reform.share.defaults; <<shared_messages>> #+END_SRC -** template: messages :messages: +** template: messages :messages: #+name: shared_messages #+BEGIN_SRC d template Msg() { diff --git a/org/sdp.org b/org/doc_reform.org index 97a9af0..eb10646 100644 --- a/org/sdp.org +++ b/org/doc_reform.org @@ -1,8 +1,8 @@ -#+TITLE: sdp hub +#+TITLE: doc_reform hub +#+DESCRIPTION: documents - structuring, various output representations & search +#+FILETAGS: :doc_reform:hub: #+AUTHOR: Ralph Amissah #+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] -#+DESCRIPTION: documents - structuring, publishing in multiple formats & search -#+KEYWORDS #+LANGUAGE: en #+STARTUP: indent content #+OPTIONS: H:3 num:nil toc:t \n:nil @:t ::t |:t ^:nil _:nil -:t f:t *:t <:t @@ -11,8 +11,7 @@ #+PROPERTY: header-args :padline no :exports code :noweb yes #+EXPORT_SELECT_TAGS: export #+EXPORT_EXCLUDE_TAGS: noexport -#+FILETAGS: :sdp:rel:hub: -#+TAGS: assert(a) class(c) debug(d) mixin(m) sdp(s) tangle(T) template(t) WEB(W) noexport(n) +#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n) [[../maker.org][maker.org makefile]] [[./][org/]] * 0. version.txt (set version) :version: @@ -25,7 +24,7 @@ struct Version { int minor; int patch; } -enum ver = Version(0, 27, 1); +enum ver = Version(0, 1, 0); #+END_SRC ** compilation restrictions (supported compilers) @@ -45,7 +44,7 @@ version (Posix) { } #+END_SRC -* 1. sdp (sisu document parser) :sdp: +* 1. doc_reform (sisu document parser) :doc_reform: ** notes - deal with imports - get options @@ -63,35 +62,35 @@ version (Posix) { - by sourcefiles contents identifier - by zip filename -#+BEGIN_SRC d :tangle ../src/sdp/sdp.d :shebang #!/usr/bin/env rdmd -module sdp.sisu_document_parser; +#+BEGIN_SRC d :tangle ../src/doc_reform/doc_reform.d :shebang #!/usr/bin/env rdmd +module doc_reform.sisu_document_parser; import - sdp.conf.compile_time_info, - sdp.meta.metadoc; -<<imports_sdp>> + doc_reform.conf.compile_time_info, + doc_reform.meta.metadoc; +<<imports_doc_reform>> import std.algorithm; import std.parallelism; -<<mixin_sdp_version>> +<<mixin_doc_reform_version>> <<mixin_pre_main>> /++ -name "sdp" +name "doc_reform" description "A SiSU inspired document parser writen in D." homepage "http://sisudoc.org" +/ void main(string[] args) { - <<sdp_mixin>> - <<sdp_args>> - <<sdp_do_selected>> + <<doc_reform_mixin>> + <<doc_reform_args>> + <<doc_reform_do_selected>> if (_manifests.length > 1) { // _manifests[0] initialized dummy element foreach(manifest; parallel(_manifests[1..$])) { if (!empty(manifest.src.filename)) { - <<sdp_each_file_do_scope>> - <<sdp_each_file_do_abstraction>> - <<sdp_each_file_do_debugs_checkdoc>> - <<sdp_each_file_do_selected_output>> - <<sdp_each_file_do_scope_exit>> + <<doc_reform_each_file_do_scope>> + <<doc_reform_each_file_do_abstraction>> + <<doc_reform_each_file_do_debugs_checkdoc>> + <<doc_reform_each_file_do_selected_output>> + <<doc_reform_each_file_do_scope_exit>> } else { - <<sdp_no_filename_provided>> + <<doc_reform_no_filename_provided>> } } } @@ -101,9 +100,9 @@ void main(string[] args) { ** 1. pre-loop init :init: *** init **** imports :import: -***** sdp :sdp: +***** doc_reform :doc_reform: -#+NAME: imports_sdp +#+NAME: imports_doc_reform #+BEGIN_SRC d import std.getopt, @@ -111,25 +110,25 @@ import std.path, std.process; import - sdp.meta, - sdp.meta.metadoc_summary, - sdp.meta.metadoc_from_src, - sdp.meta.conf_make_meta_structs, - sdp.meta.conf_make_meta_toml, - sdp.meta.conf_make_meta_json, - sdp.meta.defaults, - sdp.meta.doc_debugs, - sdp.meta.rgx, - sdp.source.paths_source, - sdp.source.read_config_files, - sdp.source.read_source_files, - sdp.output.hub; + doc_reform.meta, + doc_reform.meta.metadoc_summary, + doc_reform.meta.metadoc_from_src, + doc_reform.meta.conf_make_meta_structs, + doc_reform.meta.conf_make_meta_toml, + doc_reform.meta.conf_make_meta_json, + doc_reform.meta.defaults, + doc_reform.meta.doc_debugs, + doc_reform.meta.rgx, + doc_reform.source.paths_source, + doc_reform.source.read_config_files, + doc_reform.source.read_source_files, + doc_reform.output.hub; #+END_SRC ****** notes ├── src -│ ├── sdp.d -│ └── sdp +│ ├── doc_reform.d +│ └── doc_reform │ ├── conf │ ├── meta │ └── output @@ -143,7 +142,7 @@ import [[./source_read_files.org][source_read_files]] [[./compile_time_info.org][compile time info]] [[./output.org][output]] -[[./sdp.org][sdp]] +[[./doc_reform.org][doc_reform]] keep up to date, configuration in ../maker.org @@ -161,7 +160,7 @@ std.variant, **** mixins :mixin: ***** version.txt :version: -#+NAME: mixin_sdp_version +#+NAME: mixin_doc_reform_version #+BEGIN_SRC d mixin(import("version.txt")); #+END_SRC @@ -172,9 +171,9 @@ mixin(import("version.txt")); mixin CompileTimeInfo; #+END_SRC -***** sdp "main" mixins :sdp: +***** doc_reform "main" mixins :doc_reform: -#+NAME: sdp_mixin +#+NAME: doc_reform_mixin #+BEGIN_SRC d mixin SiSUrgxInit; mixin contentJSONtoSiSUstruct; @@ -185,7 +184,7 @@ mixin outputHub; **** init :init: -#+NAME: sdp_args +#+NAME: doc_reform_args #+BEGIN_SRC d string flag_action; string arg_unrecognized; @@ -195,12 +194,12 @@ static auto rgx = Rgx(); *** scope (run complete) :scope: -#+NAME: sdp_args +#+NAME: doc_reform_args #+BEGIN_SRC d scope(success) { debug(checkdoc) { writefln( - "~ run complete, ok ~ (sdp-%s.%s.%s, %s D:%s, %s %s)", + "~ run complete, ok ~ (doc_reform-%s.%s.%s, %s D:%s, %s %s)", ver.major, ver.minor, ver.patch, __VENDOR__, __VERSION__, bits, os, @@ -216,7 +215,7 @@ scope(failure) { } #+END_SRC -*** getopt args for loop :args:getopt: +*** getopt args for loop :args:getopt: look into using getopt [[http://dlang.org/phobos/std_getopt.html][getopt]] @@ -224,7 +223,7 @@ look into using getopt **** getopt -#+NAME: sdp_args +#+NAME: doc_reform_args #+BEGIN_SRC d bool[string] opts = [ "abstraction" : false, @@ -320,7 +319,7 @@ if (helpInfo.helpWanted) { **** getopt hash to struct -#+NAME: sdp_args +#+NAME: doc_reform_args #+BEGIN_SRC d enum outTask { sisupod, source, sqlite, sqlite_multi, epub, html_scroll, html_seg, html_stuff } struct OptActions { @@ -528,7 +527,7 @@ auto _opt_action = OptActions(); **** env -#+NAME: sdp_args +#+NAME: doc_reform_args #+BEGIN_SRC d auto _env = [ "pwd" : environment["PWD"], @@ -538,7 +537,7 @@ auto _env = [ *** opt actions on processing files & file paths (pods, src etc.) -#+NAME: sdp_args +#+NAME: doc_reform_args #+BEGIN_SRC d auto _manifest_start = PodManifest!()(""); auto _manifest_matter = PathMatters!()(_opt_action, _env, ""); @@ -616,7 +615,7 @@ foreach(arg; args[1..$]) { *** config files load & read -#+NAME: sdp_conf_files +#+NAME: doc_reform_conf_files_in_toml #+BEGIN_SRC d auto _config_document_struct = readConfigDoc!()(_manifest, _env); // document config file auto _config_local_site_struct = readConfigSite!()(_manifest, _env); // local site config @@ -627,7 +626,7 @@ _make_and_meta_struct = configParseTOMLreturnSiSUstruct!()(_make_and_meta_struct *** opt actions independent of processing files (no files no processing loop) -#+NAME: sdp_do_selected +#+NAME: doc_reform_do_selected #+BEGIN_SRC d if (!(_opt_action.skip_output)) { debug(steps) { @@ -643,7 +642,7 @@ if (!(_opt_action.skip_output)) { ** _2. processing: (loop each file)_ [+2] :loop:files: *** scope (loop) :scope: -#+NAME: sdp_each_file_do_scope +#+NAME: doc_reform_each_file_do_scope #+BEGIN_SRC d scope(success) { if (!(_opt_action.quiet)) { @@ -671,13 +670,13 @@ enforce( ); #+END_SRC -*** 1. _document abstraction_ [#A] >> +*** 1. _document abstraction_ [#A] - return tuple of: - doc_abstraction (the document) - doc_matters -#+NAME: sdp_each_file_do_abstraction +#+NAME: doc_reform_each_file_do_abstraction #+BEGIN_SRC d debug(steps) { writeln("--->\nstepX commence → (document abstraction)"); @@ -692,10 +691,10 @@ debug(steps) { } #+END_SRC -*** 2. _output processing_ (post abstraction processing) >> +*** 2. _output processing_ (post abstraction processing) **** 0. abstraction _print summary_ :abstraction:summary: -#+NAME: sdp_each_file_do_debugs_checkdoc +#+NAME: doc_reform_each_file_do_debugs_checkdoc #+BEGIN_SRC d /+ ↓ debugs +/ if (doc_matters.opt.action.verbose) { @@ -706,7 +705,7 @@ if (doc_matters.opt.action.verbose) { **** 1. _debug_ (document parts, checkdoc) :debug:checkdoc: - [[./meta_output_debugs.org][meta_output_debugs]] -#+NAME: sdp_each_file_do_debugs_checkdoc +#+NAME: doc_reform_each_file_do_debugs_checkdoc #+BEGIN_SRC d /+ ↓ debugs +/ if ((doc_matters.opt.action.debug_do) @@ -719,7 +718,7 @@ if ((doc_matters.opt.action.debug_do) **** 2. _process outputs_ :outputs: - [[./output_hub.org][output_hub]] -#+NAME: sdp_each_file_do_selected_output +#+NAME: doc_reform_each_file_do_selected_output #+BEGIN_SRC d /+ ↓ output hub +/ if (!(doc_matters.opt.action.skip_output)) { @@ -735,7 +734,7 @@ if (!(doc_matters.opt.action.skip_output)) { *** scope (on loop exit) :scope:exit: -#+NAME: sdp_each_file_do_scope_exit +#+NAME: doc_reform_each_file_do_scope_exit #+BEGIN_SRC d scope(exit) { if (!(_opt_action.quiet)) { @@ -749,21 +748,21 @@ scope(exit) { #+END_SRC ** +2c. no valid filename provided+ -#+NAME: sdp_no_filename_provided +#+NAME: doc_reform_no_filename_provided #+BEGIN_SRC d /+ no recognized filename provided +/ writeln("no recognized filename"); break; // terminate, stop #+END_SRC -* 2. _document abstraction functions_ :module:sdp:abstraction: +* 2. _document abstraction functions_ :module:doc_reform:abstraction: ** 0. module template -#+BEGIN_SRC d :tangle ../src/sdp/meta/metadoc.d -module sdp.meta.metadoc; +#+BEGIN_SRC d :tangle ../src/doc_reform/meta/metadoc.d +module doc_reform.meta.metadoc; template SiSUabstraction() { - <<imports_sdp>> - <<sdp_mixin>> + <<imports_doc_reform>> + <<doc_reform_mixin>> enum headBody { header, body_content, insert_file_list, image_list } enum makeMeta { make, meta } enum docAbst { doc_abstraction, section_keys, segnames, segnames_0_4, images } @@ -773,11 +772,11 @@ template SiSUabstraction() { O _opt_action, M _manifest ){ - <<sdp_conf_files>> - <<sdp_each_file_do_read_and_split_sisu_markup_file_content_into_header_and_body>> - <<sdp_each_file_do_split_sisu_markup_file_header_into_make_and_meta>> - <<sdp_each_file_do_document_abstraction>> - <<sdp_each_file_do_document_matters>> + <<doc_reform_conf_files_in_toml>> + <<doc_reform_each_file_do_read_and_split_sisu_markup_file_content_into_header_and_body>> + <<doc_reform_each_file_do_split_sisu_markup_file_header_into_make_and_meta_structs>> + <<doc_reform_each_file_do_document_abstraction>> + <<doc_reform_each_file_do_document_matters>> auto t = tuple(doc_abstraction, doc_matters); static assert(t.length==2); return t; @@ -785,7 +784,7 @@ template SiSUabstraction() { } #+END_SRC -** 1. raw file content split, doc: _header_, _content_ +(lists: subdocs? images?) >> +** 1. raw file content split, doc: _header_, _content_ +(lists: subdocs? images?) - [[./source_read_files.org][source_read_files]] - read in the _marked up source document_ and @@ -811,7 +810,7 @@ if build source pod requested all information needed to build it available at th - insert file list _header_body_insertfilelist_imagelist[headBody.insert_file_list] - image list _header_body_insertfilelist_imagelist[headBody.image_list] -#+NAME: sdp_each_file_do_read_and_split_sisu_markup_file_content_into_header_and_body +#+NAME: doc_reform_each_file_do_read_and_split_sisu_markup_file_content_into_header_and_body #+BEGIN_SRC d /+ ↓ read file (filename with path) +/ /+ ↓ file tuple of header and content +/ @@ -833,7 +832,7 @@ debug(header_and_body) { } #+END_SRC -** 2. _document metadata_ & _make instructions_ (struct from toml) >> +** 2. _document metadata_ & _make instructions_ (struct from toml) - [[./meta_conf_make_meta.org][meta_conf_make_meta]] - read _document header_, split into: @@ -846,7 +845,7 @@ debug(header_and_body) { - make instructions (from configuration files & document header make instructions) -#+NAME: sdp_each_file_do_split_sisu_markup_file_header_into_make_and_meta +#+NAME: doc_reform_each_file_do_split_sisu_markup_file_header_into_make_and_meta_structs #+BEGIN_SRC d /+ ↓ split header into make and meta +/ debug(steps) { @@ -862,7 +861,7 @@ debug(steps) { } #+END_SRC -** 3. _document abstraction, tuple_ (output-pre-processing) [#A] >> +** 3. _document abstraction, tuple_ (output-pre-processing) [#A] - [[./meta_abstraction.org][meta_abstraction]] - prepare the document abstraction used in downstream processing @@ -876,7 +875,7 @@ debug(steps) { - segnames for html epub (transfer to _doc_matters_) - image list (transfer to _doc_matters_) -#+NAME: sdp_each_file_do_document_abstraction +#+NAME: doc_reform_each_file_do_document_abstraction #+BEGIN_SRC d /+ ↓ document abstraction: process document, return abstraction as tuple +/ debug(steps) { @@ -901,12 +900,12 @@ debug(steps) { } #+END_SRC -** 4. _document matters_ (doc info gathered, various sources) [#A] >> +** 4. _document matters_ (doc info gathered, various sources) [#A] - prepare document_matters, miscellany about processing and the document of use in downstream processing -#+NAME: sdp_each_file_do_document_matters +#+NAME: doc_reform_each_file_do_document_matters #+BEGIN_SRC d debug(steps) { writeln("step4 commence → (doc_matters)"); @@ -991,11 +990,11 @@ debug(steps) { } #+END_SRC -* 3. document abstraction _summary_ :module:sdp:metadoc_summary: +* 3. document abstraction _summary_ :module:doc_reform:metadoc_summary: ** 0. module template -#+BEGIN_SRC d :tangle ../src/sdp/meta/metadoc_summary.d -module sdp.meta.metadoc_summary; +#+BEGIN_SRC d :tangle ../src/doc_reform/meta/metadoc_summary.d +module doc_reform.meta.metadoc_summary; template SiSUabstractionSummary() { auto SiSUabstractionSummary(S,T)( auto ref const S doc_abstraction, @@ -1017,8 +1016,8 @@ template SiSUabstractionSummary() { #+name: metadoc_summary_imports #+BEGIN_SRC d import - sdp.meta.defaults, - sdp.meta.rgx; + doc_reform.meta.defaults, + doc_reform.meta.rgx; import std.array, std.exception, @@ -1129,10 +1128,10 @@ writefln( * __END__ dev notes -** sdp glossary / terms +** doc_reform glossary / terms |------+-------------------------------------| -| sdp | sisu document parser | +| doc_reform | sisu document parser | |------+-------------------------------------| | dmso | document markup, structure, objects | |------+-------------------------------------| diff --git a/org/imports.org b/org/imports.org index c9265cc..435c6b6 100644 --- a/org/imports.org +++ b/org/imports.org @@ -1,8 +1,8 @@ -#+TITLE: sdp hub +#+TITLE: doc_reform hub +#+DESCRIPTION: documents - structuring, publishing in multiple formats & search +#+FILETAGS: :doc_reform:imports: #+AUTHOR: Ralph Amissah #+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] -#+DESCRIPTION: documents - structuring, publishing in multiple formats & search -#+KEYWORDS #+LANGUAGE: en #+STARTUP: indent content #+OPTIONS: H:3 num:nil toc:t \n:nil @:t ::t |:t ^:nil _:nil -:t f:t *:t <:t @@ -11,14 +11,13 @@ #+PROPERTY: header-args :padline no :exports code :noweb yes #+EXPORT_SELECT_TAGS: export #+EXPORT_EXCLUDE_TAGS: noexport -#+FILETAGS: :sdp:rel:imports: -#+TAGS: assert(a) class(c) debug(d) mixin(m) sdp(s) tangle(T) template(t) WEB(W) noexport(n) +#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n) * 1. imports for meta ** package dir -#+BEGIN_SRC d :tangle ../src/sdp/meta/package.d -module sdp.meta; +#+BEGIN_SRC d :tangle ../src/doc_reform/meta/package.d +module doc_reform.meta; <<imports_for_meta_general>> #+END_SRC @@ -27,8 +26,8 @@ module sdp.meta; #+NAME: imports_for_meta_general #+BEGIN_SRC d public import - sdp.meta.defaults, - sdp.meta.rgx; + doc_reform.meta.defaults, + doc_reform.meta.rgx; /+ std +/ public import std.array, @@ -48,8 +47,8 @@ public import ** package dir -#+BEGIN_SRC d :tangle ../src/sdp/output/package.d -module sdp.output; +#+BEGIN_SRC d :tangle ../src/doc_reform/output/package.d +module doc_reform.output; <<imports_for_output_general>> #+END_SRC @@ -73,11 +72,11 @@ public import // std.uni, std.utf; public import - sdp.share.defaults, - sdp.source.paths_source, - sdp.output.defaults, - sdp.output.paths_output, - sdp.output.rgx; + doc_reform.share.defaults, + doc_reform.source.paths_source, + doc_reform.output.defaults, + doc_reform.output.paths_output, + doc_reform.output.rgx; #+END_SRC * __END__ diff --git a/org/meta_abstraction.org b/org/meta_abstraction.org index 87782d3..50a0e78 100644 --- a/org/meta_abstraction.org +++ b/org/meta_abstraction.org @@ -1,8 +1,8 @@ -#+TITLE: sdp document abstraction +#+TITLE: doc_reform document abstraction +#+DESCRIPTION: documents - structuring, publishing in multiple formats & search +#+FILETAGS: :doc_reform:abstraction: #+AUTHOR: Ralph Amissah #+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] -#+DESCRIPTION: documents - structuring, publishing in multiple formats & search -#+KEYWORDS #+LANGUAGE: en #+STARTUP: indent content #+OPTIONS: H:3 num:nil toc:t \n:nil @:t ::t |:t ^:nil _:nil -:t f:t *:t <:t @@ -11,23 +11,22 @@ #+PROPERTY: header-args :padline no :exports code :noweb yes #+EXPORT_SELECT_TAGS: export #+EXPORT_EXCLUDE_TAGS: noexport -#+FILETAGS: :sdp:rel:meta: -#+TAGS: assert(a) class(c) debug(d) mixin(m) sdp(s) tangle(T) template(t) WEB(W) noexport(n) +#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n) -- [[./sdp.org][sdp]] [[./][org/]] +- [[./doc_reform.org][doc_reform]] [[./][org/]] -* 1. Document Abstraction :module:sdp:metadoc_from_src: +* 1. Document Abstraction :module:doc_reform:metadoc_from_src: Process markup document, create document abstraction. ** 0. module template -#+BEGIN_SRC d :tangle ../src/sdp/meta/metadoc_from_src.d +#+BEGIN_SRC d :tangle ../src/doc_reform/meta/metadoc_from_src.d /++ document abstraction: abstraction of sisu markup for downstream processing metadoc_from_src.d +/ -module sdp.meta.metadoc_from_src; +module doc_reform.meta.metadoc_from_src; template SiSUdocAbstraction() { /+ ↓ abstraction imports +/ <<abs_top_imports>> @@ -150,7 +149,7 @@ template SiSUdocAbstraction() { #+name: abs_top_imports #+BEGIN_SRC d -import sdp.meta; +import doc_reform.meta; import std.algorithm, std.container, @@ -158,9 +157,9 @@ import std.json, std.path; import - sdp.meta.defaults, - sdp.meta.object_setter, - sdp.meta.rgx; + doc_reform.meta.defaults, + doc_reform.meta.object_setter, + doc_reform.meta.rgx; #+END_SRC *** mixins :mixins: @@ -1177,7 +1176,7 @@ if ((obj_type_status["heading"] == State.on) segment_anchor_tag_that_object_belongs_to = anchor_tag_; segment_anchor_tag_that_object_belongs_to_uri = anchor_tag_ ~ ".fnSuffix#" ~ obj_cite_digits.on.to!string; } else if (an_object["lev_markup_number"].to!int < 4) { - string segn; + string segn; switch (an_object["lev_markup_number"].to!int) { case 0: segn = "_the_title"; @@ -2299,7 +2298,7 @@ if (the_table_of_contents_section["scroll"].length > 1) { if (obj.metainfo.heading_lev_markup == 4) { obj.tags.segname_next = html_segnames[obj.ptr.html_segnames + 1]; assert(obj.tags.segment_anchor_tag == html_segnames[obj.ptr.html_segnames], - obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]); + obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]); } } /+ dom structure (marked up & collapsed) +/ @@ -2328,7 +2327,7 @@ if (the_table_of_contents_section["scroll"].length > 1) { if (obj.metainfo.heading_lev_markup == 4) { obj.tags.segname_next = html_segnames[obj.ptr.html_segnames + 1]; assert(obj.tags.segment_anchor_tag == html_segnames[obj.ptr.html_segnames], - obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]); + obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]); } } if ((opt_action.html) @@ -2364,7 +2363,7 @@ if (the_document_body_section.length > 1) { obj.tags.segname_next = html_segnames[obj.ptr.html_segnames + 1]; } assert(obj.tags.segment_anchor_tag == html_segnames[obj.ptr.html_segnames], - obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]); + obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]); } } /+ dom structure (marked up & collapsed) +/ @@ -2414,7 +2413,7 @@ if (the_endnotes_section.length > 1) { obj.tags.segname_next = html_segnames[obj.ptr.html_segnames + 1]; } assert(obj.tags.segment_anchor_tag == html_segnames[obj.ptr.html_segnames], - obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]); + obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]); } } /+ dom structure (marked up & collapsed) +/ @@ -2456,7 +2455,7 @@ if (the_glossary_section.length > 1) { obj.tags.segname_next = html_segnames[obj.ptr.html_segnames + 1]; } assert(obj.tags.segment_anchor_tag == html_segnames[obj.ptr.html_segnames], - obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]); + obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]); } } /+ dom structure (marked up & collapsed) +/ @@ -2501,7 +2500,7 @@ if (the_bibliography_section.length > 1) { obj.tags.segname_next = html_segnames[obj.ptr.html_segnames + 1]; } assert(obj.tags.segment_anchor_tag == html_segnames[obj.ptr.html_segnames], - obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]); + obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]); } } /+ dom structure (marked up & collapsed) +/ @@ -2551,7 +2550,7 @@ if (the_bookindex_section["scroll"].length > 1) { obj.tags.segname_next = html_segnames[obj.ptr.html_segnames + 1]; } assert(obj.tags.segment_anchor_tag == html_segnames[obj.ptr.html_segnames], - obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]); + obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]); } } /+ dom structure (marked up & collapsed) +/ @@ -2589,7 +2588,7 @@ if (the_bookindex_section["scroll"].length > 1) { obj.tags.segname_next = html_segnames[obj.ptr.html_segnames + 1]; } assert(obj.tags.segment_anchor_tag == html_segnames[obj.ptr.html_segnames], - obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]); + obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]); } } /+ dom structure (marked up & collapsed) +/ @@ -2637,7 +2636,7 @@ if (the_blurb_section.length > 1) { obj.tags.segname_next = html_segnames[obj.ptr.html_segnames + 1]; } assert(obj.tags.segment_anchor_tag == html_segnames[obj.ptr.html_segnames], - obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]); + obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]); } } /+ dom structure (marked up & collapsed) +/ @@ -7698,19 +7697,19 @@ template docSectKeysSeq() { } #+END_SRC -* 2. Object Setter (Set Abstract Object) :module:sdp:meta_object_setter: +* 2. Object Setter (Set Abstract Object) :module:doc_reform:meta_object_setter: set abstracted objects for downstream processing ** 0. module template -#+BEGIN_SRC d :tangle ../src/sdp/meta/object_setter.d +#+BEGIN_SRC d :tangle ../src/doc_reform/meta/object_setter.d /++ object setter: setting of sisu objects for downstream processing meta_object_setter.d +/ -module sdp.meta.object_setter; +module doc_reform.meta.object_setter; template ObjectSetter() { /+ structs +/ <<meta_structs_init>> diff --git a/org/meta_conf_make_meta.org b/org/meta_conf_make_meta.org index 22d07d8..240be44 100644 --- a/org/meta_conf_make_meta.org +++ b/org/meta_conf_make_meta.org @@ -1,8 +1,8 @@ -#+TITLE: sdp config & header (make & meta) extract +#+TITLE: doc_reform config & header (make & meta) extract +#+DESCRIPTION: documents - structuring, publishing in multiple formats & search +#+FILETAGS: :doc_reform:config: #+AUTHOR: Ralph Amissah #+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] -#+DESCRIPTION: documents - structuring, publishing in multiple formats & search -#+KEYWORDS #+LANGUAGE: en #+STARTUP: indent content #+OPTIONS: H:3 num:nil toc:t \n:nil @:t ::t |:t ^:nil _:nil -:t f:t *:t <:t @@ -11,10 +11,9 @@ #+PROPERTY: header-args :padline no :exports code :noweb yes #+EXPORT_SELECT_TAGS: export #+EXPORT_EXCLUDE_TAGS: noexport -#+FILETAGS: :sdp:rel:meta: -#+TAGS: assert(a) class(c) debug(d) mixin(m) sdp(s) tangle(T) template(t) WEB(W) noexport(n) +#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n) -[[./sdp.org][sdp]] [[./][org/]] +[[./doc_reform.org][doc_reform]] [[./][org/]] * 0. generic ** imports @@ -39,13 +38,13 @@ import std.uni, std.utf, std.conv : to; -import sdp.meta.conf_make_meta_structs; +import doc_reform.meta.conf_make_meta_structs; #+END_SRC ** struct ConfComposite -#+BEGIN_SRC d :tangle ../src/sdp/meta/conf_make_meta_structs.d -module sdp.meta.conf_make_meta_structs; +#+BEGIN_SRC d :tangle ../src/doc_reform/meta/conf_make_meta_structs.d +module doc_reform.meta.conf_make_meta_structs; <<meta_defaults_template_structs>> #+END_SRC @@ -64,8 +63,8 @@ import std.utf, std.conv : to; import - sdp.meta.defaults, - sdp.meta.rgx; + doc_reform.meta.defaults, + doc_reform.meta.rgx; mixin SiSUrgxInit; static auto _rgx = Rgx(); mixin InternalMarkup; @@ -107,9 +106,9 @@ struct ConfCompositeMakeStr { string[] footer; string[] headings; string[] home_button_image; - string home_button_text = "{SiSU}http://www.sisudoc.org;" - ~ " {www.sisudoc.org}http://www.sisudoc.org;" - ~ " {sources / git}http://git.sisudoc.org/gitweb/"; + string home_button_text = "{Doc Reform}http://www.doc-reform.org;" + ~ " {www.doc-reform.org}http://www.doc-reform.org;" + ~ " {sources / git}https://git.doc-reform.org/software/doc-reform"; string italics; string auto_num_top_at_level; int auto_num_top_lv = 9; @@ -197,9 +196,9 @@ struct ConfCompositeMakeInit { string[] footer; string[] headings; string[] home_button_image; - string home_button_text = "{SiSU}http://www.sisudoc.org;" - ~ " {www.sisudoc.org}http://www.sisudoc.org;" - ~ " {sources / git}http://git.sisudoc.org/gitweb/"; + string home_button_text = "{Doc Reform}http://www.doc-reform.org;" + ~ " {www.doc-reform.org}http://www.doc-reform.org;" + ~ " {sources / git}https://git.doc-reform.org/software/doc-reform"; string[] italics; string auto_num_top_at_level; int auto_num_top_lv = 9; @@ -419,15 +418,15 @@ auto config_jsonstr = `{ }`; #+END_SRC -* 1. JSON to SiSUstruct :module:sdp:meta_conf_make_meta_json: +* 1. JSON to SiSUstruct :module:doc_reform:meta_conf_make_meta_json: ** 0. module template -#+BEGIN_SRC d :tangle ../src/sdp/meta/conf_make_meta_json.d +#+BEGIN_SRC d :tangle ../src/doc_reform/meta/conf_make_meta_json.d /++ json headers<BR> extract json header return json +/ -module sdp.meta.conf_make_meta_json; +module doc_reform.meta.conf_make_meta_json; static template contentJSONtoSiSUstruct() { import std.exception, @@ -439,9 +438,9 @@ static template contentJSONtoSiSUstruct() { std.utf, std.conv : to; import - sdp.meta.conf_make_meta_structs, - sdp.meta.conf_make_meta_json, - sdp.meta.rgx; + doc_reform.meta.conf_make_meta_structs, + doc_reform.meta.conf_make_meta_json, + doc_reform.meta.rgx; ConfCompositePlus _struct_composite; auto contentJSONtoSiSUstruct(C, J)(C _struct_composite, J _json, string _identifier) { mixin SiSUrgxInit; @@ -1051,10 +1050,10 @@ if (_struct_composite.meta.title_main.empty) { } #+END_SRC -* 2. TOML returns SiSUstruct (via JSON) :module:sdp:meta_conf_make_meta: +* 2. TOML returns SiSUstruct (via JSON) :module:doc_reform:meta_conf_make_meta: ** 0. parse TOML config return JSON -#+BEGIN_SRC d :tangle ../src/sdp/meta/conf_make_meta_toml.d +#+BEGIN_SRC d :tangle ../src/doc_reform/meta/conf_make_meta_toml.d /++ extract native/orig header return associative array<BR> @@ -1065,7 +1064,7 @@ if (_struct_composite.meta.title_main.empty) { converting the metadata and make instructions to a common json format used by program internally. Moved to associative array. +/ -module sdp.meta.conf_make_meta_toml; +module doc_reform.meta.conf_make_meta_toml; static template configParseTOMLreturnJSON() { import toml, @@ -1083,14 +1082,14 @@ static template configParseTOMLreturnJSON() { ** 1. parse TOML config to JSON return SiSUstruct -#+BEGIN_SRC d :tangle ../src/sdp/meta/conf_make_meta_toml.d +#+BEGIN_SRC d :tangle ../src/doc_reform/meta/conf_make_meta_toml.d static template configParseTOMLreturnSiSUstruct() { import toml, toml.json; import - sdp.meta.conf_make_meta_structs, - sdp.meta.conf_make_meta_json; + doc_reform.meta.conf_make_meta_structs, + doc_reform.meta.conf_make_meta_json; mixin contentJSONtoSiSUstruct; auto configParseTOMLreturnSiSUstruct(CCm, T)( CCm _make_and_meta_struct, @@ -1106,7 +1105,7 @@ static template configParseTOMLreturnSiSUstruct() { ** 2. parse TOML header to JSON then Struct -#+BEGIN_SRC d :tangle ../src/sdp/meta/conf_make_meta_toml.d +#+BEGIN_SRC d :tangle ../src/doc_reform/meta/conf_make_meta_toml.d static template docHeaderMakeAndMetaTupTomlExtractAndConvertToStruct() { import std.exception, @@ -1120,9 +1119,9 @@ static template docHeaderMakeAndMetaTupTomlExtractAndConvertToStruct() { toml, toml.json; import - sdp.meta.conf_make_meta_structs, - sdp.meta.conf_make_meta_json, - sdp.meta.rgx; + doc_reform.meta.conf_make_meta_structs, + doc_reform.meta.conf_make_meta_json, + doc_reform.meta.rgx; mixin SiSUrgxInit; mixin contentJSONtoSiSUstruct; static auto rgx = Rgx(); @@ -1152,7 +1151,7 @@ static template docHeaderMakeAndMetaTupTomlExtractAndConvertToStruct() { /+ unify internal representation of header info for native & sdlang document headers represent either using struct, hashes or possibly json - sdp internal representation should be identical for native & sdlang variants + doc_reform internal representation should be identical for native & sdlang variants +/ header. ├── make // make instructions diff --git a/org/meta_debugs.org b/org/meta_debugs.org index 1d5bb14..fc77271 100644 --- a/org/meta_debugs.org +++ b/org/meta_debugs.org @@ -1,8 +1,8 @@ -#+TITLE: sdp abstraction summary and debugs +#+TITLE: doc_reform abstraction summary and debugs +#+DESCRIPTION: documents - structuring, publishing in multiple formats & search +#+FILETAGS: :doc_reform:debugs: #+AUTHOR: Ralph Amissah #+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] -#+DESCRIPTION: documents - structuring, publishing in multiple formats & search -#+KEYWORDS #+LANGUAGE: en #+STARTUP: indent content #+OPTIONS: H:3 num:nil toc:t \n:nil @:t ::t |:t ^:nil _:nil -:t f:t *:t <:t @@ -11,18 +11,17 @@ #+PROPERTY: header-args :padline no :exports code :noweb yes #+EXPORT_SELECT_TAGS: export #+EXPORT_EXCLUDE_TAGS: noexport -#+FILETAGS: :sdp:rel:meta: -#+TAGS: assert(a) class(c) debug(d) mixin(m) sdp(s) tangle(T) template(t) WEB(W) noexport(n) +#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n) -[[./sdp.org][sdp]] [[./][org/]] -* 1. abstraction debugs :module:sdp:meta_doc_debugs: +[[./doc_reform.org][doc_reform]] [[./][org/]] +* 1. abstraction debugs :module:doc_reform:meta_doc_debugs: ** 0. module template -#+BEGIN_SRC d :tangle ../src/sdp/meta/doc_debugs.d +#+BEGIN_SRC d :tangle ../src/doc_reform/meta/doc_debugs.d /++ output debugs +/ -module sdp.meta.doc_debugs; +module doc_reform.meta.doc_debugs; template SiSUdebugs() { <<debug_imports>> auto SiSUdebugs(S,T)( @@ -48,8 +47,8 @@ template SiSUdebugs() { #+name: debug_imports #+BEGIN_SRC d import - sdp.meta.defaults, - sdp.meta.rgx; + doc_reform.meta.defaults, + doc_reform.meta.rgx; import std.algorithm, std.array, diff --git a/org/output_hub.org b/org/output_hub.org index 9731029..b6e526c 100644 --- a/org/output_hub.org +++ b/org/output_hub.org @@ -1,8 +1,8 @@ -#+TITLE: sdp output hub +#+TITLE: doc_reform output hub +#+DESCRIPTION: documents - structuring, publishing in multiple formats & search +#+FILETAGS: :doc_reform:output:hub: #+AUTHOR: Ralph Amissah #+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] -#+DESCRIPTION: documents - structuring, publishing in multiple formats & search -#+KEYWORDS #+LANGUAGE: en #+STARTUP: indent content #+OPTIONS: H:3 num:nil toc:t \n:nil @:t ::t |:t ^:nil _:nil -:t f:t *:t <:t @@ -11,20 +11,19 @@ #+PROPERTY: header-args :padline no :exports code :noweb yes #+EXPORT_SELECT_TAGS: export #+EXPORT_EXCLUDE_TAGS: noexport -#+FILETAGS: :sdp:rel:output: -#+TAGS: assert(a) class(c) debug(d) mixin(m) sdp(s) tangle(T) template(t) WEB(W) noexport(n) +#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n) -- [[./sdp.org][sdp]] [[./][org/]] +- [[./doc_reform.org][doc_reform]] [[./][org/]] -* 0. output hub [#A] :module:sdp:output_hub: +* 0. output hub [#A] :module:doc_reform:output_hub: ** module template -#+BEGIN_SRC d :tangle ../src/sdp/output/hub.d +#+BEGIN_SRC d :tangle ../src/doc_reform/output/hub.d /++ output hub<BR> check & generate output types requested +/ -module sdp.output.hub; +module doc_reform.output.hub; template outputHub() { <<output_imports>> import std.parallelism; @@ -64,14 +63,14 @@ template outputHubOp() { #+name: output_imports #+BEGIN_SRC d -import sdp.output, - sdp.output.epub3, - sdp.output.html, - sdp.output.sqlite, - sdp.output.xmls, - sdp.output.source_sisupod, - sdp.output.create_zip_file, - sdp.output.paths_output; +import doc_reform.output, + doc_reform.output.epub3, + doc_reform.output.html, + doc_reform.output.sqlite, + doc_reform.output.xmls, + doc_reform.output.source_sisupod, + doc_reform.output.create_zip_file, + doc_reform.output.paths_output; #+END_SRC #+name: output_scheduled_task diff --git a/org/output_sisupod.org b/org/output_sisupod.org index d6fbc5d..5022d24 100644 --- a/org/output_sisupod.org +++ b/org/output_sisupod.org @@ -1,8 +1,8 @@ -#+TITLE: sdp output sisupod +#+TITLE: doc_reform output sisupod +#+DESCRIPTION: documents - structuring, publishing in multiple formats & search +#+FILETAGS: :doc_reform:output:sisupod: #+AUTHOR: Ralph Amissah #+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] -#+DESCRIPTION: documents - structuring, publishing in multiple formats & search -#+KEYWORDS #+LANGUAGE: en #+STARTUP: indent content #+OPTIONS: H:3 num:nil toc:t \n:nil @:t ::t |:t ^:nil _:nil -:t f:t *:t <:t @@ -11,17 +11,16 @@ #+PROPERTY: header-args :padline no :exports code :noweb yes #+EXPORT_SELECT_TAGS: export #+EXPORT_EXCLUDE_TAGS: noexport -#+FILETAGS: :sdp:rel:output:sisupod: -#+TAGS: assert(a) class(c) debug(d) mixin(m) sdp(s) tangle(T) template(t) WEB(W) noexport(n) +#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n) -- [[./sdp.org][sdp]] [[./][org/]] +- [[./doc_reform.org][doc_reform]] [[./][org/]] - [[./output_hub.org][output_hub]] -* sisupod :module:sdp:source_sisupod: +* sisupod :module:doc_reform:source_sisupod: ** module template -#+BEGIN_SRC d :tangle ../src/sdp/output/source_sisupod.d -module sdp.output.source_sisupod; +#+BEGIN_SRC d :tangle ../src/doc_reform/output/source_sisupod.d +module doc_reform.output.source_sisupod; template SiSUpod() { <<output_imports>> void SiSUpod(T)(T doc_matters) { @@ -42,7 +41,7 @@ template SiSUpod() { #+name: output_imports #+BEGIN_SRC d -import sdp.output; +import doc_reform.output; import std.digest.sha, std.file, @@ -50,8 +49,8 @@ import std.zip, std.conv : to; import - sdp.output.create_zip_file, - sdp.output.xmls; + doc_reform.output.create_zip_file, + doc_reform.output.xmls; #+END_SRC ** mkdir diff --git a/org/output_sqlite.org b/org/output_sqlite.org index 49cd3f6..fc22089 100644 --- a/org/output_sqlite.org +++ b/org/output_sqlite.org @@ -1,8 +1,8 @@ -#+TITLE: sdp output sqlite +#+TITLE: doc_reform output sqlite +#+DESCRIPTION: documents - structuring, publishing in multiple formats & search +#+FILETAGS: :doc_reform:output:sqlite: #+AUTHOR: Ralph Amissah #+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] -#+DESCRIPTION: documents - structuring, publishing in multiple formats & search -#+KEYWORDS #+LANGUAGE: en #+STARTUP: indent content #+OPTIONS: H:3 num:nil toc:t \n:nil @:t ::t |:t ^:nil _:nil -:t f:t *:t <:t @@ -11,10 +11,9 @@ #+PROPERTY: header-args :padline no :exports code :noweb yes #+EXPORT_SELECT_TAGS: export #+EXPORT_EXCLUDE_TAGS: noexport -#+FILETAGS: :sdp:niu:output: -#+TAGS: assert(a) class(c) debug(d) mixin(m) sdp(s) tangle(T) template(t) WEB(W) noexport(n) +#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n) -- [[./sdp.org][sdp]] [[./][org/]] +- [[./doc_reform.org][doc_reform]] [[./][org/]] - [[./output_hub.org][output_hub]] * sql @@ -23,8 +22,8 @@ *** hub **** collection -#+BEGIN_SRC d :tangle ../src/sdp/output/sqlite.d -module sdp.output.sqlite; +#+BEGIN_SRC d :tangle ../src/doc_reform/output/sqlite.d +module doc_reform.output.sqlite; <<output_imports>> import d2sqlite3; import std.typecons : Nullable; @@ -58,7 +57,7 @@ template SQLiteHubBuildTablesAndPopulate() { **** discrete -#+BEGIN_SRC d :tangle ../src/sdp/output/sqlite.d +#+BEGIN_SRC d :tangle ../src/doc_reform/output/sqlite.d template SQLiteHubDiscreteBuildTablesAndPopulate() { void SQLiteHubDiscreteBuildTablesAndPopulate(D,I)( D doc_abstraction, @@ -86,7 +85,7 @@ template SQLiteHubDiscreteBuildTablesAndPopulate() { *** db run -#+BEGIN_SRC d :tangle ../src/sdp/output/sqlite.d +#+BEGIN_SRC d :tangle ../src/doc_reform/output/sqlite.d template SQLiteDbRun() { void SQLiteDbRun(Db,St,O)( Db db, @@ -124,7 +123,7 @@ template SQLiteDbRun() { *** munge -#+BEGIN_SRC d :tangle ../src/sdp/output/sqlite.d +#+BEGIN_SRC d :tangle ../src/doc_reform/output/sqlite.d template SQLinsertDelimiter() { auto SQLinsertDelimiter(string _txt) { _txt = _txt @@ -152,7 +151,7 @@ template SQLiteFormatAndLoadObject() { *** sqlite instructions **** create -#+BEGIN_SRC d :tangle ../src/sdp/output/sqlite.d +#+BEGIN_SRC d :tangle ../src/doc_reform/output/sqlite.d template SQLiteTablesReCreate() { string SQLiteTablesReCreate()() { string _sql_instruct; @@ -170,7 +169,7 @@ template SQLiteTablesReCreate() { **** delete -#+BEGIN_SRC d :tangle ../src/sdp/output/sqlite.d +#+BEGIN_SRC d :tangle ../src/doc_reform/output/sqlite.d template SQLiteDeleteDocument() { string SQLiteDeleteDocument(I)( I doc_matters, @@ -183,7 +182,7 @@ template SQLiteDeleteDocument() { **** insert -#+BEGIN_SRC d :tangle ../src/sdp/output/sqlite.d +#+BEGIN_SRC d :tangle ../src/doc_reform/output/sqlite.d template SQLiteInsertMetadata() { string SQLiteInsertMetadata(I)( I doc_matters, @@ -196,7 +195,7 @@ template SQLiteInsertMetadata() { **** insert doc objects loop -#+BEGIN_SRC d :tangle ../src/sdp/output/sqlite.d +#+BEGIN_SRC d :tangle ../src/doc_reform/output/sqlite.d template SQLiteInsertDocObjectsLoop() { string SQLiteInsertDocObjectsLoop(D,I)( D doc_abstraction, @@ -214,7 +213,7 @@ template SQLiteInsertDocObjectsLoop() { **** tables create -#+BEGIN_SRC d :tangle ../src/sdp/output/sqlite.d +#+BEGIN_SRC d :tangle ../src/doc_reform/output/sqlite.d template SQLiteTablesCreate() { void SQLiteTablesCreate(E,O)(E env, O opt_action) { import d2sqlite3; @@ -247,7 +246,7 @@ template SQLiteTablesCreate() { **** tables drop -#+BEGIN_SRC d :tangle ../src/sdp/output/sqlite.d +#+BEGIN_SRC d :tangle ../src/doc_reform/output/sqlite.d template SQLiteDbDrop() { void SQLiteDbDrop(O)(O opt_action) { writeln("db drop"); @@ -282,7 +281,7 @@ template SQLiteDbDrop() { _db_statement ~= SQLiteDeleteDocument!()(doc_matters); SQLiteDbRun!()(db, _db_statement, doc_matters.opt.action, "DELETE Document"); } - if (doc_matters.opt.action.sqlite_update) { // sqlite_update is .opt.action sqlite_delete & sqlite_insert (set in sdp) + if (doc_matters.opt.action.sqlite_update) { _db_statement ~= SQLiteDeleteDocument!()(doc_matters); SQLiteDbRun!()(db, _db_statement, doc_matters.opt.action, "DELETE Document"); _db_statement ~= SQLiteInsertMetadata!()(doc_matters); @@ -316,7 +315,7 @@ template SQLiteDbDrop() { #+name: output_imports #+BEGIN_SRC d -import sdp.output; +import doc_reform.output; import std.file, std.conv : to; diff --git a/org/output_xmls.org b/org/output_xmls.org index 6be553f..78f7bfb 100644 --- a/org/output_xmls.org +++ b/org/output_xmls.org @@ -1,8 +1,8 @@ -#+TITLE: sdp output xmls +#+TITLE: doc_reform output xmls +#+DESCRIPTION: documents - structuring, publishing in multiple formats & search +#+FILETAGS: :doc_reform:output:xmls: #+AUTHOR: Ralph Amissah #+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] -#+DESCRIPTION: documents - structuring, publishing in multiple formats & search -#+KEYWORDS #+LANGUAGE: en #+STARTUP: indent content #+OPTIONS: H:3 num:nil toc:t \n:nil @:t ::t |:t ^:nil _:nil -:t f:t *:t <:t @@ -11,18 +11,17 @@ #+PROPERTY: header-args :padline no :exports code :noweb yes #+EXPORT_SELECT_TAGS: export #+EXPORT_EXCLUDE_TAGS: noexport -#+FILETAGS: :sdp:rel:output:xmls: -#+TAGS: assert(a) class(c) debug(d) mixin(m) sdp(s) tangle(T) template(t) WEB(W) noexport(n) +#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n) -- [[./sdp.org][sdp]] [[./][org/]] +- [[./doc_reform.org][doc_reform]] [[./][org/]] - [[./output_hub.org][output_hub]] -* xml offspring (xhtml html epub) :module:sdp:output_xmls: +* xml offspring (xhtml html epub) :module: ** format xhtml objects :format: *** 0. module template -#+BEGIN_SRC d :tangle ../src/sdp/output/xmls.d -module sdp.output.xmls; +#+BEGIN_SRC d :tangle ../src/doc_reform/output/xmls.d +module doc_reform.output.xmls; template outputXHTMLs() { <<output_imports>> mixin SiSUoutputRgxInit; @@ -38,7 +37,7 @@ template outputXHTMLs() { #+name: output_imports #+BEGIN_SRC d -import sdp.output; +import doc_reform.output; import std.digest.sha, std.file, @@ -46,9 +45,9 @@ import std.zip, std.conv : to; import - sdp.output.create_zip_file, - sdp.output.xmls, - sdp.output.xmls_css; + doc_reform.output.create_zip_file, + doc_reform.output.xmls, + doc_reform.output.xmls_css; #+END_SRC *** misc @@ -186,7 +185,7 @@ auto header_metadata(M)( string _date_modified="Date"; string _language="en"; string _rights="Copyright: Copyright (C) year holder"; - string _generator="sdp [SiSU 7.1.8 of 2016w08/5 (2016-02-26)] (n*x and D)"; + string _generator="doc_reform [SiSU 7.1.8 of 2016w08/5 (2016-02-26)] (n*x and D)"; string _generator_home="http://www.sisudoc.org"; string o; o = format(q"¶<!-- SiSU header metadata --> @@ -380,7 +379,7 @@ auto epub3_seg_head(M)( <meta name="dc.date.modified" content="year" /> <meta name="dc.language" content="US" /> <meta name="dc.rights" content="Copyright: Copyright (C) year holder" /> - <meta name="generator" content="sdp [SiSU 7.1.8 of 2016w08/5 (2016-02-26)] (n*x and D)" /> + <meta name="generator" content="doc_reform [SiSU 7.1.8 of 2016w08/5 (2016-02-26)] (n*x and D)" /> <link rel="generator" href="http://www.sisudoc.org/" /> <link rel="shortcut icon" href="../_sisu/image/rb7.ico" /> <link rel="stylesheet" href="css/epub.css" type="text/css" id="main-css" /> @@ -1333,11 +1332,11 @@ auto endnote(O)( } #+END_SRC -* _html_ [#A] :module:sdp:output_html: +* _html_ [#A] :module:doc_reform:output_html: ** module template -#+BEGIN_SRC d :tangle ../src/sdp/output/html.d -module sdp.output.html; +#+BEGIN_SRC d :tangle ../src/doc_reform/output/html.d +module doc_reform.output.html; template outputHTML() { <<output_imports>> mixin outputXHTMLs; @@ -1823,7 +1822,7 @@ void css(M)( } #+END_SRC -** images :images: +** images :images: #+name: copy_html_images #+BEGIN_SRC d @@ -1852,7 +1851,7 @@ void images_cp(M)( } #+END_SRC -* _epub_ [#B] :module:sdp:output_epub3: +* _epub_ [#B] :module:doc_reform:output_epub3: |-----------------------+--------------------------+---------------------------+----------------------------------| | function | filename | module | variable | @@ -1872,8 +1871,8 @@ void images_cp(M)( ** module template -#+BEGIN_SRC d :tangle ../src/sdp/output/epub3.d -module sdp.output.epub3; +#+BEGIN_SRC d :tangle ../src/doc_reform/output/epub3.d +module doc_reform.output.epub3; template outputEPub3() { <<output_imports>> mixin InternalMarkup; diff --git a/org/output_xmls_css.org b/org/output_xmls_css.org index a0511e8..e63ada0 100644 --- a/org/output_xmls_css.org +++ b/org/output_xmls_css.org @@ -1,8 +1,8 @@ -#+TITLE: sdp defaults css +#+TITLE: doc_reform defaults css +#+DESCRIPTION: documents - structuring, publishing in multiple formats & search +#+FILETAGS: :doc_reform:output:xmls:css: #+AUTHOR: Ralph Amissah #+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] -#+DESCRIPTION: documents - structuring, publishing in multiple formats & search -#+KEYWORDS #+LANGUAGE: en #+STARTUP: indent content #+OPTIONS: H:3 num:nil toc:t \n:nil @:t ::t |:t ^:nil _:nil -:t f:t *:t <:t @@ -11,20 +11,19 @@ #+PROPERTY: header-args :padline no :exports code :noweb yes #+EXPORT_SELECT_TAGS: export #+EXPORT_EXCLUDE_TAGS: noexport -#+FILETAGS: :sdp:rel:output: -#+TAGS: assert(a) class(c) debug(d) mixin(m) sdp(s) tangle(T) template(t) WEB(W) noexport(n) +#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n) -- [[./sdp.org][sdp]] [[./][org/]] +- [[./doc_reform.org][doc_reform]] [[./][org/]] - [[./output_hub.org][output_hub]] -* 0. output css defaults :module:sdp:output_xmls_css: +* 0. output css defaults :module:doc_reform:output_xmls_css: ** 0. module template -#+BEGIN_SRC d :tangle ../src/sdp/output/xmls_css.d +#+BEGIN_SRC d :tangle ../src/doc_reform/output/xmls_css.d /++ default css settings +/ -module sdp.output.xmls_css; +module doc_reform.output.xmls_css; template SiSUcss() { auto SiSUcss() { string _css_html_seg=" diff --git a/org/output_zip.org b/org/output_zip.org index 05faf74..43100d6 100644 --- a/org/output_zip.org +++ b/org/output_zip.org @@ -1,4 +1,4 @@ -#+TITLE: sdp output zip +#+TITLE: doc_reform output zip #+AUTHOR: Ralph Amissah #+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] #+DESCRIPTION: documents - structuring, publishing in multiple formats & search @@ -11,17 +11,17 @@ #+PROPERTY: header-args :padline no :exports code :noweb yes #+EXPORT_SELECT_TAGS: export #+EXPORT_EXCLUDE_TAGS: noexport -#+FILETAGS: :sdp:rel:output: -#+TAGS: assert(a) class(c) debug(d) mixin(m) sdp(s) tangle(T) template(t) WEB(W) noexport(n) +#+FILETAGS: :doc_reform:rel:output: +#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n) -- [[./sdp.org][sdp]] [[./][org/]] +- [[./doc_reform.org][doc_reform]] [[./][org/]] - [[./output_hub.org][output_hub]] -* _zip_ :module:sdp:create_zip_file: +* _zip_ :module:doc_reform:create_zip_file: ** module template -#+BEGIN_SRC d :tangle ../src/sdp/output/create_zip_file.d -module sdp.output.create_zip_file; +#+BEGIN_SRC d :tangle ../src/doc_reform/output/create_zip_file.d +module doc_reform.output.create_zip_file; template createZipFile() { import std.file; import std.outbuffer; diff --git a/org/source_files_read.org b/org/source_files_read.org index 8f5430a..db066fe 100644 --- a/org/source_files_read.org +++ b/org/source_files_read.org @@ -1,8 +1,8 @@ -#+TITLE: sdp markup source raw +#+TITLE: doc_reform markup source raw +#+DESCRIPTION: documents - structuring, publishing in multiple formats & search +#+FILETAGS: :doc_reform:sourcefile:read: #+AUTHOR: Ralph Amissah #+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] -#+DESCRIPTION: documents - structuring, publishing in multiple formats & search -#+KEYWORDS #+LANGUAGE: en #+STARTUP: indent content #+OPTIONS: H:3 num:nil toc:t \n:nil @:t ::t |:t ^:nil _:nil -:t f:t *:t <:t @@ -11,31 +11,30 @@ #+PROPERTY: header-args :padline no :exports code :noweb yes #+EXPORT_SELECT_TAGS: export #+EXPORT_EXCLUDE_TAGS: noexport -#+FILETAGS: :sdp:rel:meta:read:file -#+TAGS: assert(a) class(c) debug(d) mixin(m) sdp(s) tangle(T) template(t) WEB(W) noexport(n) +#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n) -[[./sdp.org][sdp]] [[./][org/]] +[[./doc_reform.org][doc_reform]] [[./][org/]] * imports #+name: imports_std #+BEGIN_SRC d import - sdp.meta, - sdp.source.paths_source, + doc_reform.meta, + doc_reform.source.paths_source, std.file, std.path; #+END_SRC -* A. get _config file_ (read in) :module:sdp:source_read_config_files: +* A. get _config file_ (read in) :module:config_files: ** 0. module template -#+BEGIN_SRC d :tangle ../src/sdp/source/read_config_files.d +#+BEGIN_SRC d :tangle ../src/doc_reform/source/read_config_files.d /++ read configuration files<BR> - read config files<BR> meta_config_files.d +/ -module sdp.source.read_config_files; +module doc_reform.source.read_config_files; <<meta_config_file_in>> <<meta_config_file_toml>> <<meta_config_file_hub>> @@ -264,19 +263,19 @@ static template configReadDocTOML() { } #+END_SRC -* B. get _markup source_, read file :module:sdp:source_read_source_files: +* B. get _markup source_, read file :module:source_files: ** 0. module template (includes tuple) -#+BEGIN_SRC d :tangle ../src/sdp/source/read_source_files.d +#+BEGIN_SRC d :tangle ../src/doc_reform/source/read_source_files.d /++ module source_read_source_files;<BR> - open markup files<BR> - if master file scan for addional files to import/insert +/ -module sdp.source.read_source_files; +module doc_reform.source.read_source_files; static template SiSUrawMarkupContent() { import - sdp.meta.rgx; + doc_reform.meta.rgx; <<imports_std>> mixin SiSUrgxInit; static auto rgx = Rgx(); @@ -503,7 +502,7 @@ final char[][] getInsertMarkupSourceContentRawLineArray( #+END_SRC ** get markup source, master file & inserts :masterfile:inserts: -[[./sdp.org][sdp]] [[./][org/]] +[[./doc_reform.org][doc_reform]] [[./][org/]] *** scan inserts (sub-document) source :scan_insert_src: **** scan subdoc source @@ -567,9 +566,8 @@ if (type1["curly_code"] == 1) { auto markup_sourcesubfile_insert_content = raw.getInsertMarkupSourceContentRawLineArray(fn_src_insert, rgx.src_fn_find_inserts); debug(insert_file) { - tell_l("red", line); - tell_l("red", fn_src_insert); - tell_l("fuchsia", "ERROR"); + writeln(line); + writeln(fn_src_insert); writeln( " length contents insert array: ", markup_sourcesubfile_insert_content.length @@ -658,8 +656,8 @@ if (type["curly_code"] == 1) { auto markup_sourcefile_insert_content = raw.getInsertMarkupSourceContentRawLineArray(fn_src_insert, rgx.src_fn_find_inserts); debug(insert_file) { - tell_l("red", line); - tell_l("red", fn_src_insert); + writeln(line); + writeln(fn_src_insert); writeln( " length contents insert array: ", markup_sourcefile_insert_content.length diff --git a/src/sdp/conf/compile_time_info.d b/src/doc_reform/conf/compile_time_info.d index 80f6e33..0e09edd 100644 --- a/src/sdp/conf/compile_time_info.d +++ b/src/doc_reform/conf/compile_time_info.d @@ -1,7 +1,7 @@ /++ compile_time_info +/ -module sdp.conf.compile_time_info; +module doc_reform.conf.compile_time_info; template CompileTimeInfo() { version(Windows) { pragma(msg, "[ Windows compilation ]"); diff --git a/src/sdp/sdp.d b/src/doc_reform/doc_reform.d index a135423..f7c9751 100755 --- a/src/sdp/sdp.d +++ b/src/doc_reform/doc_reform.d @@ -1,33 +1,33 @@ #!/usr/bin/env rdmd -module sdp.sisu_document_parser; +module doc_reform.sisu_document_parser; import - sdp.conf.compile_time_info, - sdp.meta.metadoc; + doc_reform.conf.compile_time_info, + doc_reform.meta.metadoc; import std.getopt, std.file, std.path, std.process; import - sdp.meta, - sdp.meta.metadoc_summary, - sdp.meta.metadoc_from_src, - sdp.meta.conf_make_meta_structs, - sdp.meta.conf_make_meta_toml, - sdp.meta.conf_make_meta_json, - sdp.meta.defaults, - sdp.meta.doc_debugs, - sdp.meta.rgx, - sdp.source.paths_source, - sdp.source.read_config_files, - sdp.source.read_source_files, - sdp.output.hub; + doc_reform.meta, + doc_reform.meta.metadoc_summary, + doc_reform.meta.metadoc_from_src, + doc_reform.meta.conf_make_meta_structs, + doc_reform.meta.conf_make_meta_toml, + doc_reform.meta.conf_make_meta_json, + doc_reform.meta.defaults, + doc_reform.meta.doc_debugs, + doc_reform.meta.rgx, + doc_reform.source.paths_source, + doc_reform.source.read_config_files, + doc_reform.source.read_source_files, + doc_reform.output.hub; import std.algorithm; import std.parallelism; mixin(import("version.txt")); mixin CompileTimeInfo; /++ -name "sdp" +name "doc_reform" description "A SiSU inspired document parser writen in D." homepage "http://sisudoc.org" +/ @@ -44,7 +44,7 @@ void main(string[] args) { scope(success) { debug(checkdoc) { writefln( - "~ run complete, ok ~ (sdp-%s.%s.%s, %s D:%s, %s %s)", + "~ run complete, ok ~ (doc_reform-%s.%s.%s, %s D:%s, %s %s)", ver.major, ver.minor, ver.patch, __VENDOR__, __VERSION__, bits, os, diff --git a/src/sdp/meta/conf_make_meta_json.d b/src/doc_reform/meta/conf_make_meta_json.d index dbba9af..d6adfa7 100644 --- a/src/sdp/meta/conf_make_meta_json.d +++ b/src/doc_reform/meta/conf_make_meta_json.d @@ -2,7 +2,7 @@ json headers<BR> extract json header return json +/ -module sdp.meta.conf_make_meta_json; +module doc_reform.meta.conf_make_meta_json; static template contentJSONtoSiSUstruct() { import std.exception, @@ -14,9 +14,9 @@ static template contentJSONtoSiSUstruct() { std.utf, std.conv : to; import - sdp.meta.conf_make_meta_structs, - sdp.meta.conf_make_meta_json, - sdp.meta.rgx; + doc_reform.meta.conf_make_meta_structs, + doc_reform.meta.conf_make_meta_json, + doc_reform.meta.rgx; ConfCompositePlus _struct_composite; auto contentJSONtoSiSUstruct(C, J)(C _struct_composite, J _json, string _identifier) { mixin SiSUrgxInit; diff --git a/src/sdp/meta/conf_make_meta_structs.d b/src/doc_reform/meta/conf_make_meta_structs.d index b67b9ad..cf279a5 100644 --- a/src/sdp/meta/conf_make_meta_structs.d +++ b/src/doc_reform/meta/conf_make_meta_structs.d @@ -1,4 +1,4 @@ -module sdp.meta.conf_make_meta_structs; +module doc_reform.meta.conf_make_meta_structs; import std.exception, std.json, @@ -10,8 +10,8 @@ import std.utf, std.conv : to; import - sdp.meta.defaults, - sdp.meta.rgx; + doc_reform.meta.defaults, + doc_reform.meta.rgx; mixin SiSUrgxInit; static auto _rgx = Rgx(); mixin InternalMarkup; @@ -47,9 +47,9 @@ struct ConfCompositeMakeStr { string[] footer; string[] headings; string[] home_button_image; - string home_button_text = "{SiSU}http://www.sisudoc.org;" - ~ " {www.sisudoc.org}http://www.sisudoc.org;" - ~ " {sources / git}http://git.sisudoc.org/gitweb/"; + string home_button_text = "{Doc Reform}http://www.doc-reform.org;" + ~ " {www.doc-reform.org}http://www.doc-reform.org;" + ~ " {sources / git}https://git.doc-reform.org/software/doc-reform"; string italics; string auto_num_top_at_level; int auto_num_top_lv = 9; @@ -130,9 +130,9 @@ struct ConfCompositeMakeInit { string[] footer; string[] headings; string[] home_button_image; - string home_button_text = "{SiSU}http://www.sisudoc.org;" - ~ " {www.sisudoc.org}http://www.sisudoc.org;" - ~ " {sources / git}http://git.sisudoc.org/gitweb/"; + string home_button_text = "{Doc Reform}http://www.doc-reform.org;" + ~ " {www.doc-reform.org}http://www.doc-reform.org;" + ~ " {sources / git}https://git.doc-reform.org/software/doc-reform"; string[] italics; string auto_num_top_at_level; int auto_num_top_lv = 9; diff --git a/src/sdp/meta/conf_make_meta_toml.d b/src/doc_reform/meta/conf_make_meta_toml.d index d434f00..d308ae4 100644 --- a/src/sdp/meta/conf_make_meta_toml.d +++ b/src/doc_reform/meta/conf_make_meta_toml.d @@ -8,7 +8,7 @@ converting the metadata and make instructions to a common json format used by program internally. Moved to associative array. +/ -module sdp.meta.conf_make_meta_toml; +module doc_reform.meta.conf_make_meta_toml; static template configParseTOMLreturnJSON() { import toml, @@ -27,8 +27,8 @@ static template configParseTOMLreturnSiSUstruct() { toml, toml.json; import - sdp.meta.conf_make_meta_structs, - sdp.meta.conf_make_meta_json; + doc_reform.meta.conf_make_meta_structs, + doc_reform.meta.conf_make_meta_json; mixin contentJSONtoSiSUstruct; auto configParseTOMLreturnSiSUstruct(CCm, T)( CCm _make_and_meta_struct, @@ -53,9 +53,9 @@ static template docHeaderMakeAndMetaTupTomlExtractAndConvertToStruct() { toml, toml.json; import - sdp.meta.conf_make_meta_structs, - sdp.meta.conf_make_meta_json, - sdp.meta.rgx; + doc_reform.meta.conf_make_meta_structs, + doc_reform.meta.conf_make_meta_json, + doc_reform.meta.rgx; mixin SiSUrgxInit; mixin contentJSONtoSiSUstruct; static auto rgx = Rgx(); diff --git a/src/sdp/meta/defaults.d b/src/doc_reform/meta/defaults.d index 70089e5..2f8c068 100644 --- a/src/sdp/meta/defaults.d +++ b/src/doc_reform/meta/defaults.d @@ -1,7 +1,7 @@ /++ default settings +/ -module sdp.meta.defaults; +module doc_reform.meta.defaults; template SiSUrgxInitFlags() { /+ regex flags +/ static int[string] flags_type_init() { diff --git a/src/sdp/meta/doc_debugs.d b/src/doc_reform/meta/doc_debugs.d index 73b0f3b..04dedb2 100644 --- a/src/sdp/meta/doc_debugs.d +++ b/src/doc_reform/meta/doc_debugs.d @@ -1,11 +1,11 @@ /++ output debugs +/ -module sdp.meta.doc_debugs; +module doc_reform.meta.doc_debugs; template SiSUdebugs() { import - sdp.meta.defaults, - sdp.meta.rgx; + doc_reform.meta.defaults, + doc_reform.meta.rgx; import std.algorithm, std.array, diff --git a/src/sdp/meta/metadoc.d b/src/doc_reform/meta/metadoc.d index 5821096..7c0e90d 100644 --- a/src/sdp/meta/metadoc.d +++ b/src/doc_reform/meta/metadoc.d @@ -1,4 +1,4 @@ -module sdp.meta.metadoc; +module doc_reform.meta.metadoc; template SiSUabstraction() { import std.getopt, @@ -6,19 +6,19 @@ template SiSUabstraction() { std.path, std.process; import - sdp.meta, - sdp.meta.metadoc_summary, - sdp.meta.metadoc_from_src, - sdp.meta.conf_make_meta_structs, - sdp.meta.conf_make_meta_toml, - sdp.meta.conf_make_meta_json, - sdp.meta.defaults, - sdp.meta.doc_debugs, - sdp.meta.rgx, - sdp.source.paths_source, - sdp.source.read_config_files, - sdp.source.read_source_files, - sdp.output.hub; + doc_reform.meta, + doc_reform.meta.metadoc_summary, + doc_reform.meta.metadoc_from_src, + doc_reform.meta.conf_make_meta_structs, + doc_reform.meta.conf_make_meta_toml, + doc_reform.meta.conf_make_meta_json, + doc_reform.meta.defaults, + doc_reform.meta.doc_debugs, + doc_reform.meta.rgx, + doc_reform.source.paths_source, + doc_reform.source.read_config_files, + doc_reform.source.read_source_files, + doc_reform.output.hub; mixin SiSUrgxInit; mixin contentJSONtoSiSUstruct; mixin SiSUbiblio; diff --git a/src/sdp/meta/metadoc_from_src.d b/src/doc_reform/meta/metadoc_from_src.d index 1a568dd..c4a12bb 100644 --- a/src/sdp/meta/metadoc_from_src.d +++ b/src/doc_reform/meta/metadoc_from_src.d @@ -3,10 +3,10 @@ abstraction of sisu markup for downstream processing metadoc_from_src.d +/ -module sdp.meta.metadoc_from_src; +module doc_reform.meta.metadoc_from_src; template SiSUdocAbstraction() { /+ ↓ abstraction imports +/ - import sdp.meta; + import doc_reform.meta; import std.algorithm, std.container, @@ -14,9 +14,9 @@ template SiSUdocAbstraction() { std.json, std.path; import - sdp.meta.defaults, - sdp.meta.object_setter, - sdp.meta.rgx; + doc_reform.meta.defaults, + doc_reform.meta.object_setter, + doc_reform.meta.rgx; /+ ↓ abstraction mixins +/ mixin ObjectSetter; mixin InternalMarkup; @@ -854,7 +854,7 @@ template SiSUdocAbstraction() { segment_anchor_tag_that_object_belongs_to = anchor_tag_; segment_anchor_tag_that_object_belongs_to_uri = anchor_tag_ ~ ".fnSuffix#" ~ obj_cite_digits.on.to!string; } else if (an_object["lev_markup_number"].to!int < 4) { - string segn; + string segn; switch (an_object["lev_markup_number"].to!int) { case 0: segn = "_the_title"; @@ -1732,7 +1732,7 @@ template SiSUdocAbstraction() { if (obj.metainfo.heading_lev_markup == 4) { obj.tags.segname_next = html_segnames[obj.ptr.html_segnames + 1]; assert(obj.tags.segment_anchor_tag == html_segnames[obj.ptr.html_segnames], - obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]); + obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]); } } /+ dom structure (marked up & collapsed) +/ @@ -1761,7 +1761,7 @@ template SiSUdocAbstraction() { if (obj.metainfo.heading_lev_markup == 4) { obj.tags.segname_next = html_segnames[obj.ptr.html_segnames + 1]; assert(obj.tags.segment_anchor_tag == html_segnames[obj.ptr.html_segnames], - obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]); + obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]); } } if ((opt_action.html) @@ -1791,7 +1791,7 @@ template SiSUdocAbstraction() { obj.tags.segname_next = html_segnames[obj.ptr.html_segnames + 1]; } assert(obj.tags.segment_anchor_tag == html_segnames[obj.ptr.html_segnames], - obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]); + obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]); } } /+ dom structure (marked up & collapsed) +/ @@ -1833,7 +1833,7 @@ template SiSUdocAbstraction() { obj.tags.segname_next = html_segnames[obj.ptr.html_segnames + 1]; } assert(obj.tags.segment_anchor_tag == html_segnames[obj.ptr.html_segnames], - obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]); + obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]); } } /+ dom structure (marked up & collapsed) +/ @@ -1867,7 +1867,7 @@ template SiSUdocAbstraction() { obj.tags.segname_next = html_segnames[obj.ptr.html_segnames + 1]; } assert(obj.tags.segment_anchor_tag == html_segnames[obj.ptr.html_segnames], - obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]); + obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]); } } /+ dom structure (marked up & collapsed) +/ @@ -1904,7 +1904,7 @@ template SiSUdocAbstraction() { obj.tags.segname_next = html_segnames[obj.ptr.html_segnames + 1]; } assert(obj.tags.segment_anchor_tag == html_segnames[obj.ptr.html_segnames], - obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]); + obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]); } } /+ dom structure (marked up & collapsed) +/ @@ -1946,7 +1946,7 @@ template SiSUdocAbstraction() { obj.tags.segname_next = html_segnames[obj.ptr.html_segnames + 1]; } assert(obj.tags.segment_anchor_tag == html_segnames[obj.ptr.html_segnames], - obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]); + obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]); } } /+ dom structure (marked up & collapsed) +/ @@ -1984,7 +1984,7 @@ template SiSUdocAbstraction() { obj.tags.segname_next = html_segnames[obj.ptr.html_segnames + 1]; } assert(obj.tags.segment_anchor_tag == html_segnames[obj.ptr.html_segnames], - obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]); + obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]); } } /+ dom structure (marked up & collapsed) +/ @@ -2026,7 +2026,7 @@ template SiSUdocAbstraction() { obj.tags.segname_next = html_segnames[obj.ptr.html_segnames + 1]; } assert(obj.tags.segment_anchor_tag == html_segnames[obj.ptr.html_segnames], - obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]); + obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]); } } /+ dom structure (marked up & collapsed) +/ diff --git a/src/sdp/meta/metadoc_summary.d b/src/doc_reform/meta/metadoc_summary.d index 2ac2454..f2e0632 100644 --- a/src/sdp/meta/metadoc_summary.d +++ b/src/doc_reform/meta/metadoc_summary.d @@ -1,12 +1,12 @@ -module sdp.meta.metadoc_summary; +module doc_reform.meta.metadoc_summary; template SiSUabstractionSummary() { auto SiSUabstractionSummary(S,T)( auto ref const S doc_abstraction, auto ref T doc_matters, ) { import - sdp.meta.defaults, - sdp.meta.rgx; + doc_reform.meta.defaults, + doc_reform.meta.rgx; import std.array, std.exception, diff --git a/src/sdp/meta/object_setter.d b/src/doc_reform/meta/object_setter.d index fc0781e..f481ec1 100644 --- a/src/sdp/meta/object_setter.d +++ b/src/doc_reform/meta/object_setter.d @@ -3,7 +3,7 @@ setting of sisu objects for downstream processing meta_object_setter.d +/ -module sdp.meta.object_setter; +module doc_reform.meta.object_setter; template ObjectSetter() { /+ structs +/ struct DocObj_MetaInfo_ { diff --git a/src/sdp/meta/package.d b/src/doc_reform/meta/package.d index fcc6b13..2981b6a 100644 --- a/src/sdp/meta/package.d +++ b/src/doc_reform/meta/package.d @@ -1,7 +1,7 @@ -module sdp.meta; +module doc_reform.meta; public import - sdp.meta.defaults, - sdp.meta.rgx; + doc_reform.meta.defaults, + doc_reform.meta.rgx; /+ std +/ public import std.array, diff --git a/src/sdp/meta/rgx.d b/src/doc_reform/meta/rgx.d index b64f7ba..63bb4ee 100644 --- a/src/sdp/meta/rgx.d +++ b/src/doc_reform/meta/rgx.d @@ -1,9 +1,9 @@ /++ regex: regular expressions used in sisu document parser +/ -module sdp.meta.rgx; +module doc_reform.meta.rgx; static template SiSUrgxInit() { - import sdp.meta.defaults; + import doc_reform.meta.defaults; static struct Rgx { /+ misc +/ static true_dollar = ctRegex!(`\$`, "gm"); diff --git a/src/sdp/output/create_zip_file.d b/src/doc_reform/output/create_zip_file.d index 5380744..fa752ad 100644 --- a/src/sdp/output/create_zip_file.d +++ b/src/doc_reform/output/create_zip_file.d @@ -1,4 +1,4 @@ -module sdp.output.create_zip_file; +module doc_reform.output.create_zip_file; template createZipFile() { import std.file; import std.outbuffer; diff --git a/src/sdp/output/defaults.d b/src/doc_reform/output/defaults.d index 0d215c7..97ba691 100644 --- a/src/sdp/output/defaults.d +++ b/src/doc_reform/output/defaults.d @@ -1,7 +1,7 @@ /++ default settings +/ -module sdp.output.defaults; +module doc_reform.output.defaults; template InternalMarkup() { import std.array; diff --git a/src/sdp/output/epub3.d b/src/doc_reform/output/epub3.d index 52e3ce2..45e632a 100644 --- a/src/sdp/output/epub3.d +++ b/src/doc_reform/output/epub3.d @@ -1,6 +1,6 @@ -module sdp.output.epub3; +module doc_reform.output.epub3; template outputEPub3() { - import sdp.output; + import doc_reform.output; import std.digest.sha, std.file, @@ -8,9 +8,9 @@ template outputEPub3() { std.zip, std.conv : to; import - sdp.output.create_zip_file, - sdp.output.xmls, - sdp.output.xmls_css; + doc_reform.output.create_zip_file, + doc_reform.output.xmls, + doc_reform.output.xmls_css; mixin InternalMarkup; mixin outputXHTMLs; string epub3_mimetypes() { diff --git a/src/sdp/output/html.d b/src/doc_reform/output/html.d index f1c25e8..07fe081 100644 --- a/src/sdp/output/html.d +++ b/src/doc_reform/output/html.d @@ -1,6 +1,6 @@ -module sdp.output.html; +module doc_reform.output.html; template outputHTML() { - import sdp.output; + import doc_reform.output; import std.digest.sha, std.file, @@ -8,9 +8,9 @@ template outputHTML() { std.zip, std.conv : to; import - sdp.output.create_zip_file, - sdp.output.xmls, - sdp.output.xmls_css; + doc_reform.output.create_zip_file, + doc_reform.output.xmls, + doc_reform.output.xmls_css; mixin outputXHTMLs; void scroll(D,I)( const D doc_abstraction, diff --git a/src/sdp/output/hub.d b/src/doc_reform/output/hub.d index a95c348..b40c929 100644 --- a/src/sdp/output/hub.d +++ b/src/doc_reform/output/hub.d @@ -2,16 +2,16 @@ output hub<BR> check & generate output types requested +/ -module sdp.output.hub; +module doc_reform.output.hub; template outputHub() { - import sdp.output, - sdp.output.epub3, - sdp.output.html, - sdp.output.sqlite, - sdp.output.xmls, - sdp.output.source_sisupod, - sdp.output.create_zip_file, - sdp.output.paths_output; + import doc_reform.output, + doc_reform.output.epub3, + doc_reform.output.html, + doc_reform.output.sqlite, + doc_reform.output.xmls, + doc_reform.output.source_sisupod, + doc_reform.output.create_zip_file, + doc_reform.output.paths_output; import std.parallelism; void outputHub(D,I)(D doc_abstraction, I doc_matters) { mixin SiSUoutputRgxInit; @@ -73,14 +73,14 @@ template outputHub() { } } template outputHubOp() { - import sdp.output, - sdp.output.epub3, - sdp.output.html, - sdp.output.sqlite, - sdp.output.xmls, - sdp.output.source_sisupod, - sdp.output.create_zip_file, - sdp.output.paths_output; + import doc_reform.output, + doc_reform.output.epub3, + doc_reform.output.html, + doc_reform.output.sqlite, + doc_reform.output.xmls, + doc_reform.output.source_sisupod, + doc_reform.output.create_zip_file, + doc_reform.output.paths_output; void outputHubOp(E,O)(E env, O opt_action) { mixin SiSUoutputRgxInit; static auto rgx = Rgx(); diff --git a/src/sdp/output/package.d b/src/doc_reform/output/package.d index 40b4c20..5e14e8a 100644 --- a/src/sdp/output/package.d +++ b/src/doc_reform/output/package.d @@ -1,4 +1,4 @@ -module sdp.output; +module doc_reform.output; public import std.algorithm, std.array, @@ -15,8 +15,8 @@ public import // std.uni, std.utf; public import - sdp.share.defaults, - sdp.source.paths_source, - sdp.output.defaults, - sdp.output.paths_output, - sdp.output.rgx; + doc_reform.share.defaults, + doc_reform.source.paths_source, + doc_reform.output.defaults, + doc_reform.output.paths_output, + doc_reform.output.rgx; diff --git a/src/sdp/output/paths_output.d b/src/doc_reform/output/paths_output.d index 112f47c..abd21b6 100644 --- a/src/sdp/output/paths_output.d +++ b/src/doc_reform/output/paths_output.d @@ -1,12 +1,12 @@ /++ default settings +/ -module sdp.output.paths_output; +module doc_reform.output.paths_output; import std.array, std.path, std.regex, std.stdio; -import sdp.meta.rgx; +import doc_reform.meta.rgx; template SiSUoutPaths() { auto SiSUoutPaths(Po,Lng)( Po output_pth_root, diff --git a/src/sdp/output/rgx.d b/src/doc_reform/output/rgx.d index a62791c..0d23f11 100644 --- a/src/sdp/output/rgx.d +++ b/src/doc_reform/output/rgx.d @@ -1,9 +1,9 @@ /++ regex: regular expressions used in sisu document parser +/ -module sdp.output.rgx; +module doc_reform.output.rgx; static template SiSUoutputRgxInit() { - import sdp.output.defaults; + import doc_reform.output.defaults; static struct Rgx { static newline = ctRegex!("\n", "mg"); static strip_br = ctRegex!("^<br>\n|<br>\n*$"); diff --git a/src/sdp/output/source_sisupod.d b/src/doc_reform/output/source_sisupod.d index 44cf56b..fa041fd 100644 --- a/src/sdp/output/source_sisupod.d +++ b/src/doc_reform/output/source_sisupod.d @@ -1,6 +1,6 @@ -module sdp.output.source_sisupod; +module doc_reform.output.source_sisupod; template SiSUpod() { - import sdp.output; + import doc_reform.output; import std.digest.sha, std.file, @@ -8,8 +8,8 @@ template SiSUpod() { std.zip, std.conv : to; import - sdp.output.create_zip_file, - sdp.output.xmls; + doc_reform.output.create_zip_file, + doc_reform.output.xmls; void SiSUpod(T)(T doc_matters) { debug(asserts) { // static assert(is(typeof(doc_matters) == tuple)); diff --git a/src/sdp/output/sqlite.d b/src/doc_reform/output/sqlite.d index 82484e5..a765fd7 100644 --- a/src/sdp/output/sqlite.d +++ b/src/doc_reform/output/sqlite.d @@ -1,5 +1,5 @@ -module sdp.output.sqlite; -import sdp.output; +module doc_reform.output.sqlite; +import doc_reform.output; import std.file, std.conv : to; @@ -35,7 +35,7 @@ template SQLiteHubBuildTablesAndPopulate() { _db_statement ~= SQLiteDeleteDocument!()(doc_matters); SQLiteDbRun!()(db, _db_statement, doc_matters.opt.action, "DELETE Document"); } - if (doc_matters.opt.action.sqlite_update) { // sqlite_update is .opt.action sqlite_delete & sqlite_insert (set in sdp) + if (doc_matters.opt.action.sqlite_update) { _db_statement ~= SQLiteDeleteDocument!()(doc_matters); SQLiteDbRun!()(db, _db_statement, doc_matters.opt.action, "DELETE Document"); _db_statement ~= SQLiteInsertMetadata!()(doc_matters); diff --git a/src/sdp/output/xmls.d b/src/doc_reform/output/xmls.d index 32b46e5..8428204 100644 --- a/src/sdp/output/xmls.d +++ b/src/doc_reform/output/xmls.d @@ -1,6 +1,6 @@ -module sdp.output.xmls; +module doc_reform.output.xmls; template outputXHTMLs() { - import sdp.output; + import doc_reform.output; import std.digest.sha, std.file, @@ -8,9 +8,9 @@ template outputXHTMLs() { std.zip, std.conv : to; import - sdp.output.create_zip_file, - sdp.output.xmls, - sdp.output.xmls_css; + doc_reform.output.create_zip_file, + doc_reform.output.xmls, + doc_reform.output.xmls_css; mixin SiSUoutputRgxInit; struct outputXHTMLs { static auto rgx = Rgx(); @@ -114,7 +114,7 @@ template outputXHTMLs() { string _date_modified="Date"; string _language="en"; string _rights="Copyright: Copyright (C) year holder"; - string _generator="sdp [SiSU 7.1.8 of 2016w08/5 (2016-02-26)] (n*x and D)"; + string _generator="doc_reform [SiSU 7.1.8 of 2016w08/5 (2016-02-26)] (n*x and D)"; string _generator_home="http://www.sisudoc.org"; string o; o = format(q"¶<!-- SiSU header metadata --> @@ -284,7 +284,7 @@ template outputXHTMLs() { <meta name="dc.date.modified" content="year" /> <meta name="dc.language" content="US" /> <meta name="dc.rights" content="Copyright: Copyright (C) year holder" /> - <meta name="generator" content="sdp [SiSU 7.1.8 of 2016w08/5 (2016-02-26)] (n*x and D)" /> + <meta name="generator" content="doc_reform [SiSU 7.1.8 of 2016w08/5 (2016-02-26)] (n*x and D)" /> <link rel="generator" href="http://www.sisudoc.org/" /> <link rel="shortcut icon" href="../_sisu/image/rb7.ico" /> <link rel="stylesheet" href="css/epub.css" type="text/css" id="main-css" /> diff --git a/src/sdp/output/xmls_css.d b/src/doc_reform/output/xmls_css.d index dc8d274..f3c0545 100644 --- a/src/sdp/output/xmls_css.d +++ b/src/doc_reform/output/xmls_css.d @@ -1,7 +1,7 @@ /++ default css settings +/ -module sdp.output.xmls_css; +module doc_reform.output.xmls_css; template SiSUcss() { auto SiSUcss() { string _css_html_seg=" diff --git a/src/sdp/share/defaults.d b/src/doc_reform/share/defaults.d index ed76846..ee0dbcb 100644 --- a/src/sdp/share/defaults.d +++ b/src/doc_reform/share/defaults.d @@ -1,7 +1,7 @@ /++ shared default settings +/ -module sdp.share.defaults; +module doc_reform.share.defaults; template Msg() { import std.stdio; auto Msg(I)(I doc_matters) { diff --git a/src/sdp/source/paths_source.d b/src/doc_reform/source/paths_source.d index 462fc85..dc2928f 100644 --- a/src/sdp/source/paths_source.d +++ b/src/doc_reform/source/paths_source.d @@ -3,14 +3,14 @@ - read config files<BR> meta_config_files.d +/ -module sdp.source.paths_source; +module doc_reform.source.paths_source; import std.array, std.file, std.path, std.regex, std.stdio, std.conv : to; -import sdp.meta.rgx; +import doc_reform.meta.rgx; template PodManifest() { mixin SiSUrgxInit; static auto rgx = Rgx(); diff --git a/src/sdp/source/read_config_files.d b/src/doc_reform/source/read_config_files.d index 7e6221e..fc5ce2f 100644 --- a/src/sdp/source/read_config_files.d +++ b/src/doc_reform/source/read_config_files.d @@ -3,11 +3,11 @@ - read config files<BR> meta_config_files.d +/ -module sdp.source.read_config_files; +module doc_reform.source.read_config_files; static template configReadInSiteTOML() { import - sdp.meta, - sdp.source.paths_source, + doc_reform.meta, + doc_reform.source.paths_source, std.file, std.path; final string configReadInSiteTOML(M,E)(M manifest, E env) { @@ -41,8 +41,8 @@ static template configReadInSiteTOML() { } static template configReadInDocTOML() { import - sdp.meta, - sdp.source.paths_source, + doc_reform.meta, + doc_reform.source.paths_source, std.file, std.path; final string configReadInDocTOML(M,E)(M manifest, E env) { @@ -77,8 +77,8 @@ static template configReadInDocTOML() { static template configTOML() { import toml; // import - sdp.meta, - sdp.source.paths_source, + doc_reform.meta, + doc_reform.source.paths_source, std.file, std.path; auto configTOML(string configuration, string conf_toml_filename) { @@ -94,8 +94,8 @@ static template configTOML() { } static template readConfigSite() { import - sdp.meta, - sdp.source.paths_source, + doc_reform.meta, + doc_reform.source.paths_source, std.file, std.path; final auto readConfigSite(M,E)(M _manifest, E _env) { @@ -141,8 +141,8 @@ static template readConfigSite() { } static template readConfigDoc() { import - sdp.meta, - sdp.source.paths_source, + doc_reform.meta, + doc_reform.source.paths_source, std.file, std.path; final auto readConfigDoc(M,E)(M _manifest, E _env) { @@ -188,8 +188,8 @@ static template readConfigDoc() { } static template configReadSiteTOML() { import - sdp.meta, - sdp.source.paths_source, + doc_reform.meta, + doc_reform.source.paths_source, std.file, std.path; import toml; @@ -203,8 +203,8 @@ static template configReadSiteTOML() { } static template configReadDocTOML() { import - sdp.meta, - sdp.source.paths_source, + doc_reform.meta, + doc_reform.source.paths_source, std.file, std.path; import toml; diff --git a/src/sdp/source/read_source_files.d b/src/doc_reform/source/read_source_files.d index 271adfa..294b081 100644 --- a/src/sdp/source/read_source_files.d +++ b/src/doc_reform/source/read_source_files.d @@ -3,13 +3,13 @@ - open markup files<BR> - if master file scan for addional files to import/insert +/ -module sdp.source.read_source_files; +module doc_reform.source.read_source_files; static template SiSUrawMarkupContent() { import - sdp.meta.rgx; + doc_reform.meta.rgx; import - sdp.meta, - sdp.source.paths_source, + doc_reform.meta, + doc_reform.source.paths_source, std.file, std.path; mixin SiSUrgxInit; @@ -210,9 +210,8 @@ static template SiSUrawMarkupContent() { auto markup_sourcesubfile_insert_content = raw.getInsertMarkupSourceContentRawLineArray(fn_src_insert, rgx.src_fn_find_inserts); debug(insert_file) { - tell_l("red", line); - tell_l("red", fn_src_insert); - tell_l("fuchsia", "ERROR"); + writeln(line); + writeln(fn_src_insert); writeln( " length contents insert array: ", markup_sourcesubfile_insert_content.length @@ -292,8 +291,8 @@ static template SiSUrawMarkupContent() { auto markup_sourcefile_insert_content = raw.getInsertMarkupSourceContentRawLineArray(fn_src_insert, rgx.src_fn_find_inserts); debug(insert_file) { - tell_l("red", line); - tell_l("red", fn_src_insert); + writeln(line); + writeln(fn_src_insert); writeln( " length contents insert array: ", markup_sourcefile_insert_content.length diff --git a/views/version.txt b/views/version.txt index cff6a53..7b7290d 100644 --- a/views/version.txt +++ b/views/version.txt @@ -4,7 +4,7 @@ struct Version { int minor; int patch; } -enum ver = Version(0, 27, 1); +enum ver = Version(0, 1, 0); version (Posix) { version (DigitalMars) { } else version (LDC) { |