diff options
| author | Ralph Amissah <ralph.amissah@gmail.com> | 2019-11-14 21:23:31 -0500 |
|---|---|---|
| committer | Ralph Amissah <ralph.amissah@gmail.com> | 2019-11-19 16:55:31 -0500 |
| commit | 6825a6865c9aa7f235a3825b0e08f3834745ed86 (patch) | |
| tree | 79a128d168cf30bdb8bd4aa130f9e19b0c3ec5ae | |
| parent | 0.8.3 (if exists) get site config & output path (diff) | |
0.9.0 spine (doc-reform renamed)
38 files changed, 511 insertions, 513 deletions
@@ -1,4 +1,4 @@ -- Name: Doc Reform +- Name: Spine, Doc Reform - Description: documents, structuring, processing, publishing, search - static content generator @@ -10,7 +10,7 @@ - code under src/ - License: AGPL 3 or later: - Doc Reform (SiSU), a framework for document structuring, publishing and + Spine, Doc Reform (SiSU), a framework for document structuring, publishing and search Copyright (C) Ralph Amissah @@ -33,7 +33,7 @@ [http://www.fsf.org/licensing/licenses/agpl.html] [http://www.gnu.org/licenses/agpl.html] - - Doc Reform (related to SiSU) uses standard: + - Spine, Doc Reform (related to SiSU) uses standard: - docReform markup syntax - standard SiSU markup syntax with modified headers and minor modifications @@ -48,6 +48,6 @@ [http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary] [http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/html.rb;hb=HEAD] -- Doc Reform markup samples +- Spine, Doc Reform (SiSU) markup samples Individual document content Copyright (Author) [as stated in document header] Individual document content License (Author) [as stated in document header] @@ -1,4 +1,4 @@ -project_name: Doc Reform +project_name: Spine, Doc Reform description: [ "documents, structuring, processing, publishing", search, @@ -1,4 +1,4 @@ -name "doc-reform" +name "spine" description "sisu document parser" homepage "http://sisudoc.org" authors "Ralph Amissah" @@ -16,12 +16,12 @@ dependency "imageformats" version="~>7.0.1" # https://code.dlan dependency "dyaml" version="~>0.8.0" dependency "tinyendian" version="~>0.2.0" // for dyaml configuration "default" { - targetName "doc-reform" - postGenerateCommands "/usr/bin/notify-send -t 0 'D executable ready' 'doc-reform'" + targetName "spine" + postGenerateCommands "/usr/bin/notify-send -t 0 'D executable ready' 'spine'" } configuration "dmd" { - targetName "doc-reform-dmd" - postGenerateCommands "/usr/bin/notify-send -t 0 'D executable ready' 'doc-reform-dmd'" + targetName "spine-dmd" + postGenerateCommands "/usr/bin/notify-send -t 0 'D executable ready' 'spine-dmd'" } buildType "dmd" { dflags "-J=views" "-I=src/doc_reform" @@ -35,12 +35,12 @@ buildType "dmd-release" { configuration "dmd-version" { dflags "-J=views" "-I=src/doc_reform" buildOptions "verbose" "releaseMode" "optimize" "inline" - targetName "doc-reform-dmd-ver" - postGenerateCommands "/usr/bin/notify-send -t 0 'D executable ready' 'doc-reform-dmd-ver'" + targetName "spine-dmd-ver" + postGenerateCommands "/usr/bin/notify-send -t 0 'D executable ready' 'spine-dmd-ver'" } configuration "ldc" { - targetName "doc-reform-ldc" - postGenerateCommands "/usr/bin/notify-send -t 0 'D executable ready' 'doc-reform-ldc'" + targetName "spine-ldc" + postGenerateCommands "/usr/bin/notify-send -t 0 'D executable ready' 'spine-ldc'" } buildType "ldc" { dflags "-O2" "-J=views" "-I=src/doc_reform" @@ -54,12 +54,12 @@ buildType "ldc-release" { configuration "ldc-version" { dflags "-O2" "-J=views" "-I=src/doc_reform" buildOptions "verbose" "optimize" "inline" "releaseMode" - targetName "doc-reform-ldc-ver" - postGenerateCommands "/usr/bin/notify-send -t 0 'D executable ready' 'doc-reform-ldc-ver'" + targetName "spine-ldc-ver" + postGenerateCommands "/usr/bin/notify-send -t 0 'D executable ready' 'spine-ldc-ver'" } configuration "gdc" { - targetName "doc-reform-gdc" - postGenerateCommands "/usr/bin/notify-send -t 0 'D executable ready' 'doc-reform-gdc'" + targetName "spine-gdc" + postGenerateCommands "/usr/bin/notify-send -t 0 'D executable ready' 'spine-gdc'" } buildType "gdc" { dflags "-O2" "-J=views" "-I=src/doc_reform" @@ -76,6 +76,6 @@ configuration "gdc-version" { dflags "-O2" "-J=views" "-I=src/doc_reform" lflags "-lz" buildOptions "verbose" "optimize" "inline" "releaseMode" - targetName "doc-reform-gdc-ver" - postGenerateCommands "/usr/bin/notify-send -t 0 'D executable ready' 'doc-reform-gdc-ver'" + targetName "spine-gdc-ver" + postGenerateCommands "/usr/bin/notify-send -t 0 'D executable ready' 'spine-gdc-ver'" } @@ -2,7 +2,7 @@ PROG_VER_GIT :=$(shell echo `git describe --long --tags | sed -e "s/^[ a-z_-]\+\ PROG_VER_DECLARED :=$(shell echo `cat ./views/version.txt | grep --color=never "enum" | sed 's/.\+(\([0-9]\+\),[ \t]\+\([0-9]\+\),[ \t]\+\([0-9]\+\)[ \t]*).\+/\1.\2.\3/g'`) DUB=dub DUB_FLAGS=-v --force --compiler= -PRG_NAME=doc-reform +PRG_NAME=spine PRG_NICKAME=rad PRG_NAME_DIR=$(shell echo `echo $(PRG_NAME) | sed -e "s/-/_/g"`) PRG_SRC=$(PRG_NAME).d @@ -110,48 +110,48 @@ dmd_debug: $(DUB) --compiler=dmd --config=dmd -b debug dmd_ver: $(DUB) --compiler=dmd --config=dmd-version - mv bin/doc-reform-dmd-ver bin-archive/doc-reform-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT)-dmd - notify-send -t 0 'D dmd compiled test release executable ready' 'doc-reform-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT)-dmd' + mv bin/spine-dmd-ver bin-archive/spine-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT)-dmd + notify-send -t 0 'D dmd compiled test release executable ready' 'spine-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT)-dmd' dmd_clean_ver: clean tangle dmd_ver dmd_rel: expunge skel tangle - $(DUB) --compiler=dmd --config=doc-reform-release + $(DUB) --compiler=dmd --config=spine-release dmd_rel_tangle: tangle - $(DUB) --compiler=dmd --config=doc-reform-dmd + $(DUB) --compiler=dmd --config=spine-dmd dmd_rel_expunge_tangle: expunge skel tangle dmd_rel_tangle dmd_debug_tangle: tangle - $(DUB) --compiler=dmd --config=doc-reform-dmd-debug + $(DUB) --compiler=dmd --config=spine-dmd-debug gdc: $(DUB) --compiler=gdc --config=gdc -b release gdc_debug: $(DUB) --compiler=gdc --config=gdc -b debug gdc_ver: $(DUB) --compiler=gdc --config=gdc-version - mv bin/doc-reform-gdc-ver bin-archive/doc-reform-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT)-gdc - notify-send -t 0 'D gdc compiled test release executable ready' 'doc-reform-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT)-gdc' + mv bin/spine-gdc-ver bin-archive/spine-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT)-gdc + notify-send -t 0 'D gdc compiled test release executable ready' 'spine-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT)-gdc' gdc_clean_ver: clean tangle gdc_ver gdc_rel: expunge skel tangle - $(DUB) --compiler=gdc --config=doc-reform-release + $(DUB) --compiler=gdc --config=spine-release gdc_rel_tangle: tangle - $(DUB) --compiler=gdc --config=doc-reform-gdc + $(DUB) --compiler=gdc --config=spine-gdc gdc_rel_expunge_tangle: expunge skel tangle gdc_rel_tangle gdc_debug_tangle: tangle - $(DUB) --compiler=gdc --config=doc-reform-gdc-debug + $(DUB) --compiler=gdc --config=spine-gdc-debug ldc: $(DUB) --compiler=ldc2 --config=ldc -b release ldc_debug: $(DUB) --compiler=ldc2 --config=ldc -b debug ldc_ver: $(DUB) --compiler=ldc2 --config=ldc-version - mv bin/doc-reform-ldc-ver bin-archive/doc-reform-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT)-ldc - notify-send -t 0 'D ldc2 compiled test release executable ready' 'doc-reform-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT)-ldc' + mv bin/spine-ldc-ver bin-archive/spine-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT)-ldc + notify-send -t 0 'D ldc2 compiled test release executable ready' 'spine-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT)-ldc' ldc_clean_ver: clean tangle ldc_ver ldc_rel: expunge skel tangle - $(DUB) --compiler=ldc2 --config=doc-reform-release + $(DUB) --compiler=ldc2 --config=spine-release ldc_rel_tangle: tangle - $(DUB) --compiler=ldc2 --config=doc-reform-ldc + $(DUB) --compiler=ldc2 --config=spine-ldc ldc_rel_expunge_tangle: expunge skel tangle ldc_rel_tangle ldc_debug_tangle: tangle - $(DUB) --compiler=ldc2 --config=doc-reform-ldc-debug + $(DUB) --compiler=ldc2 --config=spine-ldc-debug reinit: clean skel tangle skel: mkdir -p $(PRG_BINDIR); \ @@ -194,7 +194,7 @@ distclean_and_init: expunge mkdir -p $(PRG_SRCDIR)/$(PRG_NAME_DIR); \ mkdir -p $(PRG_BINDIR); ver: - echo doc-reform-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT) + echo spine-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT) clean_tangle_build: clean tangle build tangle_build: tangle build build: $(PRG_SRCDIR)/$(PRG_SRC) @@ -208,279 +208,279 @@ restart: clean tangle find_pods: $(SiSU_MARKUP_SAMPLES_FIND_PODS) dmd_testrun_find: - ./bin/doc-reform-dmd -v --source --html --epub --sqlite-discrete \ + ./bin/spine-dmd -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_pod \ data/pod/sisu-manual dmd_testrun_find_pod_source: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ -./bin/doc-reform-ldc -v --source --html --epub \ +./bin/spine-ldc -v --source --html --epub \ --output-dir=tmp/program_output_pod dmd_testrun_find_pod_pod: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ -./bin/doc-reform-dmd -v --pod \ +./bin/spine-dmd -v --pod \ --output-dir=tmp/program_output_pod dmd_testrun_find_pod_html: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ -./bin/doc-reform-dmd -v --html \ +./bin/spine-dmd -v --html \ --output-dir=tmp/program_output_pod dmd_testrun_find_pod_epub: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ -./bin/doc-reform-dmd -v --epub \ +./bin/spine-dmd -v --epub \ --output-dir=tmp/program_output_pod dmd_testrun_find_pod_all: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ -./bin/doc-reform-dmd -v --source --html --epub --sqlite-discrete \ +./bin/spine-dmd -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_pod dmd_testrun_paths_pod_source: - ./bin/doc-reform-dmd -v --source \ + ./bin/spine-dmd -v --source \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) dmd_testrun_paths_pod_pod: - ./bin/doc-reform-dmd -v --pod \ + ./bin/spine-dmd -v --pod \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) dmd_testrun_paths_pod_html: - ./bin/doc-reform-dmd -v --html \ + ./bin/spine-dmd -v --html \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) dmd_testrun_paths_pod_epub: - ./bin/doc-reform-dmd -v --epub \ + ./bin/spine-dmd -v --epub \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) dmd_testrun_paths_pod_all: - ./bin/doc-reform-dmd -v --source --html --epub --sqlite-discrete \ + ./bin/spine-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/doc-reform-gdc -v --source --html --epub --sqlite-discrete \ + ./bin/spine-gdc -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_pod \ data/pod/sisu-manual gdc_testrun_find_pod_source: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ -./bin/doc-reform-gdc -v --source \ +./bin/spine-gdc -v --source \ --output-dir=tmp/program_output_pod gdc_testrun_find_pod_pod: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ -./bin/doc-reform-gdc -v --pod \ +./bin/spine-gdc -v --pod \ --output-dir=tmp/program_output_pod gdc_testrun_find_pod_html: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ -./bin/doc-reform-gdc -v --html \ +./bin/spine-gdc -v --html \ --output-dir=tmp/program_output_pod gdc_testrun_find_pod_epub: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ -./bin/doc-reform-gdc -v --epub \ +./bin/spine-gdc -v --epub \ --output-dir=tmp/program_output_pod gdc_testrun_find_pod_all: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ -./bin/doc-reform-gdc -v --source --html --epub --sqlite-discrete \ +./bin/spine-gdc -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_pod gdc_testrun_paths: - ./bin/doc-reform-gdc -v --source --html --epub --sqlite-discrete \ + ./bin/spine-gdc -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_pod \ data/pod/sisu-manual gdc_testrun_paths_pod_source: - ./bin/doc-reform-gdc -v --source \ + ./bin/spine-gdc -v --source \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) gdc_testrun_paths_pod_pod: - ./bin/doc-reform-gdc -v --pod \ + ./bin/spine-gdc -v --pod \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) gdc_testrun_paths_pod_html: - ./bin/doc-reform-gdc -v --html \ + ./bin/spine-gdc -v --html \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) gdc_testrun_paths_pod_epub: - ./bin/doc-reform-gdc -v --epub \ + ./bin/spine-gdc -v --epub \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) gdc_testrun_paths_pod_all: - ./bin/doc-reform-gdc -v --source --html --epub --sqlite-discrete \ + ./bin/spine-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/doc-reform-ldc -v --source --html --epub --sqlite-discrete \ + ./bin/spine-ldc -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_pod \ data/pod/sisu-manual ldc_testrun_find_pod_source: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ - ./bin/doc-reform-ldc -v --source \ + ./bin/spine-ldc -v --source \ --output-dir=tmp/program_output_pod ldc_testrun_find_pod_pod: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ - ./bin/doc-reform-ldc -v --pod \ + ./bin/spine-ldc -v --pod \ --output-dir=tmp/program_output_pod ldc_testrun_find_pod_html: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ - ./bin/doc-reform-ldc -v --html \ + ./bin/spine-ldc -v --html \ --output-dir=tmp/program_output_pod ldc_testrun_find_pod_epub: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ - ./bin/doc-reform-ldc -v --epub \ + ./bin/spine-ldc -v --epub \ --output-dir=tmp/program_output_pod ldc_testrun_find_pod_all: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ - ./bin/doc-reform-ldc -v --source --html --epub --sqlite-discrete \ + ./bin/spine-ldc -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_pod ldc_testrun_paths: - ./bin/doc-reform-ldc -v --source --html --epub --sqlite-discrete \ + ./bin/spine-ldc -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_pod \ data/pod/sisu-manual ldc_testrun_paths_pod_source: - ./bin/doc-reform-ldc -v --source \ + ./bin/spine-ldc -v --source \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) ldc_testrun_paths_pod_pod: - ./bin/doc-reform-ldc -v --pod \ + ./bin/spine-ldc -v --pod \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) ldc_testrun_paths_pod_html: - ./bin/doc-reform-ldc -v --html \ + ./bin/spine-ldc -v --html \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) ldc_testrun_paths_pod_epub: - ./bin/doc-reform-ldc -v --epub \ + ./bin/spine-ldc -v --epub \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) ldc_testrun_paths_pod_all: - ./bin/doc-reform-ldc -v --source --html --epub --sqlite-discrete \ + ./bin/spine-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/doc-reform-dmd -v --source \ +./bin/spine-dmd -v --source \ --output-dir=tmp/program_output_dir dmd_testrun_find_dir_pod: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/doc-reform-dmd -v --pod \ +./bin/spine-dmd -v --pod \ --output-dir=tmp/program_output_dir dmd_testrun_find_dir_html: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/doc-reform-dmd -v --html \ +./bin/spine-dmd -v --html \ --output-dir=tmp/program_output_dir dmd_testrun_find_dir_epub: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/doc-reform-dmd -v --epub \ +./bin/spine-dmd -v --epub \ --output-dir=tmp/program_output_dir dmd_testrun_find_dir_all: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/doc-reform-dmd -v --source --html --epub --sqlite-discrete \ +./bin/spine-dmd -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_dir dmd_testrun_filelist_dir_source: - ./bin/doc-reform-dmd -v --source \ + ./bin/spine-dmd -v --source \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) dmd_testrun_filelist_dir_pod: - ./bin/doc-reform-dmd -v --pod \ + ./bin/spine-dmd -v --pod \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) dmd_testrun_filelist_dir_html: - ./bin/doc-reform-dmd -v --html \ + ./bin/spine-dmd -v --html \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) dmd_testrun_filelist_dir_epub: - ./bin/doc-reform-dmd -v --epub \ + ./bin/spine-dmd -v --epub \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) dmd_testrun_filelist_dir_all: - ./bin/doc-reform-dmd -v --source --html --epub --sqlite-discrete \ + ./bin/spine-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/doc-reform-gdc -v --source \ + ./bin/spine-gdc -v --source \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) gdc_testrun_find_dir_pod: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/doc-reform-gdc -v --pod \ +./bin/spine-gdc -v --pod \ --output-dir=tmp/program_output_dir gdc_testrun_find_dir_html: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/doc-reform-gdc -v --html \ +./bin/spine-gdc -v --html \ --output-dir=tmp/program_output_dir gdc_testrun_find_dir_epub: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/doc-reform-gdc -v --epub \ +./bin/spine-gdc -v --epub \ --output-dir=tmp/program_output_dir gdc_testrun_find_dir_all: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/doc-reform-gdc -v --source --html --epub --sqlite-discrete \ +./bin/spine-gdc -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_dir gdc_testrun_filelist_dir_source: - ./bin/doc-reform-gdc -v --source \ + ./bin/spine-gdc -v --source \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) gdc_testrun_filelist_dir_pod: - ./bin/doc-reform-gdc -v --pod \ + ./bin/spine-gdc -v --pod \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) gdc_testrun_filelist_dir_html: - ./bin/doc-reform-gdc -v --html \ + ./bin/spine-gdc -v --html \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) gdc_testrun_filelist_dir_epub: - ./bin/doc-reform-gdc -v --epub \ + ./bin/spine-gdc -v --epub \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) gdc_testrun_filelist_dir_all: - ./bin/doc-reform-gdc -v --source --html --epub --sqlite-discrete \ + ./bin/spine-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/doc-reform-ldc -v --source \ +./bin/spine-ldc -v --source \ --output-dir=tmp/program_output_dir ldc_testrun_find_dir_pod: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/doc-reform-ldc -v --pod \ +./bin/spine-ldc -v --pod \ --output-dir=tmp/program_output_dir ldc_testrun_find_dir_html: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/doc-reform-ldc -v --html \ +./bin/spine-ldc -v --html \ --output-dir=tmp/program_output_dir ldc_testrun_find_dir_epub: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/doc-reform-ldc -v --epub \ +./bin/spine-ldc -v --epub \ --output-dir=tmp/program_output_dir ldc_testrun_find_dir_all: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/doc-reform-ldc -v --source --html --epub --sqlite-discrete \ +./bin/spine-ldc -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_dir ldc_testrun_filelist_dir_source: - ./bin/doc-reform-ldc -v --source \ + ./bin/spine-ldc -v --source \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) ldc_testrun_filelist_dir_pod: - ./bin/doc-reform-ldc -v --pod \ + ./bin/spine-ldc -v --pod \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) ldc_testrun_filelist_dir_html: - ./bin/doc-reform-ldc -v --html \ + ./bin/spine-ldc -v --html \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) ldc_testrun_filelist_dir_epub: - ./bin/doc-reform-ldc -v --epub \ + ./bin/spine-ldc -v --epub \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) ldc_testrun_filelist_dir_all: - ./bin/doc-reform-ldc -v --source --html --epub --sqlite-discrete \ + ./bin/spine-ldc -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) diff --git a/meson.build b/meson.build index c2a3859..97ad4cb 100644 --- a/meson.build +++ b/meson.build @@ -1,10 +1,10 @@ -project('doc-reform', 'd', +project('spine', 'd', license: 'AGPL3', version: '0.26.5', meson_version: '>=0.46' ) -doc_reform_sources = [ - 'src/doc_reform/doc_reform.d', +spine_sources = [ + 'src/doc_reform/spine.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', @@ -46,8 +46,8 @@ sources_dir = include_directories('src/') 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']) # executable -doc_reform_exe = executable('rad', - [doc_reform_sources], +spine_exe = executable('rad', + [spine_sources], include_directories : [sources_dir], d_import_dirs: [include_directories('views')], dependencies : [ diff --git a/org/COPYRIGHT b/org/COPYRIGHT index 3bd2d7c..2010396 100644 --- a/org/COPYRIGHT +++ b/org/COPYRIGHT @@ -1,4 +1,4 @@ -- Name: Doc Reform +- Name: Spine, Doc Reform - Description: documents, structuring, processing, publishing, search - static content generator @@ -7,7 +7,7 @@ - Copyright: (C) 2015 - 2019 Ralph Amissah - - Doc Reform (related to SiSU) uses standard: + - Spine, Doc Reform (related to SiSU) uses standard: - docReform markup syntax - standard SiSU markup syntax with modified headers and minor modifications @@ -22,6 +22,6 @@ [http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary] [http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/html.rb;hb=HEAD] -- Doc Reform markup samples +- Spine, Doc Reform (SiSU) markup samples Individual document content Copyright (Author) [as stated in document header] Individual document content License (Author) [as stated in document header] diff --git a/org/compile_time_info.org b/org/compile_time_info.org index 5567f43..8590b39 100644 --- a/org/compile_time_info.org +++ b/org/compile_time_info.org @@ -1,7 +1,7 @@ -*- mode: org -*- -#+TITLE: doc_reform compile time info +#+TITLE: spine (doc_reform) compile time info #+DESCRIPTION: documents - structuring, publishing in multiple formats & search -#+FILETAGS: :doc_reform:compile: +#+FILETAGS: :spine:compile: #+AUTHOR: Ralph Amissah #+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] #+COPYRIGHT: Copyright (C) 2015 - 2019 Ralph Amissah @@ -13,17 +13,17 @@ #+PROPERTY: header-args :padline no :exports code :cache no :noweb yes #+EXPORT_SELECT_TAGS: export #+EXPORT_EXCLUDE_TAGS: noexport -#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n) +#+TAGS: assert(a) class(c) debug(d) mixin(m) spine(s) tangle(T) template(t) WEB(W) noexport(n) -[[./doc_reform.org][doc_reform]] [[./][org/]] +[[./spine.org][spine]] [[./][org/]] * compilation info [[../maker.org][maker.org makefile]] -[[./doc_reform.org][doc_reform hub]] [[./][org/]] +[[./spine.org][spine hub]] [[./][org/]] e.g. do on linux bsd osx not windows: version(Windows) {} else { ... } -** 0. module template :module:compile_time_info: +** _module template_ :module:compile_time_info: #+begin_src d :tangle "../src/doc_reform/conf/compile_time_info.d" /++ @@ -31,7 +31,7 @@ version(Windows) {} else { ... } +/ module doc_reform.conf.compile_time_info; template CompileTimeInfo() { - <<doc_reform_compile_time_info>> + <<spine_compile_time_info>> } #+end_src @@ -40,7 +40,7 @@ OS type shows during compilation *** set os flags -#+name: doc_reform_compile_time_info +#+name: spine_compile_time_info #+BEGIN_SRC d version(Windows) { pragma(msg, "[ Windows compilation ]"); @@ -98,7 +98,7 @@ static if(sysWindows) { ** 64 bit compilation? -#+name: doc_reform_compile_time_info +#+name: spine_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 1c68a8d..3e09d16 100644 --- a/org/default_misc.org +++ b/org/default_misc.org @@ -1,7 +1,7 @@ -*- mode: org -*- -#+TITLE: doc_reform defaults misc +#+TITLE: spine (doc_reform) defaults misc #+DESCRIPTION: documents - structuring, publishing in multiple formats & search -#+FILETAGS: :doc_reform:default:misc: +#+FILETAGS: :spine:default:misc: #+AUTHOR: Ralph Amissah #+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] #+COPYRIGHT: Copyright (C) 2015 - 2019 Ralph Amissah @@ -13,11 +13,11 @@ #+PROPERTY: header-args :padline no :exports code :cache no :noweb yes #+EXPORT_SELECT_TAGS: export #+EXPORT_EXCLUDE_TAGS: noexport -#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n) +#+TAGS: assert(a) class(c) debug(d) mixin(m) spine(s) tangle(T) template(t) WEB(W) noexport(n) -[[./doc_reform.org][doc_reform]] [[./][org/]] -* 0. meta defaults :module:meta: -** 0. module template +[[./spine.org][spine]] [[./][org/]] +* meta defaults :module:meta: +** _module template_ #+name: tangle_defaults #+BEGIN_SRC d :tangle "../src/doc_reform/meta/defaults.d" @@ -212,7 +212,7 @@ template DocReformBiblio() { #+END_SRC * 1. output defaults :module:output: -** 0. module template +** _module template_ #+name: tangle_defaults #+BEGIN_SRC d :tangle "../src/doc_reform/output/defaults.d" @@ -307,7 +307,7 @@ template InternalMarkup() { } #+END_SRC -*** template language codes +*** template: language codes #+name: defaults_template_language_codes #+BEGIN_SRC d diff --git a/org/default_paths.org b/org/default_paths.org index ed47cac..08adb45 100644 --- a/org/default_paths.org +++ b/org/default_paths.org @@ -1,7 +1,7 @@ -*- mode: org -*- -#+TITLE: doc_reform default paths +#+TITLE: spine (doc_reform) default paths #+DESCRIPTION: documents - structuring, publishing in multiple formats & search -#+FILETAGS: :doc_reform:paths: +#+FILETAGS: :spine:paths: #+AUTHOR: Ralph Amissah #+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] #+COPYRIGHT: Copyright (C) 2015 - 2019 Ralph Amissah @@ -13,11 +13,11 @@ #+PROPERTY: header-args :padline no :exports code :cache no :noweb yes #+EXPORT_SELECT_TAGS: export #+EXPORT_EXCLUDE_TAGS: noexport -#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n) +#+TAGS: assert(a) class(c) debug(d) mixin(m) spine(s) tangle(T) template(t) WEB(W) noexport(n) -[[./doc_reform.org][doc_reform]] [[./][org/]] +[[./spine.org][spine]] [[./][org/]] * 0. source paths -** 0. module template :module:paths_source: +** _module template_ :module:paths_source: #+BEGIN_SRC d :tangle "../src/doc_reform/source/paths_source.d" /++ @@ -959,7 +959,7 @@ template DocReformPathsPods() { #+END_SRC * 1. output paths -** 0. module template :module:paths_output: +** _module template_ :module:paths_output: #+BEGIN_SRC d :tangle "../src/doc_reform/output/paths_output.d" /++ diff --git a/org/default_regex.org b/org/default_regex.org index e14748f..2a13dbb 100644 --- a/org/default_regex.org +++ b/org/default_regex.org @@ -1,7 +1,7 @@ -*- mode: org -*- -#+TITLE: doc_reform regex defaults +#+TITLE: spine (doc_reform) regex defaults #+DESCRIPTION: documents - structuring, publishing in multiple formats & search -#+FILETAGS: :doc_reform:regex: +#+FILETAGS: :spine:regex: #+AUTHOR: Ralph Amissah #+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] #+COPYRIGHT: Copyright (C) 2015 - 2019 Ralph Amissah @@ -13,11 +13,11 @@ #+PROPERTY: header-args :padline no :exports code :cache no :noweb yes #+EXPORT_SELECT_TAGS: export #+EXPORT_EXCLUDE_TAGS: noexport -#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n) +#+TAGS: assert(a) class(c) debug(d) mixin(m) spine(s) tangle(T) template(t) WEB(W) noexport(n) -[[./doc_reform.org][doc_reform]] [[./][org/]] -* 0. meta ctRegex -[[./doc_reform.org][doc_reform]] [[./][org/]] +[[./spine.org][spine]] [[./][org/]] +* meta ctRegex +[[./spine.org][spine]] [[./][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. @@ -29,7 +29,7 @@ http://dlang.org/phobos/std_regex.html 【】〖〗┥┝┤├¤░┘┙┚┼┿╂┊┏┚┆■☼ #+END_SRC -** 0. module template :module: +** _module template_ :module: #+name: tangle_meta_rgx #+BEGIN_SRC d :tangle "../src/doc_reform/meta/rgx.d" @@ -356,13 +356,13 @@ auto language_code_and_filename = #+END_SRC * 1. output ctRegex -[[./doc_reform.org][doc_reform]] [[./][org/]] +[[./spine.org][spine]] [[./][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. - StaticRegex!char (wchar/dchar) that contains a pattern in the form of compiled native machine code. -** 0. module template :module:output: +** _module template_ :module:output: #+name: tangle_meta_rgx #+BEGIN_SRC d :tangle "../src/doc_reform/output/rgx.d" diff --git a/org/default_shared.org b/org/default_shared.org index b181fac..067b7b5 100644 --- a/org/default_shared.org +++ b/org/default_shared.org @@ -1,7 +1,7 @@ -*- mode: org -*- -#+TITLE: doc_reform shared +#+TITLE: spine (doc_reform) shared #+DESCRIPTION: documents - structuring, publishing in multiple formats & search -#+FILETAGS: :doc_reform:default:shared: +#+FILETAGS: :spine:default:shared: #+AUTHOR: Ralph Amissah #+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] #+COPYRIGHT: Copyright (C) 2015 - 2019 Ralph Amissah @@ -13,11 +13,11 @@ #+PROPERTY: header-args :padline no :exports code :cache no :noweb yes #+EXPORT_SELECT_TAGS: export #+EXPORT_EXCLUDE_TAGS: noexport -#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n) +#+TAGS: assert(a) class(c) debug(d) mixin(m) spine(s) tangle(T) template(t) WEB(W) noexport(n) -[[./doc_reform.org][doc_reform]] [[./][org/]] -* 0. shared -** 0. module template :module:shared: +[[./spine.org][spine]] [[./][org/]] +* shared +** _module template_ :module:shared: #+BEGIN_SRC d :tangle "../src/doc_reform/share/defaults.d" /++ diff --git a/org/imports.org b/org/imports.org index 124b7f7..35decf7 100644 --- a/org/imports.org +++ b/org/imports.org @@ -1,7 +1,7 @@ -*- mode: org -*- -#+TITLE: doc_reform hub +#+TITLE: spine (doc_reform) hub #+DESCRIPTION: documents - structuring, publishing in multiple formats & search -#+FILETAGS: :doc_reform:imports: +#+FILETAGS: :spine:imports: #+AUTHOR: Ralph Amissah #+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] #+COPYRIGHT: Copyright (C) 2015 - 2019 Ralph Amissah @@ -13,7 +13,7 @@ #+PROPERTY: header-args :padline no :exports code :cache no :noweb yes #+EXPORT_SELECT_TAGS: export #+EXPORT_EXCLUDE_TAGS: noexport -#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n) +#+TAGS: assert(a) class(c) debug(d) mixin(m) spine(s) tangle(T) template(t) WEB(W) noexport(n) * 1. imports for meta :meta: ** package dir diff --git a/org/meta_abstraction.org b/org/meta_abstraction.org index 5da3795..e76e7b9 100644 --- a/org/meta_abstraction.org +++ b/org/meta_abstraction.org @@ -1,7 +1,7 @@ -*- mode: org -*- -#+TITLE: doc_reform document abstraction +#+TITLE: spine (doc_reform) document abstraction #+DESCRIPTION: documents - structuring, publishing in multiple formats & search -#+FILETAGS: :doc_reform:abstraction: +#+FILETAGS: :spine:abstraction: #+AUTHOR: Ralph Amissah #+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] #+COPYRIGHT: Copyright (C) 2015 - 2019 Ralph Amissah @@ -13,14 +13,14 @@ #+PROPERTY: header-args :padline no :exports code :cache no :noweb yes #+EXPORT_SELECT_TAGS: export #+EXPORT_EXCLUDE_TAGS: noexport -#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n) +#+TAGS: assert(a) class(c) debug(d) mixin(m) spine(s) tangle(T) template(t) WEB(W) noexport(n) -- [[./doc_reform.org][doc_reform]] [[./][org/]] +- [[./spine.org][spine]] [[./][org/]] * 1. Document Abstraction Process markup document, create document abstraction. -** 0. module template :module:metadoc_from_src: +** _module template_ :module:metadoc_from_src: #+BEGIN_SRC d :tangle "../src/doc_reform/meta/metadoc_from_src.d" /++ @@ -7599,11 +7599,11 @@ template docSectKeysSeq() { } #+END_SRC -* 2. Object Setter (Set Abstract Object) :module:doc_reform:meta_object_setter: +* 2. Object Setter (Set Abstract Object) :module:spine:meta_object_setter: set abstracted objects for downstream processing -** 0. module template +** _module template_ #+BEGIN_SRC d :tangle "../src/doc_reform/meta/object_setter.d" /++ diff --git a/org/meta_conf_make_meta.org b/org/meta_conf_make_meta.org index 208a028..f87701e 100644 --- a/org/meta_conf_make_meta.org +++ b/org/meta_conf_make_meta.org @@ -1,7 +1,7 @@ -*- mode: org -*- -#+TITLE: doc_reform config & header (make & meta) extract +#+TITLE: spine (doc_reform) config & header (make & meta) extract #+DESCRIPTION: documents - structuring, publishing in multiple formats & search -#+FILETAGS: :doc_reform:config: +#+FILETAGS: :spine:config: #+AUTHOR: Ralph Amissah #+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] #+COPYRIGHT: Copyright (C) 2015 - 2019 Ralph Amissah @@ -13,9 +13,9 @@ #+PROPERTY: header-args :padline no :exports code :cache no :noweb yes #+EXPORT_SELECT_TAGS: export #+EXPORT_EXCLUDE_TAGS: noexport -#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n) +#+TAGS: assert(a) class(c) debug(d) mixin(m) spine(s) tangle(T) template(t) WEB(W) noexport(n) -[[./doc_reform.org][doc_reform]] [[./][org/]] +[[./spine.org][spine]] [[./][org/]] * 0. generic ** imports @@ -109,9 +109,9 @@ struct ConfCompositeMakeStr { string[] footer; string[] headings; string[] home_button_image; - string home_button_text = "{Doc Reform}http://www.doc-reform.org;" + string home_button_text = "{Spine, 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"; + ~ " {sources / git}https://git.doc-reform.org/software/spine"; string italics; string auto_num_top_at_level; int auto_num_top_lv = 9; @@ -199,9 +199,9 @@ struct ConfCompositeMakeInit { string[] footer; string[] headings; string[] home_button_image; - string home_button_text = "{Doc Reform}http://www.doc-reform.org;" + string home_button_text = "{Spine, 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"; + ~ " {sources / git}https://git.doc-reform.org/software/spine"; string[] italics; string auto_num_top_at_level; int auto_num_top_lv = 9; @@ -333,7 +333,7 @@ JSONValue config_jsonstr = `{ #+END_SRC * 1. YAML to DocReformStruct :module:conf_make_meta:yaml: -** 0. module template +** _module template_ #+BEGIN_SRC d :tangle "../src/doc_reform/meta/conf_make_meta_yaml.d" /++ @@ -1135,7 +1135,7 @@ if ("rights" in _yaml #+END_SRC * 1. JSON to DocReformStruct :module:conf_make_meta:json: -** 0. module template +** _module template_ #+BEGIN_SRC d :tangle "../src/doc_reform/meta/conf_make_meta_json.d" /++ diff --git a/org/meta_debugs.org b/org/meta_debugs.org index 69a2aa5..f3518a6 100644 --- a/org/meta_debugs.org +++ b/org/meta_debugs.org @@ -1,7 +1,7 @@ -*- mode: org -*- -#+TITLE: doc_reform abstraction summary and debugs +#+TITLE: spine (doc_reform) abstraction summary and debugs #+DESCRIPTION: documents - structuring, publishing in multiple formats & search -#+FILETAGS: :doc_reform:debugs: +#+FILETAGS: :spine:debugs: #+AUTHOR: Ralph Amissah #+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] #+COPYRIGHT: Copyright (C) 2015 - 2019 Ralph Amissah @@ -13,11 +13,11 @@ #+PROPERTY: header-args :padline no :exports code :cache no :noweb yes #+EXPORT_SELECT_TAGS: export #+EXPORT_EXCLUDE_TAGS: noexport -#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n) +#+TAGS: assert(a) class(c) debug(d) mixin(m) spine(s) tangle(T) template(t) WEB(W) noexport(n) -[[./doc_reform.org][doc_reform]] [[./][org/]] -* 1. abstraction debugs :module:doc_reform:meta_doc_debugs: -** 0. module template +[[./spine.org][spine]] [[./][org/]] +* 1. abstraction debugs :module:spine:meta_doc_debugs: +** _module template_ #+BEGIN_SRC d :tangle "../src/doc_reform/meta/doc_debugs.d" /++ diff --git a/org/output_harvest_metadata.org b/org/output_harvest_metadata.org index 2fb3485..b2c7b1a 100644 --- a/org/output_harvest_metadata.org +++ b/org/output_harvest_metadata.org @@ -1,7 +1,7 @@ -*- mode: org -*- -#+TITLE: metadata (multidocument) harvests +#+TITLE: spine (doc_manifest) metadata (multidocument) harvests #+DESCRIPTION: documents - structuring, various output representations & search -#+FILETAGS: :doc_reform:hub: +#+FILETAGS: :spine:hub: #+AUTHOR: Ralph Amissah #+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] #+COPYRIGHT: Copyright (C) 2015 - 2019 Ralph Amissah @@ -13,11 +13,11 @@ #+PROPERTY: header-args :results silent :padline no :exports code :cache no :noweb yes #+EXPORT_SELECT_TAGS: export #+EXPORT_EXCLUDE_TAGS: noexport -#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n) +#+TAGS: assert(a) class(c) debug(d) mixin(m) spine(s) tangle(T) template(t) WEB(W) noexport(n) -* document harvest _summary_ :module:doc_reform:metadoc_show_summary: +* document harvest _summary_ :module:spine:metadoc_show_summary: -** 0. module template metadoc harvest +** _module template_ metadoc harvest #+BEGIN_SRC d :tangle "../src/doc_reform/meta/metadoc_harvest.d" module doc_reform.meta.metadoc_harvest; @@ -107,8 +107,8 @@ hvst.harvest.path_abs_html_segtoc = pth_html_abs.fn_seg(doc_matters.src.filenam return hvst.harvest; #+END_SRC -** 0. module template metadoc harvest topics -*** 0. module template metadoc harvest topics template +** _module template_ metadoc harvest topics +*** _module template_ metadoc harvest topics template #+BEGIN_SRC d :tangle "../src/doc_reform/meta/metadoc_harvests_topics.d" module doc_reform.meta.metadoc_harvests_topics; @@ -430,8 +430,8 @@ try { } #+END_SRC -** 0. module template metadoc harvests authors -*** 0. module template metadoc harvest authors +** _module template_ metadoc harvests authors +*** _module template_ metadoc harvest authors #+BEGIN_SRC d :tangle "../src/doc_reform/meta/metadoc_harvests_authors.d" module doc_reform.meta.metadoc_harvests_authors; @@ -748,7 +748,7 @@ string theme_light_1 = format(q"┃ <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> <meta name="dc.title" content= "metadata harvest, Authors & Topics - information Structuring Universe, Structured information Serialised Units" /> <meta name="dc.subject" content= "document structuring, ebook, publishing, PDF, LaTeX, XML, ODF, SQL, postgresql, sqlite, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, granular search, digital library" /> -<meta name="generator" content="doc_reform" /> +<meta name="generator" content="spine" /> <link rel="generator" href="http://sisudoc.org" /> <link href="./css/harvest.css" rel="stylesheet"> <style TYPE="text/css"> diff --git a/org/output_hub.org b/org/output_hub.org index d77d671..029595b 100644 --- a/org/output_hub.org +++ b/org/output_hub.org @@ -1,7 +1,7 @@ -*- mode: org -*- -#+TITLE: doc_reform output hub +#+TITLE: spine(doc_reform) output hub #+DESCRIPTION: documents - structuring, publishing in multiple formats & search -#+FILETAGS: :doc_reform:output:hub: +#+FILETAGS: :spine:output:hub: #+AUTHOR: Ralph Amissah #+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] #+COPYRIGHT: Copyright (C) 2015 - 2019 Ralph Amissah @@ -13,12 +13,12 @@ #+PROPERTY: header-args :padline no :exports code :cache no :noweb yes #+EXPORT_SELECT_TAGS: export #+EXPORT_EXCLUDE_TAGS: noexport -#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n) +#+TAGS: assert(a) class(c) debug(d) mixin(m) spine(s) tangle(T) template(t) WEB(W) noexport(n) -- [[./doc_reform.org][doc_reform]] [[./][org/]] +- [[./spine.org][spine]] [[./][org/]] -* 0. output hub [#A] -** module template :module: +* output hub [#A] +** _module template_ :module: #+BEGIN_SRC d :tangle "../src/doc_reform/output/hub.d" /++ @@ -77,25 +77,25 @@ import doc_reform.output, ** outputs *** files -**** source: _dr_src_ &/or _pod_ :source:pod: +**** source: _dr_src_ &/or _pod_ :source:pod: - [[./output_pod.org][output_pod]] #+name: output_scheduled_task #+BEGIN_SRC d if (sched == outTask.source_or_pod) { if (doc_matters.opt.action.source) { - msg.v("doc reform source processing... "); + msg.v("spine (doc reform) source processing... "); } if (doc_matters.opt.action.pod) { - msg.v("doc reform source pod processing... "); + msg.v("spine (doc reform) source pod processing... "); } import doc_reform.output.source_pod; DocReformPod!()(doc_matters); if (doc_matters.opt.action.source) { - msg.vv("doc reform source done"); + msg.vv("spine (doc reform) source done"); } if (doc_matters.opt.action.pod) { - msg.vv("doc reform source pod done"); + msg.vv("spine (doc reform) source pod done"); } } #+END_SRC diff --git a/org/output_latex.org b/org/output_latex.org index 874b353..f9c6d55 100644 --- a/org/output_latex.org +++ b/org/output_latex.org @@ -1,7 +1,7 @@ -*- mode: org -*- -#+TITLE: doc_reform output latex +#+TITLE: spine (doc_reform) output latex #+DESCRIPTION: documents - structuring, publishing in multiple formats & search -#+FILETAGS: :doc_reform:output:latex:pdf: +#+FILETAGS: :spine:output:latex:pdf: #+AUTHOR: Ralph Amissah #+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] #+COPYRIGHT: Copyright (C) 2015 - 2019 Ralph Amissah @@ -13,11 +13,11 @@ #+PROPERTY: header-args :results silent :padline no :exports code :cache no :noweb yes #+EXPORT_SELECT_TAGS: export -- [[./doc_reform.org][doc_reform]] [[./][org/]] +- [[./spine.org][spine]] [[./][org/]] - [[./output_hub.org][output_hub]] * latex -** module template :latex:pdf:module: +** _module template_ :latex:pdf:module: #+BEGIN_SRC d :tangle "../src/doc_reform/output/latex.d" :noweb yes module doc_reform.output.latex; @@ -940,7 +940,7 @@ string table(O,M)( #+END_SRC ** latex parts -*** latex head :head: +*** latex head :head: **** latex head function #+name: output_latex_head diff --git a/org/output_odt.org b/org/output_odt.org index a243d91..0a7f93d 100644 --- a/org/output_odt.org +++ b/org/output_odt.org @@ -1,7 +1,7 @@ -*- mode: org -*- #+TITLE: doc_reform output odt #+DESCRIPTION: documents - structuring, publishing in multiple formats & search -#+FILETAGS: :doc_reform:output:xml:odt: +#+FILETAGS: :spine:output:xml:odt: #+AUTHOR: Ralph Amissah #+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] #+COPYRIGHT: Copyright (C) 2015 - 2019 Ralph Amissah @@ -13,7 +13,7 @@ #+PROPERTY: header-args :results silent :padline no :exports code :cache no :noweb yes #+EXPORT_SELECT_TAGS: export -- [[./doc_reform.org][doc_reform]] [[./][org/]] +- [[./spine.org][spine]] [[./][org/]] - [[./output_hub.org][output_hub]] * odt :odt: @@ -42,7 +42,7 @@ | doc meta * (timestamp) | meta.xml | odt_metadata | | | |---------------------------------+-----------------------+-------------------+------------------------+------------------| -** module template :odf:odt:module: +** _module template_ :odf:odt:module: #+BEGIN_SRC d :tangle "../src/doc_reform/output/odt.d" :noweb yes module doc_reform.output.odt; @@ -840,7 +840,6 @@ string table(O,M)( } #+END_SRC - ** write odt output :odf:odt:out: #+name: output_odt diff --git a/org/output_show.org b/org/output_show.org index 0c54c5f..ea987d4 100644 --- a/org/output_show.org +++ b/org/output_show.org @@ -1,7 +1,7 @@ -*- mode: org -*- -#+TITLE: metadata (multidocument) harvests +#+TITLE: spine (doc_reform) metadata (multidocument) harvests #+DESCRIPTION: documents - structuring, various output representations & search -#+FILETAGS: :doc_reform:hub: +#+FILETAGS: :spine:hub: #+AUTHOR: Ralph Amissah #+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] #+COPYRIGHT: Copyright (C) 2015 - 2019 Ralph Amissah @@ -13,10 +13,10 @@ #+PROPERTY: header-args :results silent :padline no :exports code :cache no :noweb yes #+EXPORT_SELECT_TAGS: export #+EXPORT_EXCLUDE_TAGS: noexport -#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n) +#+TAGS: assert(a) class(c) debug(d) mixin(m) spine(s) tangle(T) template(t) WEB(W) noexport(n) -* document abstraction _summary_ :module:doc_reform:metadoc_show_summary: -** 0. module template metadoc summary +* document abstraction _summary_ :module:spine:metadoc_show_summary: +** _module template_ metadoc summary - document summary from abstraction #+BEGIN_SRC d :tangle "../src/doc_reform/meta/metadoc_show_summary.d" @@ -131,7 +131,7 @@ writefln( #+END_SRC * show config -** 0. module template show config +** _module template_ show config --show-config (show config) #+BEGIN_SRC d :tangle "../src/doc_reform/meta/metadoc_show_config.d" @@ -233,7 +233,7 @@ writefln( #+END_SRC * show make -** 0. module template show make +** _module template_ show make --show-make (show document make) #+BEGIN_SRC d :tangle "../src/doc_reform/meta/metadoc_show_make.d" @@ -304,7 +304,7 @@ writefln( * show metadata -** 0. module template show metadata +** _module template_ show metadata --show-metadata (show document metadata) #+BEGIN_SRC d :tangle "../src/doc_reform/meta/metadoc_show_metadata.d" diff --git a/org/output_sqlite.org b/org/output_sqlite.org index fc0f1ab..7115a41 100644 --- a/org/output_sqlite.org +++ b/org/output_sqlite.org @@ -1,7 +1,7 @@ -*- mode: org -*- -#+TITLE: doc_reform output sqlite +#+TITLE: spine (doc_reform) output sqlite #+DESCRIPTION: documents - structuring, publishing in multiple formats & search -#+FILETAGS: :doc_reform:output:db:sql:sqlite: +#+FILETAGS: :spine:output:db:sql:sqlite: #+AUTHOR: Ralph Amissah #+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] #+COPYRIGHT: Copyright (C) 2015 - 2019 Ralph Amissah @@ -13,14 +13,13 @@ #+PROPERTY: header-args :padline no :exports code :cache no :noweb yes #+EXPORT_SELECT_TAGS: export #+EXPORT_EXCLUDE_TAGS: noexport -#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n) +#+TAGS: assert(a) class(c) debug(d) mixin(m) spine(s) tangle(T) template(t) WEB(W) noexport(n) -- [[./doc_reform.org][doc_reform]] [[./][org/]] +- [[./spine.org][spine]] [[./][org/]] - [[./output_hub.org][output_hub]] * sql -** 0. module, templates :module: - +** _module, templates_ :module: *** hub **** collection diff --git a/org/output_src_pod.org b/org/output_src_pod.org index 6399c4b..df6be5f 100644 --- a/org/output_src_pod.org +++ b/org/output_src_pod.org @@ -1,7 +1,7 @@ -*- mode: org -*- -#+TITLE: doc_reform output pod +#+TITLE: spine (doc_reform) output pod #+DESCRIPTION: documents - structuring, publishing in multiple formats & search -#+FILETAGS: :doc_reform:output:source:pod: +#+FILETAGS: :spine:output:source:pod: #+AUTHOR: Ralph Amissah #+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] #+COPYRIGHT: Copyright (C) 2015 - 2019 Ralph Amissah @@ -13,13 +13,13 @@ #+PROPERTY: header-args :padline no :exports code :cache no :noweb yes #+EXPORT_SELECT_TAGS: export #+EXPORT_EXCLUDE_TAGS: noexport -#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n) +#+TAGS: assert(a) class(c) debug(d) mixin(m) spine(s) tangle(T) template(t) WEB(W) noexport(n) -- [[./doc_reform.org][doc_reform]] [[./][org/]] +- [[./spine.org][spine]] [[./][org/]] - [[./output_hub.org][output_hub]] * pod -** module template :module: +** _module template_ :module: #+BEGIN_SRC d :tangle "../src/doc_reform/output/source_pod.d" module doc_reform.output.source_pod; diff --git a/org/output_xmls.org b/org/output_xmls.org index 9b36ee4..ea1af4a 100644 --- a/org/output_xmls.org +++ b/org/output_xmls.org @@ -1,7 +1,7 @@ -*- mode: org -*- -#+TITLE: doc_reform output xmls +#+TITLE: spine (doc_reform) output xmls #+DESCRIPTION: documents - structuring, publishing in multiple formats & search -#+FILETAGS: :doc_reform:output:xml: +#+FILETAGS: :spine:output:xml: #+AUTHOR: Ralph Amissah #+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] #+COPYRIGHT: Copyright (C) 2015 - 2019 Ralph Amissah @@ -13,14 +13,14 @@ #+PROPERTY: header-args :padline no :exports code :cache no :noweb yes #+EXPORT_SELECT_TAGS: export #+EXPORT_EXCLUDE_TAGS: noexport -#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n) +#+TAGS: assert(a) class(c) debug(d) mixin(m) spine(s) tangle(T) template(t) WEB(W) noexport(n) -- [[./doc_reform.org][doc_reform]] [[./][org/]] +- [[./spine.org][spine]] [[./][org/]] - [[./output_hub.org][output_hub]] * xml offspring (xhtml html epub) ** format xhtml objects :format: -*** 0. module template :module: +*** _module template_ :module: #+BEGIN_SRC d :tangle "../src/doc_reform/output/xmls.d" module doc_reform.output.xmls; @@ -221,7 +221,7 @@ string site_info_button(M)( .replaceAll( rgx.br_nl, ""); } else { - _locations = "<p class=\"tiny_left\"><a href=\"http://www.doc-reform.org\">doc-reform</a></p>\n<p class=\"tiny_left\"><a href=\"http://git.sisudoc.org/software/doc-reform/\">sources / git</a></p>\n<p class=\"tiny_left\"><a href=\"http://www.sisudoc.org\">www.sisudoc.org</a></p>"; + _locations = "<p class=\"tiny_left\"><a href=\"http://www.doc-reform.org\">spine</a></p>\n<p class=\"tiny_left\"><a href=\"http://git.sisudoc.org/software/spine/\">sources / git</a></p>\n<p class=\"tiny_left\"><a href=\"http://www.sisudoc.org\">www.sisudoc.org</a></p>"; } string o; o = format(q"┃<div class="flex-menu-option"> @@ -1512,7 +1512,7 @@ string table(O,M)( #+END_SRC * _html_ [#A] :html: -** module template :module: +** _module template_ :module: #+BEGIN_SRC d :tangle "../src/doc_reform/output/html.d" module doc_reform.output.html; @@ -2174,7 +2174,7 @@ void images_cp(M)( | | | | doc_epub3_endnotes[seg_filename] | |-----------------------+--------------------------+---------------------------+----------------------------------| -** module template :module: +** _module template_ :module: #+BEGIN_SRC d :tangle "../src/doc_reform/output/epub3.d" module doc_reform.output.epub3; diff --git a/org/output_xmls_css.org b/org/output_xmls_css.org index 15e8bc7..b16bee0 100644 --- a/org/output_xmls_css.org +++ b/org/output_xmls_css.org @@ -1,7 +1,7 @@ -*- mode: org -*- -#+TITLE: doc_reform defaults css +#+TITLE: spine (doc_reform) defaults css #+DESCRIPTION: documents - structuring, publishing in multiple formats & search -#+FILETAGS: :doc_reform:output:xmls:css: +#+FILETAGS: :spine:output:xmls:css: #+AUTHOR: Ralph Amissah #+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] #+COPYRIGHT: Copyright (C) 2015 - 2019 Ralph Amissah @@ -13,13 +13,13 @@ #+PROPERTY: header-args :padline no :exports code :cache no :noweb yes #+EXPORT_SELECT_TAGS: export #+EXPORT_EXCLUDE_TAGS: noexport -#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n) +#+TAGS: assert(a) class(c) debug(d) mixin(m) spine(s) tangle(T) template(t) WEB(W) noexport(n) -- [[./doc_reform.org][doc_reform]] [[./][org/]] +- [[./spine.org][spine]] [[./][org/]] - [[./output_hub.org][output_hub]] -* 0. output css defaults :module:doc_reform:output_xmls_css: -** 0. module template +* 0. output css defaults :module:spine:output_xmls_css: +** _module template_ #+BEGIN_SRC d :tangle "../src/doc_reform/output/xmls_css.d" /++ diff --git a/org/output_zip.org b/org/output_zip.org index b2c0268..3007412 100644 --- a/org/output_zip.org +++ b/org/output_zip.org @@ -1,5 +1,5 @@ -*- mode: org -*- -#+TITLE: doc_reform output zip +#+TITLE: spine (doc_reform) output zip #+AUTHOR: Ralph Amissah #+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] #+COPYRIGHT: Copyright (C) 2015 - 2019 Ralph Amissah @@ -13,13 +13,13 @@ #+PROPERTY: header-args :padline no :exports code :cache no :noweb yes #+EXPORT_SELECT_TAGS: export #+EXPORT_EXCLUDE_TAGS: noexport -#+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) +#+FILETAGS: :spine:rel:output: +#+TAGS: assert(a) class(c) debug(d) mixin(m) spine(s) tangle(T) template(t) WEB(W) noexport(n) -- [[./doc_reform.org][doc_reform]] [[./][org/]] +- [[./spine.org][spine]] [[./][org/]] - [[./output_hub.org][output_hub]] -* _zip_ :module:doc_reform:create_zip_file: +* _zip_ :module:spine:create_zip_file: ** module template #+BEGIN_SRC d :tangle "../src/doc_reform/output/create_zip_file.d" diff --git a/org/source_files_read.org b/org/source_files_read.org index e182475..121b070 100644 --- a/org/source_files_read.org +++ b/org/source_files_read.org @@ -1,7 +1,7 @@ -*- mode: org -*- -#+TITLE: doc_reform markup source raw +#+TITLE: spine (doc_reform) markup source raw #+DESCRIPTION: documents - structuring, publishing in multiple formats & search -#+FILETAGS: :doc_reform:sourcefile:read: +#+FILETAGS: :spine:sourcefile:read: #+AUTHOR: Ralph Amissah #+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] #+COPYRIGHT: Copyright (C) 2015 - 2019 Ralph Amissah @@ -13,9 +13,9 @@ #+PROPERTY: header-args :padline no :exports code :cache no :noweb yes #+EXPORT_SELECT_TAGS: export #+EXPORT_EXCLUDE_TAGS: noexport -#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n) +#+TAGS: assert(a) class(c) debug(d) mixin(m) spine(s) tangle(T) template(t) WEB(W) noexport(n) -[[./doc_reform.org][doc_reform]] [[./][org/]] +[[./spine.org][spine]] [[./][org/]] * imports #+name: imports_std @@ -28,7 +28,7 @@ import #+END_SRC * A. get _config file_ (read in) -** 0. module template :module:config_files: +** _module template_ :module:config_files: #+BEGIN_SRC d :tangle "../src/doc_reform/source/read_config_files.d" /++ @@ -166,7 +166,7 @@ static template readConfigDoc() { } #+END_SRC -*** 2. YAML config files get +*** 1. YAML config files get #+name: meta_config_file_yaml #+BEGIN_SRC d @@ -186,7 +186,7 @@ static template configYAML() { } #+END_SRC -*** 3. YAML config (config_local_site & dr_document_make) :file:config:hub: +*** 2. YAML config (config_local_site & dr_document_make) :file:config:hub: #+name: meta_config_file_hub #+BEGIN_SRC d @@ -213,7 +213,7 @@ static template configReadDocYAML() { #+END_SRC * B. get _markup source_, read file :module:source_files: -** 0. module template (includes tuple) +** _module template_ (includes tuple) #+BEGIN_SRC d :tangle "../src/doc_reform/source/read_source_files.d" /++ @@ -461,7 +461,7 @@ final char[][] getInsertMarkupSourceContentRawLineArray( #+END_SRC ** get markup source, master file & inserts :masterfile:inserts: -[[./doc_reform.org][doc_reform]] [[./][org/]] +[[./spine.org][spine]] [[./][org/]] *** scan inserts (sub-document) source :scan_insert_src: **** scan subdoc source diff --git a/org/doc_reform.org b/org/spine.org index 0b98147..c88afa8 100644 --- a/org/doc_reform.org +++ b/org/spine.org @@ -1,7 +1,7 @@ -*- mode: org -*- -#+TITLE: doc_reform hub +#+TITLE: spine (doc_reform) hub #+DESCRIPTION: documents - structuring, various output representations & search -#+FILETAGS: :doc_reform:hub: +#+FILETAGS: :spine:hub: #+AUTHOR: Ralph Amissah #+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] #+COPYRIGHT: Copyright (C) 2015 - 2019 Ralph Amissah @@ -13,7 +13,7 @@ #+PROPERTY: header-args :results silent :padline no :exports code :cache no :noweb yes #+EXPORT_SELECT_TAGS: export #+EXPORT_EXCLUDE_TAGS: noexport -#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n) +#+TAGS: assert(a) class(c) debug(d) mixin(m) spine(s) tangle(T) template(t) WEB(W) noexport(n) [[../maker.org][maker.org makefile]] [[./][org/]] @@ -28,7 +28,7 @@ struct Version { int minor; int patch; } -enum _ver = Version(0, 8, 3); +enum _ver = Version(0, 9, 0); #+END_SRC ** compilation restrictions (supported compilers) @@ -49,7 +49,7 @@ version (Posix) { } #+END_SRC -* 1. doc_reform (sisu document parser) :doc_reform: +* 1. spine (sisu document parser) :spine: ** notes - deal with imports - get options @@ -60,61 +60,61 @@ version (Posix) { - process file - output -** 0. doc_reform src/doc_reform :template: +** 0. spine src/spine :template: - process files (act according to requirements of each type) - by sourcefilename - by sourcefiles contents identifier - by zip filename -#+BEGIN_SRC d :tangle "../src/doc_reform/doc_reform.d" :shebang #!/usr/bin/env rdmd +#+BEGIN_SRC d :tangle "../src/doc_reform/spine.d" :shebang #!/usr/bin/env rdmd <<doc_header_including_copyright_and_license>> module doc_reform.sisu_document_parser; import doc_reform.conf.compile_time_info, doc_reform.meta.metadoc; -<<imports_doc_reform>> +<<imports_spine>> import std.algorithm; import std.parallelism; -<<mixin_doc_reform_version>> +<<mixin_spine_version>> <<mixin_pre_main>> string project_name = "DocReform"; -string program_name = "doc-reform"; +string program_name = "spine"; /++ -name "doc_reform" +name "spine" description "A SiSU inspired document parser writen in D." homepage "http://sisudoc.org" +/ void main(string[] args) { - <<doc_reform_mixin>> - <<doc_reform_init>> - <<doc_reform_args>> - <<doc_reform_do_selected>> + <<spine_mixin>> + <<spine_init>> + <<spine_args>> + <<spine_do_selected>> if (_manifests.length > 1 // _manifests[0] initialized dummy element && _opt_action.abstraction) { if (_opt_action.parallelise) { // see else foreach(manifest; parallel(_manifests[1..$])) { if (!empty(manifest.src.filename)) { - <<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>> + <<spine_each_file_do_scope>> + <<spine_each_file_do_abstraction>> + <<spine_each_file_do_debugs_checkdoc>> + <<spine_each_file_do_selected_output>> + <<spine_each_file_do_scope_exit>> } else { - <<doc_reform_no_filename_provided>> + <<spine_no_filename_provided>> } } } else { // note cannot parallelise sqlite shared db foreach(manifest; _manifests[1..$]) { writeln("parallelisation off: actions include sqlite shared db"); if (!empty(manifest.src.filename)) { - <<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>> + <<spine_each_file_do_scope>> + <<spine_each_file_do_abstraction>> + <<spine_each_file_do_debugs_checkdoc>> + <<spine_each_file_do_selected_output>> + <<spine_each_file_do_scope_exit>> } else { - <<doc_reform_no_filename_provided>> + <<spine_no_filename_provided>> } } } @@ -145,7 +145,7 @@ void main(string[] args) { #+NAME: doc_header_including_copyright_and_license #+BEGIN_SRC text /+ -- Name: Doc Reform +- Name: Spine, Doc Reform - Description: documents, structuring, processing, publishing, search - static content generator @@ -157,7 +157,7 @@ void main(string[] args) { - License: AGPL 3 or later: - Doc Reform (SiSU), a framework for document structuring, publishing and + Spine (SiSU), a framework for document structuring, publishing and search Copyright (C) Ralph Amissah @@ -180,7 +180,7 @@ void main(string[] args) { [http://www.fsf.org/licensing/licenses/agpl.html] [http://www.gnu.org/licenses/agpl.html] - - Doc Reform (related to SiSU) uses standard: + - Spine (by Doc Reform, related to SiSU) uses standard: - docReform markup syntax - standard SiSU markup syntax with modified headers and minor modifications - docReform object numbering @@ -200,9 +200,9 @@ void main(string[] args) { ** 1. pre-loop init :init: *** init **** imports :import: -***** doc_reform :doc_reform: +***** spine :spine: -#+NAME: imports_doc_reform +#+NAME: imports_spine #+BEGIN_SRC d import std.datetime, @@ -230,7 +230,7 @@ import ****** notes ├── src │ ├── doc_reform.d -│ └── doc_reform +│ └── spine │ ├── conf │ ├── meta │ └── output @@ -244,14 +244,14 @@ import [[./source_read_files.org][source_read_files]] [[./compile_time_info.org][compile time info]] [[./output.org][output]] -[[./doc_reform.org][doc_reform]] +[[./spine.org][spine]] keep up to date, configuration in ../maker.org **** mixins :mixin: ***** version.txt :version: -#+NAME: mixin_doc_reform_version +#+NAME: mixin_spine_version #+BEGIN_SRC d mixin(import("version.txt")); #+END_SRC @@ -263,9 +263,9 @@ mixin(import("version.txt")); mixin CompileTimeInfo; #+END_SRC -***** doc_reform "main" mixins :doc_reform: +***** spine "main" mixins :spine: -#+NAME: doc_reform_mixin +#+NAME: spine_mixin #+BEGIN_SRC d mixin DocReformRgxInit; mixin contentJSONtoDocReformStruct; @@ -276,14 +276,14 @@ mixin outputHub; **** init :init: -#+NAME: doc_reform_init +#+NAME: spine_init #+BEGIN_SRC d auto hvst = DocReformHarvest!(); #+END_SRC **** args :args: -#+NAME: doc_reform_init +#+NAME: spine_init #+BEGIN_SRC d string flag_action; string arg_unrecognized; @@ -293,7 +293,7 @@ static auto rgx = Rgx(); *** scope (run complete) :scope: -#+NAME: doc_reform_init +#+NAME: spine_init #+BEGIN_SRC d scope(success) { writefln( @@ -318,7 +318,7 @@ scope(failure) { **** set getopt options - set getopt options -#+NAME: doc_reform_args +#+NAME: spine_args #+BEGIN_SRC d bool[string] opts = [ "abstraction" : false, @@ -408,7 +408,7 @@ auto helpInfo = getopt(args, "parallel-subprocesses", "--parallel-subprocesses nested parallelisation", &opts["parallel-subprocesses"], "quiet|q", "--quiet output to terminal", &opts["quiet"], "pdf", "--pdf latex output for pdfs", &opts["pdf"], - "pod", "--pod doc reform pod source content bundled", &opts["pod"], + "pod", "--pod spine (doc reform) pod source content bundled", &opts["pod"], "serial", "--serial serial processing", &opts["serial"], "show-summary", "--show-summary", &opts["show-summary"], "show-make", "--show-make", &opts["show-make"], @@ -452,7 +452,7 @@ if (helpInfo.helpWanted) { **** getopt hash to struct - move getopt options to struct -#+NAME: doc_reform_args +#+NAME: spine_args #+BEGIN_SRC d enum outTask { source_or_pod, sqlite, sqlite_multi, latex, odt, epub, html_scroll, html_seg, html_stuff } struct OptActions { @@ -719,7 +719,7 @@ auto _opt_action = OptActions(); **** env - environmental info -#+NAME: doc_reform_args +#+NAME: spine_args #+BEGIN_SRC d auto program_info() { struct ProgramInfo { @@ -755,7 +755,7 @@ auto _env = [ *** opt actions on processing files & file paths (pods, src etc.) -#+NAME: doc_reform_args +#+NAME: spine_args #+BEGIN_SRC d auto _manifested = PathMatters!()(_opt_action, _env, ""); auto _manifests = [ _manifested ]; @@ -941,7 +941,7 @@ foreach(arg; args[1..$]) { // refigure how args relate to _opt_action, need path *** config files load & read -#+NAME: doc_reform_conf_files_in_yaml +#+NAME: spine_conf_files_in_yaml #+BEGIN_SRC d { /+ document config/make file +/ auto _config_document_struct = readConfigDoc!()(_manifest, _env); @@ -954,7 +954,7 @@ foreach(arg; args[1..$]) { // refigure how args relate to _opt_action, need path *** opt actions independent of processing files (no files no processing loop) -#+NAME: doc_reform_do_selected +#+NAME: spine_do_selected #+BEGIN_SRC d if (!(_opt_action.skip_output)) { if ((_opt_action.debug_do) @@ -974,7 +974,7 @@ if (!(_opt_action.skip_output)) { ** _2. processing: (loop each file)_ [+2] :loop:files: *** scope (loop) :scope: -#+NAME: doc_reform_each_file_do_scope +#+NAME: spine_each_file_do_scope #+BEGIN_SRC d scope(success) { if (!(_opt_action.quiet)) { @@ -1007,7 +1007,7 @@ enforce( - doc_abstraction (the document) - doc_matters -#+NAME: doc_reform_each_file_do_abstraction +#+NAME: spine_each_file_do_abstraction #+BEGIN_SRC d if ((_opt_action.debug_do) || (_opt_action.very_verbose) @@ -1031,7 +1031,7 @@ if ((doc_matters.opt.action.debug_do) ***** show document summary - abstraction _print summary_ (to screen) :abstraction:summary: --show-summary (abstraction summary) -#+NAME: doc_reform_each_file_do_debugs_checkdoc +#+NAME: spine_each_file_do_debugs_checkdoc #+BEGIN_SRC d /+ ↓ debugs +/ if (doc_matters.opt.action.verbose @@ -1045,7 +1045,7 @@ if (doc_matters.opt.action.verbose ***** show metadata (doc headers metadata) --show-metadata -#+NAME: doc_reform_each_file_do_debugs_checkdoc +#+NAME: spine_each_file_do_debugs_checkdoc #+BEGIN_SRC d /+ ↓ debugs +/ if (doc_matters.opt.action.show_metadata @@ -1058,7 +1058,7 @@ if (doc_matters.opt.action.show_metadata ***** show make (make files & doc headers) --show-make -#+NAME: doc_reform_each_file_do_debugs_checkdoc +#+NAME: spine_each_file_do_debugs_checkdoc #+BEGIN_SRC d /+ ↓ debugs +/ if (doc_matters.opt.action.show_make @@ -1071,7 +1071,7 @@ if (doc_matters.opt.action.show_make ***** show config (config files & doc headers) --show-config -#+NAME: doc_reform_each_file_do_debugs_checkdoc +#+NAME: spine_each_file_do_debugs_checkdoc #+BEGIN_SRC d /+ ↓ debugs +/ if (doc_matters.opt.action.show_config @@ -1084,7 +1084,7 @@ if (doc_matters.opt.action.show_config ***** abstraction harvest :abstraction:harvest: - abstraction harvest -#+NAME: doc_reform_each_file_do_debugs_checkdoc +#+NAME: spine_each_file_do_debugs_checkdoc #+BEGIN_SRC d if (doc_matters.opt.action.harvest) { hvst.harvests ~= DocReformMetaDocHarvest!()(doc_matters, hvst); @@ -1094,7 +1094,7 @@ if (doc_matters.opt.action.harvest) { **** 1. _debug_ (document parts, checkdoc) :debug:checkdoc: - [[./meta_output_debugs.org][meta_output_debugs]] -#+NAME: doc_reform_each_file_do_debugs_checkdoc +#+NAME: spine_each_file_do_debugs_checkdoc #+BEGIN_SRC d /+ ↓ debugs +/ if (doc_matters.opt.action.debug_do) { @@ -1105,7 +1105,7 @@ if (doc_matters.opt.action.debug_do) { **** 2. _process outputs_ :outputs: - [[./output_hub.org][output_hub]] -#+NAME: doc_reform_each_file_do_selected_output +#+NAME: spine_each_file_do_selected_output #+BEGIN_SRC d /+ ↓ output hub +/ if (!(doc_matters.opt.action.skip_output)) { @@ -1125,7 +1125,7 @@ if (!(doc_matters.opt.action.skip_output)) { *** scope (on loop exit) :scope:exit: -#+NAME: doc_reform_each_file_do_scope_exit +#+NAME: spine_each_file_do_scope_exit #+BEGIN_SRC d scope(exit) { if (!(_opt_action.quiet)) { @@ -1140,7 +1140,7 @@ scope(exit) { #+END_SRC ** +2c. no valid filename provided+ -#+NAME: doc_reform_no_filename_provided +#+NAME: spine_no_filename_provided #+BEGIN_SRC d /+ no recognized filename provided +/ writeln("no recognized filename"); @@ -1148,15 +1148,15 @@ break; // terminate, stop #+END_SRC * 2. pre-processing -** Output _document abstraction functions_ :module:doc_reform:abstraction: +** Output _document abstraction functions_ :module:spine:abstraction: *** 0 module template - abstraction template #+BEGIN_SRC d :tangle "../src/doc_reform/meta/metadoc.d" module doc_reform.meta.metadoc; template DocReformAbstraction() { - <<imports_doc_reform>> - <<doc_reform_mixin>> + <<imports_spine>> + <<spine_mixin>> enum headBody { header, body_content, header_type, insert_file_list, image_list } enum makeMeta { make, meta } enum docAbst { doc_abstract_obj, doc_has } @@ -1168,11 +1168,11 @@ template DocReformAbstraction() { M _manifest, S _make_and_meta_struct ){ - <<doc_reform_conf_files_in_yaml>> - <<doc_reform_each_file_do_read_and_split_dr_markup_file_content_into_header_and_body>> - <<doc_reform_each_file_do_split_dr_markup_file_header_into_make_and_meta_structs>> - <<doc_reform_each_file_do_document_abstraction>> - <<doc_reform_each_file_do_document_matters>> + <<spine_conf_files_in_yaml>> + <<spine_each_file_do_read_and_split_dr_markup_file_content_into_header_and_body>> + <<spine_each_file_do_split_dr_markup_file_header_into_make_and_meta_structs>> + <<spine_each_file_do_document_abstraction>> + <<spine_each_file_do_document_matters>> auto t = tuple(doc_abstraction, doc_matters); static assert(t.length==2); return t; @@ -1207,7 +1207,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: doc_reform_each_file_do_read_and_split_dr_markup_file_content_into_header_and_body +#+NAME: spine_each_file_do_read_and_split_dr_markup_file_content_into_header_and_body #+BEGIN_SRC d /+ ↓ read file (filename with path) +/ /+ ↓ file tuple of header and content +/ @@ -1246,7 +1246,7 @@ debug(header_and_body) { - make instructions (from configuration files & document header make instructions) -#+NAME: doc_reform_each_file_do_split_dr_markup_file_header_into_make_and_meta_structs +#+NAME: spine_each_file_do_split_dr_markup_file_header_into_make_and_meta_structs #+BEGIN_SRC d /+ ↓ split header into make and meta +/ if ((_opt_action.debug_do) @@ -1283,7 +1283,7 @@ if ((_opt_action.debug_do) - segnames for html epub (transfer to _doc_matters_) - image list (transfer to _doc_matters_) -#+NAME: doc_reform_each_file_do_document_abstraction +#+NAME: spine_each_file_do_document_abstraction #+BEGIN_SRC d /+ ↓ document abstraction: process document, return abstraction as tuple +/ if ((_opt_action.debug_do) @@ -1316,7 +1316,7 @@ if ((_opt_action.debug_do) **** verbose message -#+NAME: doc_reform_each_file_do_document_matters +#+NAME: spine_each_file_do_document_matters #+BEGIN_SRC d if ((_opt_action.debug_do) || (_opt_action.very_verbose) @@ -1327,14 +1327,14 @@ if ((_opt_action.debug_do) **** DocumentMatters struct { -#+NAME: doc_reform_each_file_do_document_matters +#+NAME: spine_each_file_do_document_matters #+BEGIN_SRC d struct DocumentMatters { #+END_SRC **** generator related -#+NAME: doc_reform_each_file_do_document_matters +#+NAME: spine_each_file_do_document_matters #+BEGIN_SRC d auto generator_program() { struct Prog_ { @@ -1384,7 +1384,7 @@ struct DocumentMatters { **** config make & meta -#+NAME: doc_reform_each_file_do_document_matters +#+NAME: spine_each_file_do_document_matters #+BEGIN_SRC d auto conf_make_meta() { return _make_and_meta_struct; @@ -1396,7 +1396,7 @@ struct DocumentMatters { **** env related -#+NAME: doc_reform_each_file_do_document_matters +#+NAME: spine_each_file_do_document_matters #+BEGIN_SRC d auto env() { struct Env_ { @@ -1413,7 +1413,7 @@ struct DocumentMatters { **** opt -#+NAME: doc_reform_each_file_do_document_matters +#+NAME: spine_each_file_do_document_matters #+BEGIN_SRC d auto opt() { struct Opt_ { @@ -1431,7 +1431,7 @@ struct DocumentMatters { **** output related -#+NAME: doc_reform_each_file_do_document_matters +#+NAME: spine_each_file_do_document_matters #+BEGIN_SRC d auto src() { return _manifest.src; @@ -1468,7 +1468,7 @@ struct DocumentMatters { **** } close -#+NAME: doc_reform_each_file_do_document_matters +#+NAME: spine_each_file_do_document_matters #+BEGIN_SRC d } auto doc_matters = DocumentMatters(); @@ -1476,7 +1476,7 @@ auto doc_matters = DocumentMatters(); **** step complete message -#+NAME: doc_reform_each_file_do_document_matters +#+NAME: spine_each_file_do_document_matters #+BEGIN_SRC d if ((_opt_action.debug_do) || (_opt_action.very_verbose) @@ -1489,7 +1489,7 @@ if ((_opt_action.debug_do) - harvest abridged doc matters gathered ***** doc matters shared -#+NAME: doc_reform_each_file_do_document_matters_abridged +#+NAME: spine_each_file_do_document_matters_abridged #+BEGIN_SRC d if ((_opt_action.debug_do) || (_opt_action.verbose) @@ -1522,7 +1522,7 @@ DocumentMattersShared doc_matters_shared = DocumentMattersShared(); ***** abridged doc matters, for harvest (from doc head only, doc abstraction not performed) TODO -#+NAME: doc_reform_each_file_do_document_matters_abridged +#+NAME: spine_each_file_do_document_matters_abridged #+BEGIN_SRC d struct DocumentMattersAbridged { auto conf_make_meta() { @@ -1763,10 +1763,10 @@ dev notes | | | + footnote seq. digit | anchor visible | | |-------------+-----------------------+-----------------------+----------------+------| -** doc_reform glossary / terms +** spine glossary / terms |------------+-------------------------------------| -| doc_reform | sisu document parser | +| spine | sisu document parser | |------------+-------------------------------------| | dmso | document markup, structure, objects | |------------+-------------------------------------| diff --git a/org/dr_build_scaffold.org b/org/spine_build_scaffold.org index 0b6d901..695cff0 100644 --- a/org/dr_build_scaffold.org +++ b/org/spine_build_scaffold.org @@ -1,7 +1,7 @@ -*- mode: org -*- -#+TITLE: doc_reform (project) makefile -#+DESCRIPTION: makefile for doc_reform -#+FILETAGS: :doc_reform:makefile: +#+TITLE: spine (doc_reform) (project) makefile +#+DESCRIPTION: makefile for spine +#+FILETAGS: :spine:makefile: #+AUTHOR: Ralph Amissah #+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] #+COPYRIGHT: Copyright (C) 2015 - 2019 Ralph Amissah @@ -13,9 +13,9 @@ #+PROPERTY: header-args :padline no :exports code :noweb yes #+EXPORT_SELECT_TAGS: export #+EXPORT_EXCLUDE_TAGS: noexport -#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n) +#+TAGS: assert(a) class(c) debug(d) mixin(m) spine(s) tangle(T) template(t) WEB(W) noexport(n) -[[./org/doc_reform.org][doc_reform.org]] [[./org/][org/]] +[[./org/spine.org][spine.org]] [[./org/][org/]] * makefile :makefile: ** settings [+2] :settings: @@ -33,10 +33,10 @@ DUB=dub DUB_FLAGS=-v --force --compiler= #+END_SRC -*** Project Details :project:sdp: +*** Project Details :project:spine: #+BEGIN_SRC makefile :tangle ../makefile -PRG_NAME=doc-reform +PRG_NAME=spine PRG_NICKAME=rad PRG_NAME_DIR=$(shell echo `echo $(PRG_NAME) | sed -e "s/-/_/g"`) PRG_SRC=$(PRG_NAME).d @@ -254,8 +254,8 @@ dmd_debug: #+BEGIN_SRC makefile :tangle ../makefile dmd_ver: $(DUB) --compiler=dmd --config=dmd-version - mv bin/doc-reform-dmd-ver bin-archive/doc-reform-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT)-dmd - notify-send -t 0 'D dmd compiled test release executable ready' 'doc-reform-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT)-dmd' + mv bin/spine-dmd-ver bin-archive/spine-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT)-dmd + notify-send -t 0 'D dmd compiled test release executable ready' 'spine-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT)-dmd' dmd_clean_ver: clean tangle dmd_ver #+END_SRC @@ -263,12 +263,12 @@ dmd_clean_ver: clean tangle dmd_ver #+BEGIN_SRC makefile :tangle ../makefile dmd_rel: expunge skel tangle - $(DUB) --compiler=dmd --config=doc-reform-release + $(DUB) --compiler=dmd --config=spine-release dmd_rel_tangle: tangle - $(DUB) --compiler=dmd --config=doc-reform-dmd + $(DUB) --compiler=dmd --config=spine-dmd dmd_rel_expunge_tangle: expunge skel tangle dmd_rel_tangle dmd_debug_tangle: tangle - $(DUB) --compiler=dmd --config=doc-reform-dmd-debug + $(DUB) --compiler=dmd --config=spine-dmd-debug #+END_SRC ****** gdc :gdc: @@ -294,8 +294,8 @@ gdc_debug: #+BEGIN_SRC makefile :tangle ../makefile gdc_ver: $(DUB) --compiler=gdc --config=gdc-version - mv bin/doc-reform-gdc-ver bin-archive/doc-reform-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT)-gdc - notify-send -t 0 'D gdc compiled test release executable ready' 'doc-reform-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT)-gdc' + mv bin/spine-gdc-ver bin-archive/spine-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT)-gdc + notify-send -t 0 'D gdc compiled test release executable ready' 'spine-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT)-gdc' gdc_clean_ver: clean tangle gdc_ver #+END_SRC @@ -303,12 +303,12 @@ gdc_clean_ver: clean tangle gdc_ver #+BEGIN_SRC makefile :tangle ../makefile gdc_rel: expunge skel tangle - $(DUB) --compiler=gdc --config=doc-reform-release + $(DUB) --compiler=gdc --config=spine-release gdc_rel_tangle: tangle - $(DUB) --compiler=gdc --config=doc-reform-gdc + $(DUB) --compiler=gdc --config=spine-gdc gdc_rel_expunge_tangle: expunge skel tangle gdc_rel_tangle gdc_debug_tangle: tangle - $(DUB) --compiler=gdc --config=doc-reform-gdc-debug + $(DUB) --compiler=gdc --config=spine-gdc-debug #+END_SRC ****** ldc :ldc: @@ -334,8 +334,8 @@ ldc_debug: #+BEGIN_SRC makefile :tangle ../makefile ldc_ver: $(DUB) --compiler=ldc2 --config=ldc-version - mv bin/doc-reform-ldc-ver bin-archive/doc-reform-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT)-ldc - notify-send -t 0 'D ldc2 compiled test release executable ready' 'doc-reform-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT)-ldc' + mv bin/spine-ldc-ver bin-archive/spine-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT)-ldc + notify-send -t 0 'D ldc2 compiled test release executable ready' 'spine-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT)-ldc' ldc_clean_ver: clean tangle ldc_ver #+END_SRC @@ -343,12 +343,12 @@ ldc_clean_ver: clean tangle ldc_ver #+BEGIN_SRC makefile :tangle ../makefile ldc_rel: expunge skel tangle - $(DUB) --compiler=ldc2 --config=doc-reform-release + $(DUB) --compiler=ldc2 --config=spine-release ldc_rel_tangle: tangle - $(DUB) --compiler=ldc2 --config=doc-reform-ldc + $(DUB) --compiler=ldc2 --config=spine-ldc ldc_rel_expunge_tangle: expunge skel tangle ldc_rel_tangle ldc_debug_tangle: tangle - $(DUB) --compiler=ldc2 --config=doc-reform-ldc-debug + $(DUB) --compiler=ldc2 --config=spine-ldc-debug #+END_SRC ***** generic @@ -402,7 +402,7 @@ distclean_and_init: expunge #+BEGIN_SRC makefile :tangle ../makefile ver: - echo doc-reform-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT) + echo spine-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT) #+END_SRC ****** tangle build rebuild :clean:tangle:build: @@ -434,29 +434,29 @@ find_pods: #+BEGIN_SRC makefile :tangle ../makefile dmd_testrun_find: - ./bin/doc-reform-dmd -v --source --html --epub --sqlite-discrete \ + ./bin/spine-dmd -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_pod \ data/pod/sisu-manual dmd_testrun_find_pod_source: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ -./bin/doc-reform-ldc -v --source --html --epub \ +./bin/spine-ldc -v --source --html --epub \ --output-dir=tmp/program_output_pod dmd_testrun_find_pod_pod: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ -./bin/doc-reform-dmd -v --pod \ +./bin/spine-dmd -v --pod \ --output-dir=tmp/program_output_pod dmd_testrun_find_pod_html: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ -./bin/doc-reform-dmd -v --html \ +./bin/spine-dmd -v --html \ --output-dir=tmp/program_output_pod dmd_testrun_find_pod_epub: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ -./bin/doc-reform-dmd -v --epub \ +./bin/spine-dmd -v --epub \ --output-dir=tmp/program_output_pod dmd_testrun_find_pod_all: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ -./bin/doc-reform-dmd -v --source --html --epub --sqlite-discrete \ +./bin/spine-dmd -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_pod #+END_SRC @@ -465,23 +465,23 @@ dmd_testrun_find_pod_all: #+BEGIN_SRC makefile :tangle ../makefile dmd_testrun_paths_pod_source: - ./bin/doc-reform-dmd -v --source \ + ./bin/spine-dmd -v --source \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) dmd_testrun_paths_pod_pod: - ./bin/doc-reform-dmd -v --pod \ + ./bin/spine-dmd -v --pod \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) dmd_testrun_paths_pod_html: - ./bin/doc-reform-dmd -v --html \ + ./bin/spine-dmd -v --html \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) dmd_testrun_paths_pod_epub: - ./bin/doc-reform-dmd -v --epub \ + ./bin/spine-dmd -v --epub \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) dmd_testrun_paths_pod_all: - ./bin/doc-reform-dmd -v --source --html --epub --sqlite-discrete \ + ./bin/spine-dmd -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) @@ -492,29 +492,29 @@ $(SiSU_MARKUP_SAMPLES_POD) #+BEGIN_SRC makefile :tangle ../makefile gdc_testrun_find: - ./bin/doc-reform-gdc -v --source --html --epub --sqlite-discrete \ + ./bin/spine-gdc -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_pod \ data/pod/sisu-manual gdc_testrun_find_pod_source: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ -./bin/doc-reform-gdc -v --source \ +./bin/spine-gdc -v --source \ --output-dir=tmp/program_output_pod gdc_testrun_find_pod_pod: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ -./bin/doc-reform-gdc -v --pod \ +./bin/spine-gdc -v --pod \ --output-dir=tmp/program_output_pod gdc_testrun_find_pod_html: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ -./bin/doc-reform-gdc -v --html \ +./bin/spine-gdc -v --html \ --output-dir=tmp/program_output_pod gdc_testrun_find_pod_epub: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ -./bin/doc-reform-gdc -v --epub \ +./bin/spine-gdc -v --epub \ --output-dir=tmp/program_output_pod gdc_testrun_find_pod_all: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ -./bin/doc-reform-gdc -v --source --html --epub --sqlite-discrete \ +./bin/spine-gdc -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_pod #+END_SRC @@ -523,28 +523,28 @@ gdc_testrun_find_pod_all: #+BEGIN_SRC makefile :tangle ../makefile gdc_testrun_paths: - ./bin/doc-reform-gdc -v --source --html --epub --sqlite-discrete \ + ./bin/spine-gdc -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_pod \ data/pod/sisu-manual gdc_testrun_paths_pod_source: - ./bin/doc-reform-gdc -v --source \ + ./bin/spine-gdc -v --source \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) gdc_testrun_paths_pod_pod: - ./bin/doc-reform-gdc -v --pod \ + ./bin/spine-gdc -v --pod \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) gdc_testrun_paths_pod_html: - ./bin/doc-reform-gdc -v --html \ + ./bin/spine-gdc -v --html \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) gdc_testrun_paths_pod_epub: - ./bin/doc-reform-gdc -v --epub \ + ./bin/spine-gdc -v --epub \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) gdc_testrun_paths_pod_all: - ./bin/doc-reform-gdc -v --source --html --epub --sqlite-discrete \ + ./bin/spine-gdc -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) @@ -555,29 +555,29 @@ $(SiSU_MARKUP_SAMPLES_POD) #+BEGIN_SRC makefile :tangle ../makefile ldc_testrun_find: - ./bin/doc-reform-ldc -v --source --html --epub --sqlite-discrete \ + ./bin/spine-ldc -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_pod \ data/pod/sisu-manual ldc_testrun_find_pod_source: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ - ./bin/doc-reform-ldc -v --source \ + ./bin/spine-ldc -v --source \ --output-dir=tmp/program_output_pod ldc_testrun_find_pod_pod: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ - ./bin/doc-reform-ldc -v --pod \ + ./bin/spine-ldc -v --pod \ --output-dir=tmp/program_output_pod ldc_testrun_find_pod_html: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ - ./bin/doc-reform-ldc -v --html \ + ./bin/spine-ldc -v --html \ --output-dir=tmp/program_output_pod ldc_testrun_find_pod_epub: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ - ./bin/doc-reform-ldc -v --epub \ + ./bin/spine-ldc -v --epub \ --output-dir=tmp/program_output_pod ldc_testrun_find_pod_all: $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \ - ./bin/doc-reform-ldc -v --source --html --epub --sqlite-discrete \ + ./bin/spine-ldc -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_pod #+END_SRC @@ -586,28 +586,28 @@ ldc_testrun_find_pod_all: #+BEGIN_SRC makefile :tangle ../makefile ldc_testrun_paths: - ./bin/doc-reform-ldc -v --source --html --epub --sqlite-discrete \ + ./bin/spine-ldc -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_pod \ data/pod/sisu-manual ldc_testrun_paths_pod_source: - ./bin/doc-reform-ldc -v --source \ + ./bin/spine-ldc -v --source \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) ldc_testrun_paths_pod_pod: - ./bin/doc-reform-ldc -v --pod \ + ./bin/spine-ldc -v --pod \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) ldc_testrun_paths_pod_html: - ./bin/doc-reform-ldc -v --html \ + ./bin/spine-ldc -v --html \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) ldc_testrun_paths_pod_epub: - ./bin/doc-reform-ldc -v --epub \ + ./bin/spine-ldc -v --epub \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) ldc_testrun_paths_pod_all: - ./bin/doc-reform-ldc -v --source --html --epub --sqlite-discrete \ + ./bin/spine-ldc -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_pod \ $(SiSU_MARKUP_SAMPLES_POD) @@ -620,23 +620,23 @@ $(SiSU_MARKUP_SAMPLES_POD) #+BEGIN_SRC makefile :tangle ../makefile dmd_testrun_find_dir_source: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/doc-reform-dmd -v --source \ +./bin/spine-dmd -v --source \ --output-dir=tmp/program_output_dir dmd_testrun_find_dir_pod: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/doc-reform-dmd -v --pod \ +./bin/spine-dmd -v --pod \ --output-dir=tmp/program_output_dir dmd_testrun_find_dir_html: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/doc-reform-dmd -v --html \ +./bin/spine-dmd -v --html \ --output-dir=tmp/program_output_dir dmd_testrun_find_dir_epub: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/doc-reform-dmd -v --epub \ +./bin/spine-dmd -v --epub \ --output-dir=tmp/program_output_dir dmd_testrun_find_dir_all: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/doc-reform-dmd -v --source --html --epub --sqlite-discrete \ +./bin/spine-dmd -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_dir #+END_SRC @@ -645,23 +645,23 @@ dmd_testrun_find_dir_all: #+BEGIN_SRC makefile :tangle ../makefile dmd_testrun_filelist_dir_source: - ./bin/doc-reform-dmd -v --source \ + ./bin/spine-dmd -v --source \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) dmd_testrun_filelist_dir_pod: - ./bin/doc-reform-dmd -v --pod \ + ./bin/spine-dmd -v --pod \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) dmd_testrun_filelist_dir_html: - ./bin/doc-reform-dmd -v --html \ + ./bin/spine-dmd -v --html \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) dmd_testrun_filelist_dir_epub: - ./bin/doc-reform-dmd -v --epub \ + ./bin/spine-dmd -v --epub \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) dmd_testrun_filelist_dir_all: - ./bin/doc-reform-dmd -v --source --html --epub --sqlite-discrete \ + ./bin/spine-dmd -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) @@ -672,24 +672,24 @@ $(SiSU_MARKUP_SAMPLES_DIR) #+BEGIN_SRC makefile :tangle ../makefile gdc_testrun_find_dir_source: - ./bin/doc-reform-gdc -v --source \ + ./bin/spine-gdc -v --source \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) gdc_testrun_find_dir_pod: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/doc-reform-gdc -v --pod \ +./bin/spine-gdc -v --pod \ --output-dir=tmp/program_output_dir gdc_testrun_find_dir_html: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/doc-reform-gdc -v --html \ +./bin/spine-gdc -v --html \ --output-dir=tmp/program_output_dir gdc_testrun_find_dir_epub: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/doc-reform-gdc -v --epub \ +./bin/spine-gdc -v --epub \ --output-dir=tmp/program_output_dir gdc_testrun_find_dir_all: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/doc-reform-gdc -v --source --html --epub --sqlite-discrete \ +./bin/spine-gdc -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_dir #+END_SRC @@ -698,23 +698,23 @@ gdc_testrun_find_dir_all: #+BEGIN_SRC makefile :tangle ../makefile gdc_testrun_filelist_dir_source: - ./bin/doc-reform-gdc -v --source \ + ./bin/spine-gdc -v --source \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) gdc_testrun_filelist_dir_pod: - ./bin/doc-reform-gdc -v --pod \ + ./bin/spine-gdc -v --pod \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) gdc_testrun_filelist_dir_html: - ./bin/doc-reform-gdc -v --html \ + ./bin/spine-gdc -v --html \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) gdc_testrun_filelist_dir_epub: - ./bin/doc-reform-gdc -v --epub \ + ./bin/spine-gdc -v --epub \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) gdc_testrun_filelist_dir_all: - ./bin/doc-reform-gdc -v --source --html --epub --sqlite-discrete \ + ./bin/spine-gdc -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) @@ -726,23 +726,23 @@ $(SiSU_MARKUP_SAMPLES_DIR) #+BEGIN_SRC makefile :tangle ../makefile ldc_testrun_find_dir_source: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/doc-reform-ldc -v --source \ +./bin/spine-ldc -v --source \ --output-dir=tmp/program_output_dir ldc_testrun_find_dir_pod: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/doc-reform-ldc -v --pod \ +./bin/spine-ldc -v --pod \ --output-dir=tmp/program_output_dir ldc_testrun_find_dir_html: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/doc-reform-ldc -v --html \ +./bin/spine-ldc -v --html \ --output-dir=tmp/program_output_dir ldc_testrun_find_dir_epub: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/doc-reform-ldc -v --epub \ +./bin/spine-ldc -v --epub \ --output-dir=tmp/program_output_dir ldc_testrun_find_dir_all: $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \ -./bin/doc-reform-ldc -v --source --html --epub --sqlite-discrete \ +./bin/spine-ldc -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_dir #+END_SRC @@ -751,23 +751,23 @@ ldc_testrun_find_dir_all: #+BEGIN_SRC makefile :tangle ../makefile ldc_testrun_filelist_dir_source: - ./bin/doc-reform-ldc -v --source \ + ./bin/spine-ldc -v --source \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) ldc_testrun_filelist_dir_pod: - ./bin/doc-reform-ldc -v --pod \ + ./bin/spine-ldc -v --pod \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) ldc_testrun_filelist_dir_html: - ./bin/doc-reform-ldc -v --html \ + ./bin/spine-ldc -v --html \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) ldc_testrun_filelist_dir_epub: - ./bin/doc-reform-ldc -v --epub \ + ./bin/spine-ldc -v --epub \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) ldc_testrun_filelist_dir_all: - ./bin/doc-reform-ldc -v --source --html --epub --sqlite-discrete \ + ./bin/spine-ldc -v --source --html --epub --sqlite-discrete \ --sqlite-create --sqlite-update \ --output-dir=tmp/program_output_dir \ $(SiSU_MARKUP_SAMPLES_DIR) @@ -840,7 +840,7 @@ 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 "doc-reform" +name "spine" description "sisu document parser" homepage "http://sisudoc.org" authors "Ralph Amissah" @@ -867,8 +867,8 @@ time (dub --compiler=gdc -b release) #+BEGIN_SRC sh :tangle ../dub.sdl configuration "default" { - targetName "doc-reform" - postGenerateCommands "/usr/bin/notify-send -t 0 'D executable ready' 'doc-reform'" + targetName "spine" + postGenerateCommands "/usr/bin/notify-send -t 0 'D executable ready' 'spine'" } #+END_SRC @@ -879,8 +879,8 @@ time (dub --compiler=dmd --config=dmd -b dmd-release) #+BEGIN_SRC sh :tangle ../dub.sdl configuration "dmd" { - targetName "doc-reform-dmd" - postGenerateCommands "/usr/bin/notify-send -t 0 'D executable ready' 'doc-reform-dmd'" + targetName "spine-dmd" + postGenerateCommands "/usr/bin/notify-send -t 0 'D executable ready' 'spine-dmd'" } buildType "dmd" { dflags "-J=views" "-I=src/doc_reform" @@ -894,8 +894,8 @@ buildType "dmd-release" { configuration "dmd-version" { dflags "-J=views" "-I=src/doc_reform" buildOptions "verbose" "releaseMode" "optimize" "inline" - targetName "doc-reform-dmd-ver" - postGenerateCommands "/usr/bin/notify-send -t 0 'D executable ready' 'doc-reform-dmd-ver'" + targetName "spine-dmd-ver" + postGenerateCommands "/usr/bin/notify-send -t 0 'D executable ready' 'spine-dmd-ver'" } #+END_SRC @@ -906,8 +906,8 @@ time (dub --compiler=ldc2 --config=ldc -b ldc-release) #+BEGIN_SRC sh :tangle ../dub.sdl configuration "ldc" { - targetName "doc-reform-ldc" - postGenerateCommands "/usr/bin/notify-send -t 0 'D executable ready' 'doc-reform-ldc'" + targetName "spine-ldc" + postGenerateCommands "/usr/bin/notify-send -t 0 'D executable ready' 'spine-ldc'" } buildType "ldc" { dflags "-O2" "-J=views" "-I=src/doc_reform" @@ -921,8 +921,8 @@ buildType "ldc-release" { configuration "ldc-version" { dflags "-O2" "-J=views" "-I=src/doc_reform" buildOptions "verbose" "optimize" "inline" "releaseMode" - targetName "doc-reform-ldc-ver" - postGenerateCommands "/usr/bin/notify-send -t 0 'D executable ready' 'doc-reform-ldc-ver'" + targetName "spine-ldc-ver" + postGenerateCommands "/usr/bin/notify-send -t 0 'D executable ready' 'spine-ldc-ver'" } #+END_SRC @@ -933,8 +933,8 @@ time (dub --compiler=gdc --config=gdc -b gdc-release) #+BEGIN_SRC sh :tangle ../dub.sdl configuration "gdc" { - targetName "doc-reform-gdc" - postGenerateCommands "/usr/bin/notify-send -t 0 'D executable ready' 'doc-reform-gdc'" + targetName "spine-gdc" + postGenerateCommands "/usr/bin/notify-send -t 0 'D executable ready' 'spine-gdc'" } buildType "gdc" { dflags "-O2" "-J=views" "-I=src/doc_reform" @@ -951,8 +951,8 @@ configuration "gdc-version" { dflags "-O2" "-J=views" "-I=src/doc_reform" lflags "-lz" buildOptions "verbose" "optimize" "inline" "releaseMode" - targetName "doc-reform-gdc-ver" - postGenerateCommands "/usr/bin/notify-send -t 0 'D executable ready' 'doc-reform-gdc-ver'" + targetName "spine-gdc-ver" + postGenerateCommands "/usr/bin/notify-send -t 0 'D executable ready' 'spine-gdc-ver'" } #+END_SRC @@ -964,10 +964,10 @@ configuration "build" { name "build" targetType "executable" platforms "posix" - targetName "bin/doc-reform" + targetName "bin/spine" dflags "-J=views" "-I=src/doc_reform" buildOptions "verbose" "releaseMode" "optimize" "inline" - postGenerateCommands "/usr/bin/notify-send -t 0 'D release executable ready' 'doc-reform'" + postGenerateCommands "/usr/bin/notify-send -t 0 'D release executable ready' 'spine'" } #+END_SRC @@ -999,13 +999,13 @@ http://mesonbuild.com/Dependencies.html#Dub tree -fi ./src |rg "\.d$" #+BEGIN_SRC sh :tangle ../meson.build -project('doc-reform', 'd', +project('spine', 'd', license: 'AGPL3', version: '0.26.5', meson_version: '>=0.46' ) -doc_reform_sources = [ - 'src/doc_reform/doc_reform.d', +spine_sources = [ + 'src/doc_reform/spine.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', @@ -1047,8 +1047,8 @@ sources_dir = include_directories('src/') 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']) # executable -doc_reform_exe = executable('rad', - [doc_reform_sources], +spine_exe = executable('rad', + [spine_sources], include_directories : [sources_dir], d_import_dirs: [include_directories('views')], dependencies : [ @@ -1210,16 +1210,16 @@ dub build -h #+END_SRC #+BEGIN_SRC sh -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=dmd --config=spine-dmd --debug=steps) +time (dub --compiler=ldc2 --config=spine-ldc --debug=steps) +time (dub --compiler=gdc --config=spine-gdc --debug=steps) -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) +time (dub --compiler=ldc2 --config=spine-ldc --debug=checkdoc --debug=summary --debug=dumpdoc) +time (dub --compiler=ldc2 --config=spine-ldc --debug=io) +time (dub --compiler=ldc2 --config=spine-ldc --debug=checkdoc --debug=summary --debug=dumpdoc --debug=io) +time (dub --compiler=ldc2 --config=spine-ldc-debug --debug=io) +time (dub --compiler=gdc --config=spine-gdc-debug --debug=io) +time (dub --compiler=dmd --config=spine-dmd-debug --debug=io) #+END_SRC *** make @@ -1270,27 +1270,27 @@ git log --since="1 day ago" --name-only --pretty=format: | sort -u ** test run *** e.g. -time (./bin/doc-reform-ldc --source --html -v --output-dir=tmp/program-output data/pod/sisu-manual/media/text/en/sisu_markup.sst ) +time (./bin/spine-ldc --source --html -v --output-dir=tmp/program-output data/pod/sisu-manual/media/text/en/sisu_markup.sst ) -time (./bin/doc-reform-ldc --source --html -v --output-dir=tmp/program-output data/pod/sisu-manual ) -time (./bin/doc-reform-ldc --source --html -v --output-dir=tmp/program-output data/pod/the_wealth_of_networks.yochai_benkler ) -time (./bin/doc-reform-ldc --source --html -v --output-dir=tmp/program-output data/pod/live-manual ) +time (./bin/spine-ldc --source --html -v --output-dir=tmp/program-output data/pod/sisu-manual ) +time (./bin/spine-ldc --source --html -v --output-dir=tmp/program-output data/pod/the_wealth_of_networks.yochai_benkler ) +time (./bin/spine-ldc --source --html -v --output-dir=tmp/program-output data/pod/live-manual ) -time (~sdp2/bin/doc-reform-ldc --pod --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/spine-ldc --pod --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/doc-reform-ldc --html -v sisudoc) +time (~sdp2/bin/spine-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/doc-reform-ldc --html --lang=en,es -v sisudoc) +time (~sdp2/bin/spine-ldc --html --lang=en,es -v sisudoc) -time ( find data/pod -name pod.manifest | sort | xargs ./bin/doc-reform-ldc --source --html --epub -v --output-dir=tmp/program-output ) +time ( find data/pod -name pod.manifest | sort | xargs ./bin/spine-ldc --source --html --epub -v --output-dir=tmp/program-output ) -time ( find data/pod -maxdepth 2 -name pod.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 ) +time ( find data/pod -maxdepth 2 -name pod.manifest | sort | xargs ./bin/spine-ldc --source --html --epub -v --output-dir=tmp/program-output ) +time ( find data/sisudir/media/text -name *.ss[tm] | sort | xargs ./bin/spine-ldc --source --html --epub -v --output-dir=tmp/program-output ) find data/pod -maxdepth 2 -name pod.manifest | sort | xargs @@ -1338,7 +1338,7 @@ dub fetch taggedalgebraic dub fetch libinputvisitor dub fetch unit-threaded ? -sdp ~master: /home/ralph/grotto/repo/git.repo/utils/doc-reform-x/ +sdp ~master: /home/ralph/grotto/repo/git.repo/utils/spine-x/ /home/ralph/.dub/packages/* **** build diff --git a/org/dr_info.org b/org/spine_info.org index dd5fa12..a80089f 100644 --- a/org/dr_info.org +++ b/org/spine_info.org @@ -1,7 +1,7 @@ -*- mode: org -*- -#+TITLE: doc_reform information files +#+TITLE: spine (doc_reform) information files #+DESCRIPTION: documents - structuring, various output representations & search -#+FILETAGS: :doc_reform:info: +#+FILETAGS: :spine:info: #+AUTHOR: Ralph Amissah #+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] #+COPYRIGHT: Copyright (C) 2015 - 2019 Ralph Amissah @@ -13,12 +13,12 @@ #+PROPERTY: header-args :results silent :padline no :exports code :cache no :noweb yes #+EXPORT_SELECT_TAGS: export #+EXPORT_EXCLUDE_TAGS: noexport -#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n) +#+TAGS: assert(a) class(c) debug(d) mixin(m) spine(s) tangle(T) template(t) WEB(W) noexport(n) * README #+BEGIN_SRC text :tangle "../README" -project_name: Doc Reform +project_name: Spine, Doc Reform description: [ "documents, structuring, processing, publishing", search, @@ -46,32 +46,32 @@ project_name: Doc Reform *** project (project root) ./ #+BEGIN_SRC text :tangle "../COPYRIGHT" -<<doc_reform_copyright>> -<<doc_reform_license_agpl3>> -<<doc_reform_extra>> +<<spine_copyright>> +<<spine_license_agpl3>> +<<spine_extra>> #+END_SRC *** code source ./src #+BEGIN_SRC text :tangle "../src/COPYRIGHT" -<<doc_reform_copyright>> -<<doc_reform_license_agpl3>> -<<doc_reform_extra>> +<<spine_copyright>> +<<spine_license_agpl3>> +<<spine_extra>> #+END_SRC -*** code source ./src/doc_reform +*** code source ./src/spine #+BEGIN_SRC text :tangle "../src/doc_reform/COPYRIGHT" -<<doc_reform_copyright>> -<<doc_reform_license_agpl3>> -<<doc_reform_extra>> +<<spine_copyright>> +<<spine_license_agpl3>> +<<spine_extra>> #+END_SRC *** org files ./org #+BEGIN_SRC text :tangle "./COPYRIGHT" -<<doc_reform_copyright>> -<<doc_reform_extra>> +<<spine_copyright>> +<<spine_extra>> #+END_SRC *** data (markup samples) ./data @@ -83,9 +83,9 @@ project_name: Doc Reform ** incorporate *** copyright -#+NAME: doc_reform_copyright +#+NAME: spine_copyright #+BEGIN_SRC text -- Name: Doc Reform +- Name: Spine, Doc Reform - Description: documents, structuring, processing, publishing, search - static content generator @@ -98,12 +98,12 @@ project_name: Doc Reform *** license -#+NAME: doc_reform_license_agpl3 +#+NAME: spine_license_agpl3 #+BEGIN_SRC text - code under src/ - License: AGPL 3 or later: - Doc Reform (SiSU), a framework for document structuring, publishing and + Spine, Doc Reform (SiSU), a framework for document structuring, publishing and search Copyright (C) Ralph Amissah @@ -130,9 +130,9 @@ project_name: Doc Reform *** tail -#+NAME: doc_reform_extra +#+NAME: spine_extra #+BEGIN_SRC text - - Doc Reform (related to SiSU) uses standard: + - Spine, Doc Reform (related to SiSU) uses standard: - docReform markup syntax - standard SiSU markup syntax with modified headers and minor modifications @@ -150,9 +150,9 @@ project_name: Doc Reform #+END_SRC *** data -#+NAME: doc_reform_extra +#+NAME: spine_extra #+BEGIN_SRC text -- Doc Reform markup samples +- Spine, Doc Reform (SiSU) markup samples Individual document content Copyright (Author) [as stated in document header] Individual document content License (Author) [as stated in document header] diff --git a/src/COPYRIGHT b/src/COPYRIGHT index 0a50313..7003a8b 100644 --- a/src/COPYRIGHT +++ b/src/COPYRIGHT @@ -1,4 +1,4 @@ -- Name: Doc Reform +- Name: Spine, Doc Reform - Description: documents, structuring, processing, publishing, search - static content generator @@ -10,7 +10,7 @@ - code under src/ - License: AGPL 3 or later: - Doc Reform (SiSU), a framework for document structuring, publishing and + Spine, Doc Reform (SiSU), a framework for document structuring, publishing and search Copyright (C) Ralph Amissah @@ -33,7 +33,7 @@ [http://www.fsf.org/licensing/licenses/agpl.html] [http://www.gnu.org/licenses/agpl.html] - - Doc Reform (related to SiSU) uses standard: + - Spine, Doc Reform (related to SiSU) uses standard: - docReform markup syntax - standard SiSU markup syntax with modified headers and minor modifications @@ -48,6 +48,6 @@ [http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary] [http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/html.rb;hb=HEAD] -- Doc Reform markup samples +- Spine, Doc Reform (SiSU) markup samples Individual document content Copyright (Author) [as stated in document header] Individual document content License (Author) [as stated in document header] diff --git a/src/doc_reform/COPYRIGHT b/src/doc_reform/COPYRIGHT index 0a50313..7003a8b 100644 --- a/src/doc_reform/COPYRIGHT +++ b/src/doc_reform/COPYRIGHT @@ -1,4 +1,4 @@ -- Name: Doc Reform +- Name: Spine, Doc Reform - Description: documents, structuring, processing, publishing, search - static content generator @@ -10,7 +10,7 @@ - code under src/ - License: AGPL 3 or later: - Doc Reform (SiSU), a framework for document structuring, publishing and + Spine, Doc Reform (SiSU), a framework for document structuring, publishing and search Copyright (C) Ralph Amissah @@ -33,7 +33,7 @@ [http://www.fsf.org/licensing/licenses/agpl.html] [http://www.gnu.org/licenses/agpl.html] - - Doc Reform (related to SiSU) uses standard: + - Spine, Doc Reform (related to SiSU) uses standard: - docReform markup syntax - standard SiSU markup syntax with modified headers and minor modifications @@ -48,6 +48,6 @@ [http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary] [http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/html.rb;hb=HEAD] -- Doc Reform markup samples +- Spine, Doc Reform (SiSU) markup samples Individual document content Copyright (Author) [as stated in document header] Individual document content License (Author) [as stated in document header] diff --git a/src/doc_reform/meta/conf_make_meta_structs.d b/src/doc_reform/meta/conf_make_meta_structs.d index 6f6ba10..0678b4f 100644 --- a/src/doc_reform/meta/conf_make_meta_structs.d +++ b/src/doc_reform/meta/conf_make_meta_structs.d @@ -48,9 +48,9 @@ struct ConfCompositeMakeStr { string[] footer; string[] headings; string[] home_button_image; - string home_button_text = "{Doc Reform}http://www.doc-reform.org;" + string home_button_text = "{Spine, 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"; + ~ " {sources / git}https://git.doc-reform.org/software/spine"; string italics; string auto_num_top_at_level; int auto_num_top_lv = 9; @@ -131,9 +131,9 @@ struct ConfCompositeMakeInit { string[] footer; string[] headings; string[] home_button_image; - string home_button_text = "{Doc Reform}http://www.doc-reform.org;" + string home_button_text = "{Spine, 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"; + ~ " {sources / git}https://git.doc-reform.org/software/spine"; string[] italics; string auto_num_top_at_level; int auto_num_top_lv = 9; diff --git a/src/doc_reform/meta/metadoc_harvests_authors.d b/src/doc_reform/meta/metadoc_harvests_authors.d index 23707af..acb21ce 100644 --- a/src/doc_reform/meta/metadoc_harvests_authors.d +++ b/src/doc_reform/meta/metadoc_harvests_authors.d @@ -170,7 +170,7 @@ string theme_light_1 = format(q"┃ <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> <meta name="dc.title" content= "metadata harvest, Authors & Topics - information Structuring Universe, Structured information Serialised Units" /> <meta name="dc.subject" content= "document structuring, ebook, publishing, PDF, LaTeX, XML, ODF, SQL, postgresql, sqlite, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, granular search, digital library" /> -<meta name="generator" content="doc_reform" /> +<meta name="generator" content="spine" /> <link rel="generator" href="http://sisudoc.org" /> <link href="./css/harvest.css" rel="stylesheet"> <style TYPE="text/css"> diff --git a/src/doc_reform/meta/metadoc_harvests_topics.d b/src/doc_reform/meta/metadoc_harvests_topics.d index f8e6514..9f889b2 100644 --- a/src/doc_reform/meta/metadoc_harvests_topics.d +++ b/src/doc_reform/meta/metadoc_harvests_topics.d @@ -211,7 +211,7 @@ string theme_light_1 = format(q"┃ <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> <meta name="dc.title" content= "metadata harvest, Authors & Topics - information Structuring Universe, Structured information Serialised Units" /> <meta name="dc.subject" content= "document structuring, ebook, publishing, PDF, LaTeX, XML, ODF, SQL, postgresql, sqlite, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, granular search, digital library" /> -<meta name="generator" content="doc_reform" /> +<meta name="generator" content="spine" /> <link rel="generator" href="http://sisudoc.org" /> <link href="./css/harvest.css" rel="stylesheet"> <style TYPE="text/css"> diff --git a/src/doc_reform/output/hub.d b/src/doc_reform/output/hub.d index 227cd3b..66dcd43 100644 --- a/src/doc_reform/output/hub.d +++ b/src/doc_reform/output/hub.d @@ -20,18 +20,18 @@ template outputHub() { auto msg = Msg!()(doc_matters); if (sched == outTask.source_or_pod) { if (doc_matters.opt.action.source) { - msg.v("doc reform source processing... "); + msg.v("spine (doc reform) source processing... "); } if (doc_matters.opt.action.pod) { - msg.v("doc reform source pod processing... "); + msg.v("spine (doc reform) source pod processing... "); } import doc_reform.output.source_pod; DocReformPod!()(doc_matters); if (doc_matters.opt.action.source) { - msg.vv("doc reform source done"); + msg.vv("spine (doc reform) source done"); } if (doc_matters.opt.action.pod) { - msg.vv("doc reform source pod done"); + msg.vv("spine (doc reform) source pod done"); } } if (sched == outTask.epub) { diff --git a/src/doc_reform/output/xmls.d b/src/doc_reform/output/xmls.d index f0420fe..feebb35 100644 --- a/src/doc_reform/output/xmls.d +++ b/src/doc_reform/output/xmls.d @@ -141,7 +141,7 @@ template outputXHTMLs() { .replaceAll( rgx.br_nl, ""); } else { - _locations = "<p class=\"tiny_left\"><a href=\"http://www.doc-reform.org\">doc-reform</a></p>\n<p class=\"tiny_left\"><a href=\"http://git.sisudoc.org/software/doc-reform/\">sources / git</a></p>\n<p class=\"tiny_left\"><a href=\"http://www.sisudoc.org\">www.sisudoc.org</a></p>"; + _locations = "<p class=\"tiny_left\"><a href=\"http://www.doc-reform.org\">spine</a></p>\n<p class=\"tiny_left\"><a href=\"http://git.sisudoc.org/software/spine/\">sources / git</a></p>\n<p class=\"tiny_left\"><a href=\"http://www.sisudoc.org\">www.sisudoc.org</a></p>"; } string o; o = format(q"┃<div class="flex-menu-option"> diff --git a/src/doc_reform/doc_reform.d b/src/doc_reform/spine.d index f5b2b86..9ace644 100755 --- a/src/doc_reform/doc_reform.d +++ b/src/doc_reform/spine.d @@ -1,6 +1,6 @@ #!/usr/bin/env rdmd /+ -- Name: Doc Reform +- Name: Spine, Doc Reform - Description: documents, structuring, processing, publishing, search - static content generator @@ -12,7 +12,7 @@ - License: AGPL 3 or later: - Doc Reform (SiSU), a framework for document structuring, publishing and + Spine (SiSU), a framework for document structuring, publishing and search Copyright (C) Ralph Amissah @@ -35,7 +35,7 @@ [http://www.fsf.org/licensing/licenses/agpl.html] [http://www.gnu.org/licenses/agpl.html] - - Doc Reform (related to SiSU) uses standard: + - Spine (by Doc Reform, related to SiSU) uses standard: - docReform markup syntax - standard SiSU markup syntax with modified headers and minor modifications - docReform object numbering @@ -80,9 +80,9 @@ import std.parallelism; mixin(import("version.txt")); mixin CompileTimeInfo; string project_name = "DocReform"; -string program_name = "doc-reform"; +string program_name = "spine"; /++ -name "doc_reform" +name "spine" description "A SiSU inspired document parser writen in D." homepage "http://sisudoc.org" +/ @@ -201,7 +201,7 @@ void main(string[] args) { "parallel-subprocesses", "--parallel-subprocesses nested parallelisation", &opts["parallel-subprocesses"], "quiet|q", "--quiet output to terminal", &opts["quiet"], "pdf", "--pdf latex output for pdfs", &opts["pdf"], - "pod", "--pod doc reform pod source content bundled", &opts["pod"], + "pod", "--pod spine (doc reform) pod source content bundled", &opts["pod"], "serial", "--serial serial processing", &opts["serial"], "show-summary", "--show-summary", &opts["show-summary"], "show-make", "--show-make", &opts["show-make"], diff --git a/views/version.txt b/views/version.txt index a32e786..9786c0b 100644 --- a/views/version.txt +++ b/views/version.txt @@ -4,7 +4,7 @@ struct Version { int minor; int patch; } -enum _ver = Version(0, 8, 3); +enum _ver = Version(0, 9, 0); version (Posix) { version (DigitalMars) { } else version (LDC) { |