makefile, spine generate command related

3 files changed, 66 insertions, 23 deletions

diff --git a/flake.lock b/flake.lock
index 1d6820a..2170922 100644
--- a/flake.lock
+++ b/flake.lock
@@ -74,11 +74,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1687669787,
-        "narHash": "sha256-8sAwpYmQ1/bFwTMVyCFzrg7WjlNDdoStLFSY5btNRcQ=",
+        "lastModified": 1687701825,
+        "narHash": "sha256-aMC9hqsf+4tJL7aJWSdEUurW2TsjxtDcJBwM9Y4FIYM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "dc2afced518559f1c962b5824599b2c99c7684e3",
+        "rev": "07059ee2fa34f1598758839b9af87eae7f7ae6ea",
         "type": "github"
       },
       "original": {
@@ -104,8 +104,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1687650848,
-        "narHash": "sha256-VgP6I0KgKSCBXYZy8TZxRk5I5Vn0MjyfHPkwYOeTtRU=",
+        "lastModified": 1687825841,
+        "narHash": "sha256-xkoFpg6/xTV6/oCtAICCYs6ve7aLkDvOKIiatO+EXVM=",
+        "ref": "refs/heads/main",
+        "rev": "7a652e5b73fe5af8a01d14fd282fa2e23781a0a8",
+        "revCount": 591,
         "type": "git",
         "url": "file:///home/ralph/grotto/repo/git.repo/projects/doc-reform/code/software/spine"
       },
diff --git a/makefile b/makefile
index 6f943f0..6086911 100644
--- a/makefile
+++ b/makefile
@@ -1,4 +1,4 @@
-include .envrc-local
+#include .envrc-local
 PROG_VER_GIT :=$(shell echo `git describe --long --tags | sed -e "s/^[ a-z_-]\+\([0-9.]\+\)/\1/;s/\([^-]*-g\)/r\1/;s/-/./g"`)
 #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
@@ -92,23 +92,43 @@ org-tangle:
 # output local
 out-local:
 	$(SpineBIN)/spine -v \
-	--latex --latex-init \
 	--epub --html \
-	--html-link-search --html-link-pdf --html-link-curate --html-link-markup \
+	--latex --latex-init --html-link-pdf \
 	--cgi-sqlite-search-filename=$(SpineCGIform) --cgi-url-action=$(SpineSearchActionLocal) \
-	--sqlite-update --sqlite-db-filename=$(SpineSQLdb) \
-	--curate \
+	--sqlite-update --sqlite-db-filename=$(SpineSQLdb) --html-link-search \
+	--curate --html-link-curate \
 	--output=$(SpineOUT) $(SpinePOD)/*
 
 # output remote
 out-remote:
 	$(SpineBIN)/spine -v \
-	--latex --latex-init \
 	--epub --html \
-	--html-link-search --html-link-pdf --html-link-curate --html-link-markup \
+	--latex --latex-init --html-link-pdf \
 	--cgi-sqlite-search-filename=$(SpineCGIform) --cgi-url-action=$(SpineSearchActionRemote) \
-	--sqlite-update --sqlite-db-filename="$(SpineSQLdb)" \
-	--curate \
+	--sqlite-update --sqlite-db-filename="$(SpineSQLdb)" --html-link-search \
+	--curate --html-link-curate \
+	--output=$(SpineOUT) $(SpinePOD)/*
+
+# output local plus markup source, pods
+out-local-plus-pods:
+	$(SpineBIN)/spine -v \
+	--pods --html-link-markup \
+	--epub --html \
+	--latex --latex-init --html-link-pdf \
+	--cgi-sqlite-search-filename=$(SpineCGIform) --cgi-url-action=$(SpineSearchActionLocal) \
+	--sqlite-update --sqlite-db-filename=$(SpineSQLdb) --html-link-search \
+	--curate --html-link-curate \
+	--output=$(SpineOUT) $(SpinePOD)/*
+
+# output remote plus markup source, pods
+out-remote-plus-pods:
+	$(SpineBIN)/spine -v \
+	--pods --html-link-markup \
+	--epub --html \
+	--latex --latex-init --html-link-pdf \
+	--cgi-sqlite-search-filename=$(SpineCGIform) --cgi-url-action=$(SpineSearchActionRemote) \
+	--sqlite-update --sqlite-db-filename="$(SpineSQLdb)" --html-link-search \
+	--curate --html-link-curate \
 	--output=$(SpineOUT) $(SpinePOD)/*
 
 # epub output
diff --git a/org/config_make.org b/org/config_make.org
index 1cd31cd..43a5362 100644
--- a/org/config_make.org
+++ b/org/config_make.org
@@ -23,7 +23,7 @@
 #+HEADER: :tangle ../makefile
 #+HEADER: :noweb yes
 #+BEGIN_SRC makefile
-include .envrc-local
+#include .envrc-local
 PROG_VER_GIT :=$(shell echo `git describe --long --tags | sed -e "s/^[ a-z_-]\+\([0-9.]\+\)/\1/;s/\([^-]*-g\)/r\1/;s/-/./g"`)
 #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
@@ -117,23 +117,43 @@ org-tangle:
 # output local
 out-local:
 	$(SpineBIN)/spine -v \
-	--latex --latex-init \
 	--epub --html \
-	--html-link-search --html-link-pdf --html-link-curate --html-link-markup \
+	--latex --latex-init --html-link-pdf \
 	--cgi-sqlite-search-filename=$(SpineCGIform) --cgi-url-action=$(SpineSearchActionLocal) \
-	--sqlite-update --sqlite-db-filename=$(SpineSQLdb) \
-	--curate \
+	--sqlite-update --sqlite-db-filename=$(SpineSQLdb) --html-link-search \
+	--curate --html-link-curate \
 	--output=$(SpineOUT) $(SpinePOD)/*
 
 # output remote
 out-remote:
 	$(SpineBIN)/spine -v \
-	--latex --latex-init \
 	--epub --html \
-	--html-link-search --html-link-pdf --html-link-curate --html-link-markup \
+	--latex --latex-init --html-link-pdf \
 	--cgi-sqlite-search-filename=$(SpineCGIform) --cgi-url-action=$(SpineSearchActionRemote) \
-	--sqlite-update --sqlite-db-filename="$(SpineSQLdb)" \
-	--curate \
+	--sqlite-update --sqlite-db-filename="$(SpineSQLdb)" --html-link-search \
+	--curate --html-link-curate \
+	--output=$(SpineOUT) $(SpinePOD)/*
+
+# output local plus markup source, pods
+out-local-plus-pods:
+	$(SpineBIN)/spine -v \
+	--pods --html-link-markup \
+	--epub --html \
+	--latex --latex-init --html-link-pdf \
+	--cgi-sqlite-search-filename=$(SpineCGIform) --cgi-url-action=$(SpineSearchActionLocal) \
+	--sqlite-update --sqlite-db-filename=$(SpineSQLdb) --html-link-search \
+	--curate --html-link-curate \
+	--output=$(SpineOUT) $(SpinePOD)/*
+
+# output remote plus markup source, pods
+out-remote-plus-pods:
+	$(SpineBIN)/spine -v \
+	--pods --html-link-markup \
+	--epub --html \
+	--latex --latex-init --html-link-pdf \
+	--cgi-sqlite-search-filename=$(SpineCGIform) --cgi-url-action=$(SpineSearchActionRemote) \
+	--sqlite-update --sqlite-db-filename="$(SpineSQLdb)" --html-link-search \
+	--curate --html-link-curate \
 	--output=$(SpineOUT) $(SpinePOD)/*
 
 # epub output