samples pod dir now markup/pod-samples/pod

- markup/pod-samples/pod from markup/pod

4 files changed, 53 insertions, 41 deletions

diff --git a/org/config_env.org b/org/config_env.org
index 6e8cbb1..4cec4a8 100644
--- a/org/config_env.org
+++ b/org/config_env.org
@@ -9,7 +9,7 @@
 #+STARTUP:     content hideblocks hidestars noindent entitiespretty
 #+PROPERTY:    header-args  :exports code
 #+PROPERTY:    header-args+ :noweb yes
-#+PROPERTY:    header-args+ :results no
+#+PROPERTY:    header-args+ :results output none
 #+PROPERTY:    header-args+ :cache no
 #+PROPERTY:    header-args+ :padline no
 #+PROPERTY:    header-args+ :mkdirp yes
@@ -39,6 +39,8 @@ if [ -f .envrc-git-init ]; then
 fi
 if [ -f .envrc-local ]; then
   source_env_if_exists .envrc-local || source .envrc-local
+elif  [ -f .envrc-local_ ]; then
+  source_env_if_exists .envrc-local_ || source .envrc-local_
 fi
 if [ -f .envrc-nix ]; then
   source_env_if_exists .envrc-nix || source .envrc-nix
@@ -122,7 +124,7 @@ echo '
   ❯❯ ${SpineBIN} -v --source --pod --latex --latex-init --epub --html --html-link-pdf --html-link-curate --html-link-markup --curate --output=${SpineOUT} ${SpinePOD}/*
 
   ❯❯ ${SpineBIN} -v --sqlite-db-create --sqlite-db-filename=${SpineSQLdb} --sqlite-db-path=./_tmp-db
-  ❯❯ ${SpineBIN} -v --sqlite-update --sqlite-db-filename=${SpineSQLdb} --sqlite-db-path=./_tmp-db ./markup/pod/*
+  ❯❯ ${SpineBIN} -v --sqlite-update --sqlite-db-filename=${SpineSQLdb} --sqlite-db-path=./_tmp-db ./markup/pod-samples/pod/*
 '
 #+END_SRC
 
@@ -131,7 +133,7 @@ echo "•
   ❯❯ ${SpineBIN} -v --source --pod --epub --html --html-link-curate --html-link-markup --curate --output=${SpineOUT} ${SpinePOD}/*
   ❯❯ ${SpineBIN} -v --source --pod --latex --latex-init --epub --html --html-link-pdf --html-link-curate --html-link-markup --curate --output=${SpineOUT} ${SpinePOD}/*
   ❯❯ spine --very-verbose --sqlite-db-create --sqlite-db-filename=spine.search.db --sqlite-db-path=./_tmp-db
-  ❯❯ spine -v --html --epub --latex --sqlite-update --sqlite-db-filename=spine.search.db --sqlite-db-path=./tmp-db ./markup/pod/*
+  ❯❯ spine -v --html --epub --latex --sqlite-update --sqlite-db-filename=spine.search.db --sqlite-db-path=./tmp-db ./markup/pod-samples/pod/*
 "
 #+END_SRC
 
@@ -163,7 +165,7 @@ export SpineBIN=./result/bin/spine
 # ❯❯ location of source files:
 export SpineDOC=.
 # ❯❯ location of source files pod:
-export SpinePOD=${SpineDOC}/markup/pod
+export SpinePOD=${SpineDOC}/markup/pod-samples/pod
 # ❯❯ sisudoc-spine output processing path:
 export SpineOUT=./OUTPUT_TEST_sisudocSpine
 # ❯❯ sisudoc-spine output processing path (web server e.g.):
diff --git a/org/config_git.org b/org/config_git.org
index 4420641..b6eb3c7 100644
--- a/org/config_git.org
+++ b/org/config_git.org
@@ -54,35 +54,45 @@
 !.dr
 !.dr/*
 !markup/
-!markup/pod/
-!markup/pod/*/
-!markup/pod/*/pod.manifest
-!markup/pod/*/conf/
-!markup/pod/*/conf/document_make
-!markup/pod/*/media/
-!markup/pod/*/media/text/
-!markup/pod/*/media/text/*/
-!markup/pod/*/media/text/*/*.sst
-!markup/pod/*/media/text/*/*.ssm
-!markup/pod/*/media/text/*/*.ssi
-!markup/pod/*/media/image/
-!markup/pod/*/media/image/*.png
-!markup/pod/*/media/image/*.jpg
-!markup/pod/*/media/image/*.PNG
-!markup/pod/*/media/image/*.JPG
-!markup/pod/*/tools/
-!markup/pod/*/tools/po4a/
-!markup/pod/*/tools/po4a/pot/
-!markup/pod/*/tools/po4a/pot/*.sst.pot
-!markup/pod/*/tools/po4a/pot/*.ssm.pot
-!markup/pod/*/tools/po4a/pot/*.ssi.pot
-!markup/pod/*/tools/po4a/po/
-!markup/pod/*/tools/po4a/po/*/
-!markup/pod/*/tools/po4a/po/*/*.sst.po
-!markup/pod/*/tools/po4a/po/*/*.ssm.po
-!markup/pod/*/tools/po4a/po/*/*.ssi.po
-!markup/pod/.dr
-!markup/pod/.dr/*
+!markup/*
+#!markup/**
+!markup/pod-samples/
+!markup/pod-samples/pod/
+!markup/pod-samples/pod/*/
+!markup/pod-samples/pod/*/pod.manifest
+!markup/pod-samples/pod/*/conf/
+!markup/pod-samples/pod/*/conf/document_make
+!markup/pod-samples/pod/*/media/
+!markup/pod-samples/pod/*/media/text/
+!markup/pod-samples/pod/*/media/text/*/
+!markup/pod-samples/pod/*/media/text/*/*.sst
+!markup/pod-samples/pod/*/media/text/*/*.ssm
+!markup/pod-samples/pod/*/media/text/*/*.ssi
+!markup/pod-samples/pod/*/media/text/_sisu/
+!markup/pod-samples/pod/*/media/text/_sisu/**
+!markup/pod-samples/pod/*/media/image/
+!markup/pod-samples/pod/*/media/image/*.png
+!markup/pod-samples/pod/*/media/image/*.jpg
+!markup/pod-samples/pod/*/media/image/*.PNG
+!markup/pod-samples/pod/*/media/image/*.JPG
+!markup/pod-samples/pod/*/tools/
+!markup/pod-samples/pod/*/tools/bin/
+!markup/pod-samples/pod/*/tools/bin/*.sh
+!markup/pod-samples/pod/*/tools/po4a/
+!markup/pod-samples/pod/*/tools/po4a/Makefile
+!markup/pod-samples/pod/*/tools/po4a/pot/
+!markup/pod-samples/pod/*/tools/po4a/pot/*.sst.pot
+!markup/pod-samples/pod/*/tools/po4a/pot/*.ssm.pot
+!markup/pod-samples/pod/*/tools/po4a/pot/*.ssi.pot
+!markup/pod-samples/pod/*/tools/po4a/pot/index.html.in.pot
+!markup/pod-samples/pod/*/tools/po4a/po/
+!markup/pod-samples/pod/*/tools/po4a/po/*/
+!markup/pod-samples/pod/*/tools/po4a/po/*/*.sst.po
+!markup/pod-samples/pod/*/tools/po4a/po/*/*.ssm.po
+!markup/pod-samples/pod/*/tools/po4a/po/*/*.ssi.po
+!markup/pod-samples/pod/*/tools/po4a/po/*/index.html.in.po
+!markup/pod-samples/pod/.dr
+!markup/pod-samples/pod/.dr/*
 !markup/non-pod-samples/
 !markup/non-pod-samples/*.sst
 !markup/non-pod-samples/image/
diff --git a/org/config_make.org b/org/config_make.org
index d68585c..4af977c 100644
--- a/org/config_make.org
+++ b/org/config_make.org
@@ -56,7 +56,7 @@ $(SiSU_MARKUP_SAMPLES_FIND_PODS) | xargs
 Date                    := `date "+%Y%m%d"`
 #SpineBIN                := $(SpineBIN)                # './result/bin'
 #SpineOUT                := $(SpineOUT)                # '/srv/www/spine'
-#SpinePOD                := $(SpinePOD)                # 'markup/pod'
+#SpinePOD                := $(SpinePOD)                # 'markup/pod-samples/pod'
 #SpineSearchActionLocal  := $(SpineSearchActionLocal)  # 'http://localhost/spine_search'
 #SpineSearchActionRemote := $(SpineSearchActionRemote) # 'https://sisudoc.org/spine_search'
 #SpineCGIform            := $(SpineCGIform)            # 'spine_search'
@@ -633,28 +633,28 @@ testrun_paths:
 testrun_paths_pod_source:
 	spine -v --source \
 	--output-dir=tmp/program_output_pod \
-	./markup/pod/*
+	./markup/pod-samples/pod/*
 
 testrun_paths_pod_pod:
 	spine -v --pod \
 	--output-dir=tmp/program_output_pod \
-	./markup/pod/*
+	./markup/pod-samples/pod/*
 
 testrun_paths_pod_html:
 	spine -v --html \
 	--output-dir=tmp/program_output_pod \
-	./markup/pod/*
+	./markup/pod-samples/pod/*
 
 testrun_paths_pod_epub:
 	spine -v --epub \
 	--output-dir=tmp/program_output_pod \
-	./markup/pod/*
+	./markup/pod-samples/pod/*
 
 testrun_paths_pod_all:
 	spine -v --source --html --epub --sqlite-discrete \
 	--sqlite-create --sqlite-update \
 	--output-dir=tmp/program_output_pod \
-	./markup/pod/*
+	./markup/pod-samples/pod/*
 
 testrun_find_dir_source:
 	$(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \
diff --git a/org/spine_info.org b/org/spine_info.org
index db4571a..2fba2c0 100644
--- a/org/spine_info.org
+++ b/org/spine_info.org
@@ -154,7 +154,7 @@ sub-directory called image. sisudoc-spine can be run against the prepared .sst
 file.
 
 sisudoc-spine organizes document source into pods (sisupods). Document samples
-using the directory structure for sisudoc-spine are located under: ./markup/pod/
+using the directory structure for sisudoc-spine are located under: ./markup/pod-samples/pod/
 (this includes a number of prepared books and articles).
 
 individual .sst files with their associated images are automatically converted
@@ -259,7 +259,7 @@ document source to get the desired output.
 #+BEGIN_SRC markdown
 e.g.:
 
-  ./result/bin/spine -v --source --pod --epub --html --html-link-curate --html-link-markup --curate --output=./OUTPUT_TEST_sisudocSpine ./markup/pod/*
+  ./result/bin/spine -v --source --pod --epub --html --html-link-curate --html-link-markup --curate --output=./OUTPUT_TEST_sisudocSpine ./markup/pod-samples/pod/*
 
 with sisudoc-spine installed, for a list of commands from the program type: