0.2.0 renames pod from sisupod

1 files changed, 77 insertions, 76 deletions

diff --git a/maker.org b/maker.org
index 9184e4d..35accfe 100644
--- a/maker.org
+++ b/maker.org
@@ -1,4 +1,6 @@
-#+TITLE: sdp (project) makefile
+#+TITLE: doc_reform (project) makefile
+#+DESCRIPTION makefile for doc_reform
+#+FILETAGS: :doc_reform:makefile:
 #+AUTHOR: Ralph Amissah
 #+EMAIL: ralph.amissah@gmail.com
 #+STARTUP: indent content
@@ -9,7 +11,6 @@
 #+PROPERTY: header-args :padline no :exports code :noweb yes
 #+EXPORT_SELECT_TAGS: export
 #+EXPORT_EXCLUDE_TAGS: noexport
-#+FILETAGS: :sdp:rel:makefile:
 #+TAGS: assert(a) class(c) debug(d) mixin(m) sdp(s) tangle(T) template(t) WEB(W) noexport(n)
 
 [[./org/doc_reform.org][doc_reform.org]]  [[./org/][org/]]
@@ -60,35 +61,35 @@ ORGDIR :=$(shell echo `pwd`)
 
 #+BEGIN_SRC makefile :tangle makefile
 SiSU_MARKUP_SAMPLES_FIND_PODS= \
-find data/sisupod -maxdepth 2 -name sisupod.manifest | cut -f 1-3 -d / | sort
+find data/pod -maxdepth 2 -name pod.manifest | cut -f 1-3 -d / | sort
 
 SiSU_MARKUP_SAMPLES_PODS_FOUND= \
 $(SiSU_MARKUP_SAMPLES_FIND_PODS) | xargs
 
 SiSU_MARKUP_SAMPLES_POD = \
-data/sisupod/accelerando.charles_stross \
-data/sisupod/alices_adventures_in_wonderland.lewis_carroll \
-data/sisupod/content.cory_doctorow \
-data/sisupod/democratizing_innovation.eric_von_hippel \
-data/sisupod/down_and_out_in_the_magic_kingdom.cory_doctorow \
-data/sisupod/for_the_win.cory_doctorow \
-data/sisupod/free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman \
-data/sisupod/free_culture.lawrence_lessig \
-data/sisupod/free_for_all.peter_wayner \
-data/sisupod/gpl2.fsf \
-data/sisupod/gpl3.fsf \
-data/sisupod/gullivers_travels.jonathan_swift \
-data/sisupod/little_brother.cory_doctorow \
-data/sisupod/live-manual \
-data/sisupod/sisu-manual \
-data/sisupod/the_autonomous_contract.ralph_amissah \
-data/sisupod/the_cathedral_and_the_bazaar.eric_s_raymond \
-data/sisupod/the_public_domain.james_boyle \
-data/sisupod/the_wealth_of_networks.yochai_benkler \
-data/sisupod/through_the_looking_glass.lewis_carroll \
-data/sisupod/two_bits.christopher_kelty \
-data/sisupod/un_contracts_international_sale_of_goods_convention_1980 \
-data/sisupod/viral_spiral.david_bollier
+data/pod/accelerando.charles_stross \
+data/pod/alices_adventures_in_wonderland.lewis_carroll \
+data/pod/content.cory_doctorow \
+data/pod/democratizing_innovation.eric_von_hippel \
+data/pod/down_and_out_in_the_magic_kingdom.cory_doctorow \
+data/pod/for_the_win.cory_doctorow \
+data/pod/free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman \
+data/pod/free_culture.lawrence_lessig \
+data/pod/free_for_all.peter_wayner \
+data/pod/gpl2.fsf \
+data/pod/gpl3.fsf \
+data/pod/gullivers_travels.jonathan_swift \
+data/pod/little_brother.cory_doctorow \
+data/pod/live-manual \
+data/pod/sisu-manual \
+data/pod/the_autonomous_contract.ralph_amissah \
+data/pod/the_cathedral_and_the_bazaar.eric_s_raymond \
+data/pod/the_public_domain.james_boyle \
+data/pod/the_wealth_of_networks.yochai_benkler \
+data/pod/through_the_looking_glass.lewis_carroll \
+data/pod/two_bits.christopher_kelty \
+data/pod/un_contracts_international_sale_of_goods_convention_1980 \
+data/pod/viral_spiral.david_bollier
 #+END_SRC
 
 **** dir
@@ -157,13 +158,13 @@ default: ldc
 
 #+BEGIN_SRC makefile :tangle makefile
 markup_samples:
-	find data/sisupod -name sisupod.manifest | cut -f 1-3 -d / | sort; \
+	find data/pod -name pod.manifest | cut -f 1-3 -d / | sort; \
 find data/sisudir/media/text -name *.ss[tm] | sort
 #+END_SRC
 
 #+BEGIN_SRC makefile :tangle makefile
 markup_pod_samples:
-	find data/sisupod -name sisupod.manifest | cut -f 1-3 -d / | sort
+	find data/pod -name pod.manifest | cut -f 1-3 -d / | sort
 #+END_SRC
 
 #+BEGIN_SRC makefile :tangle makefile
@@ -419,14 +420,14 @@ dmd_testrun_find:
 	./bin/doc-reform-dmd -v --source --html --epub --sqlite-discrete \
 --sqlite-create --sqlite-update \
 --output-dir=tmp/program_output_pod \
-data/sisupod/sisu-manual
+data/pod/sisu-manual
 dmd_testrun_find_pod_source:
 	$(SiSU_MARKUP_SAMPLES_PODS_FOUND) \
 ./bin/doc-reform-ldc -v --source --html --epub \
 --output-dir=tmp/program_output_pod
-dmd_testrun_find_pod_sisupod:
+dmd_testrun_find_pod_pod:
 	$(SiSU_MARKUP_SAMPLES_PODS_FOUND) \
-./bin/doc-reform-dmd -v --sisupod \
+./bin/doc-reform-dmd -v --pod \
 --output-dir=tmp/program_output_pod
 dmd_testrun_find_pod_html:
 	$(SiSU_MARKUP_SAMPLES_PODS_FOUND) \
@@ -450,8 +451,8 @@ dmd_testrun_paths_pod_source:
 	./bin/doc-reform-dmd -v --source \
 --output-dir=tmp/program_output_pod \
 $(SiSU_MARKUP_SAMPLES_POD)
-dmd_testrun_paths_pod_sisupod:
-	./bin/doc-reform-dmd -v --sisupod \
+dmd_testrun_paths_pod_pod:
+	./bin/doc-reform-dmd -v --pod \
 --output-dir=tmp/program_output_pod \
 $(SiSU_MARKUP_SAMPLES_POD)
 dmd_testrun_paths_pod_html:
@@ -477,14 +478,14 @@ gdc_testrun_find:
 	./bin/doc-reform-gdc -v --source --html --epub --sqlite-discrete \
 --sqlite-create --sqlite-update \
 --output-dir=tmp/program_output_pod \
-data/sisupod/sisu-manual
+data/pod/sisu-manual
 gdc_testrun_find_pod_source:
 	$(SiSU_MARKUP_SAMPLES_PODS_FOUND) \
 ./bin/doc-reform-gdc -v --source \
 --output-dir=tmp/program_output_pod
-gdc_testrun_find_pod_sisupod:
+gdc_testrun_find_pod_pod:
 	$(SiSU_MARKUP_SAMPLES_PODS_FOUND) \
-./bin/doc-reform-gdc -v --sisupod \
+./bin/doc-reform-gdc -v --pod \
 --output-dir=tmp/program_output_pod
 gdc_testrun_find_pod_html:
 	$(SiSU_MARKUP_SAMPLES_PODS_FOUND) \
@@ -508,13 +509,13 @@ gdc_testrun_paths:
 	./bin/doc-reform-gdc -v --source --html --epub --sqlite-discrete \
 --sqlite-create --sqlite-update \
 --output-dir=tmp/program_output_pod \
-data/sisupod/sisu-manual
+data/pod/sisu-manual
 gdc_testrun_paths_pod_source:
 	./bin/doc-reform-gdc -v --source \
 --output-dir=tmp/program_output_pod \
 $(SiSU_MARKUP_SAMPLES_POD)
-gdc_testrun_paths_pod_sisupod:
-	./bin/doc-reform-gdc -v --sisupod \
+gdc_testrun_paths_pod_pod:
+	./bin/doc-reform-gdc -v --pod \
 --output-dir=tmp/program_output_pod \
 $(SiSU_MARKUP_SAMPLES_POD)
 gdc_testrun_paths_pod_html:
@@ -540,14 +541,14 @@ ldc_testrun_find:
 	./bin/doc-reform-ldc -v --source --html --epub --sqlite-discrete \
 --sqlite-create --sqlite-update \
 --output-dir=tmp/program_output_pod \
-data/sisupod/sisu-manual
+data/pod/sisu-manual
 ldc_testrun_find_pod_source:
 	$(SiSU_MARKUP_SAMPLES_PODS_FOUND) \
 	./bin/doc-reform-ldc -v --source \
 --output-dir=tmp/program_output_pod
-ldc_testrun_find_pod_sisupod:
+ldc_testrun_find_pod_pod:
 	$(SiSU_MARKUP_SAMPLES_PODS_FOUND) \
-	./bin/doc-reform-ldc -v --sisupod \
+	./bin/doc-reform-ldc -v --pod \
 --output-dir=tmp/program_output_pod
 ldc_testrun_find_pod_html:
 	$(SiSU_MARKUP_SAMPLES_PODS_FOUND) \
@@ -571,13 +572,13 @@ ldc_testrun_paths:
 	./bin/doc-reform-ldc -v --source --html --epub --sqlite-discrete \
 --sqlite-create --sqlite-update \
 --output-dir=tmp/program_output_pod \
-data/sisupod/sisu-manual
+data/pod/sisu-manual
 ldc_testrun_paths_pod_source:
 	./bin/doc-reform-ldc -v --source \
 --output-dir=tmp/program_output_pod \
 $(SiSU_MARKUP_SAMPLES_POD)
-ldc_testrun_paths_pod_sisupod:
-	./bin/doc-reform-ldc -v --sisupod \
+ldc_testrun_paths_pod_pod:
+	./bin/doc-reform-ldc -v --pod \
 --output-dir=tmp/program_output_pod \
 $(SiSU_MARKUP_SAMPLES_POD)
 ldc_testrun_paths_pod_html:
@@ -604,9 +605,9 @@ dmd_testrun_find_dir_source:
 	$(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \
 ./bin/doc-reform-dmd -v --source \
 --output-dir=tmp/program_output_dir
-dmd_testrun_find_dir_sisupod:
+dmd_testrun_find_dir_pod:
 	$(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \
-./bin/doc-reform-dmd -v --sisupod \
+./bin/doc-reform-dmd -v --pod \
 --output-dir=tmp/program_output_dir
 dmd_testrun_find_dir_html:
 	$(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \
@@ -630,8 +631,8 @@ dmd_testrun_filelist_dir_source:
 	./bin/doc-reform-dmd -v --source \
 --output-dir=tmp/program_output_dir \
 $(SiSU_MARKUP_SAMPLES_DIR)
-dmd_testrun_filelist_dir_sisupod:
-	./bin/doc-reform-dmd -v --sisupod \
+dmd_testrun_filelist_dir_pod:
+	./bin/doc-reform-dmd -v --pod \
 --output-dir=tmp/program_output_dir \
 $(SiSU_MARKUP_SAMPLES_DIR)
 dmd_testrun_filelist_dir_html:
@@ -657,9 +658,9 @@ gdc_testrun_find_dir_source:
 	./bin/doc-reform-gdc -v --source \
 --output-dir=tmp/program_output_dir \
 $(SiSU_MARKUP_SAMPLES_DIR)
-gdc_testrun_find_dir_sisupod:
+gdc_testrun_find_dir_pod:
 	$(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \
-./bin/doc-reform-gdc -v --sisupod \
+./bin/doc-reform-gdc -v --pod \
 --output-dir=tmp/program_output_dir
 gdc_testrun_find_dir_html:
 	$(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \
@@ -683,8 +684,8 @@ gdc_testrun_filelist_dir_source:
 	./bin/doc-reform-gdc -v --source \
 --output-dir=tmp/program_output_dir \
 $(SiSU_MARKUP_SAMPLES_DIR)
-gdc_testrun_filelist_dir_sisupod:
-	./bin/doc-reform-gdc -v --sisupod \
+gdc_testrun_filelist_dir_pod:
+	./bin/doc-reform-gdc -v --pod \
 --output-dir=tmp/program_output_dir \
 $(SiSU_MARKUP_SAMPLES_DIR)
 gdc_testrun_filelist_dir_html:
@@ -710,9 +711,9 @@ ldc_testrun_find_dir_source:
 	$(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \
 ./bin/doc-reform-ldc -v --source \
 --output-dir=tmp/program_output_dir
-ldc_testrun_find_dir_sisupod:
+ldc_testrun_find_dir_pod:
 	$(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \
-./bin/doc-reform-ldc -v --sisupod \
+./bin/doc-reform-ldc -v --pod \
 --output-dir=tmp/program_output_dir
 ldc_testrun_find_dir_html:
 	$(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \
@@ -736,8 +737,8 @@ ldc_testrun_filelist_dir_source:
 	./bin/doc-reform-ldc -v --source \
 --output-dir=tmp/program_output_dir \
 $(SiSU_MARKUP_SAMPLES_DIR)
-ldc_testrun_filelist_dir_sisupod:
-	./bin/doc-reform-ldc -v --sisupod \
+ldc_testrun_filelist_dir_pod:
+	./bin/doc-reform-ldc -v --pod \
 --output-dir=tmp/program_output_dir \
 $(SiSU_MARKUP_SAMPLES_DIR)
 ldc_testrun_filelist_dir_html:
@@ -1108,7 +1109,7 @@ doc_reform_sources = [ 'src/doc_reform/doc_reform.d',
   'src/doc_reform/output/package.d',
   'src/doc_reform/output/paths_output.d',
   'src/doc_reform/output/rgx.d',
-  'src/doc_reform/output/source_sisupod.d',
+  'src/doc_reform/output/source_pod.d',
   'src/doc_reform/output/sqlite.d',
   'src/doc_reform/output/xmls_css.d',
   'src/doc_reform/output/xmls.d',
@@ -1123,7 +1124,7 @@ dep_archive      = dependency('archive',        version: '>= 0.6.0',  fallback:
 dep_d2sqlite3    = dependency('d2sqlite3',      version: '>= 0.16.2', fallback: ['d2sqlite3',      'd2sqlite3_dep'])
 dep_imageformats = dependency('imageformats-d', version: '>= 7.0.0',  fallback: ['imageformats-d', 'imageformats_dep'])
 dep_toml         = dependency('toml-d',         version: '>= 1.0.0',  fallback: ['toml-d',         'toml_dep'])
-# Executable
+# executable
 doc_reform_exe = executable('rad',
   [doc_reform_sources],
   include_directories : [sources_dir],
@@ -1233,8 +1234,8 @@ revision  = head
 !src/doc_reform/*
 !data
 !data/*
-!data/sisupod/**
-!data/sisudir/**
+!data/src/**
+!data/pod/**
 !*.sst
 !*.ssm
 !**/*.sst
@@ -1242,7 +1243,7 @@ revision  = head
 !subprojects
 !**/*.wrap
 !subprojects/*.wrap
-!sisupod.manifest
+!pod.manifest
 !sisu_document_make
 !config_local_site
 !sisu_document_make.toml
@@ -1368,13 +1369,13 @@ 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/sisupod/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/media/text/en/sisu_markup.sst )
 
-time (./bin/doc-reform-ldc --source --html -v --output-dir=tmp/program-output data/sisupod/sisu-manual )
-time (./bin/doc-reform-ldc --source --html -v --output-dir=tmp/program-output data/sisupod/the_wealth_of_networks.yochai_benkler )
-time (./bin/doc-reform-ldc --source --html -v --output-dir=tmp/program-output data/sisupod/live-manual )
+time (./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 (~sdp2/bin/doc-reform-ldc --sisupod --source --html --epub --sqlite-create --sqlite-update -v sisudoc/media/text/en/sisu_markup_stress_test.sst sisudoc/media/text/en/the_wealth_of_networks.yochai_benkler.sst )
+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 )
 
 can point to directory containing sisudoc.txt file (listing which files to process)
 
@@ -1385,24 +1386,24 @@ 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 ( find data/sisupod -name sisupod.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/doc-reform-ldc --source --html --epub -v --output-dir=tmp/program-output )
 
-time ( find data/sisupod -maxdepth 2 -name sisupod.manifest | sort | xargs ./bin/doc-reform-ldc --source --html --epub -v --output-dir=tmp/program-output )
+time ( find data/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 )
 
-find data/sisupod -maxdepth 2 -name sisupod.manifest | sort | xargs
+find data/pod -maxdepth 2 -name pod.manifest | sort | xargs
 
 find data/sisudir/media/text -name *.ss[tm] | sort | xargs
 
 *** list markup files
-find data/sisupod -name sisupod.manifest | sort
+find data/pod -name pod.manifest | sort
 find data/sisudir/media/text -name *.ss[tm] | sort
 
-time make ldc_testrun_paths_pod_sisupod
-time make ldc_testrun_paths_pod_sisupod | ag "^\".+\"|NOT found"
-time make ldc_testrun_find_pod_sisupod
-time make ldc_testrun_find_dir_sisupod
-time make ldc_testrun_filelist_dir_sisupod
+time make ldc_testrun_paths_pod_pod
+time make ldc_testrun_paths_pod_pod | ag "^\".+\"|NOT found"
+time make ldc_testrun_find_pod_pod
+time make ldc_testrun_find_dir_pod
+time make ldc_testrun_filelist_dir_pod
 ** misc
 *** compilers