sisudoc spine sync (0.16.0 dir name changes)

6 files changed, 145 insertions, 26 deletions

diff --git a/org/config_env.org b/org/config_env.org
index ec1e5c4..78bad4a 100644
--- a/org/config_env.org
+++ b/org/config_env.org
@@ -1,5 +1,5 @@
 -*- mode: org -*-
-#+TITLE:       spine (doc_reform) (project) environment
+#+TITLE:       sisudoc spine (doc_reform) (project) environment
 #+DESCRIPTION: env envrc used by make & nix
 #+FILETAGS:    :spine:build:tools:
 #+AUTHOR:      Ralph Amissah
diff --git a/org/config_git.org b/org/config_git.org
index b3c54a5..1279762 100644
--- a/org/config_git.org
+++ b/org/config_git.org
@@ -81,8 +81,8 @@
 !markup/pod/*/tools/po4a/po/*/*.sst.po
 !markup/pod/*/tools/po4a/po/*/*.ssm.po
 !markup/pod/*/tools/po4a/po/*/*.ssi.po
-!markup/spine-bespoke-output/
-!markup/spine-bespoke-output/**
+!markup/sisudoc-spine-bespoke-output/
+!markup/sisudoc-spine-bespoke-output/**
 .dub/**
 ,**/.dub/**
 tmp/**
diff --git a/org/config_make.org b/org/config_make.org
index 43a5362..d68585c 100644
--- a/org/config_make.org
+++ b/org/config_make.org
@@ -1,5 +1,5 @@
 -*- mode: org -*-
-#+TITLE:       spine (doc_reform) (project) makefile
+#+TITLE:       sisudoc spine (doc_reform) (project) makefile
 #+DESCRIPTION: makefile for spine
 #+FILETAGS:    :spine:build:tools:
 #+AUTHOR:      Ralph Amissah
@@ -836,10 +836,19 @@ gitsnapshot: distclean tangle
 #   find data/sisudir/media/text -name *.ss[tm] | sort
 
 version_tag:
-	echo "DRV=<<spine_version_set>>; git tag -f doc-reform-markup-samples_v$$\{DRV} -m\"doc-reform markup-samples spine-$$\{DRV}\" HEAD"; \
-	echo "git tag -f doc-reform-markup-samples_v<<spine_version_set>> -m\"doc-reform markup-samples spine-<<spine_version_set>>\" HEAD";
+	echo "DRV=<<spine_version>>; git tag -f doc-reform-markup-samples_v$$\{DRV} -m\"doc-reform markup-samples spine-$$\{DRV}\" HEAD"; \
+	echo "git tag -f doc-reform-markup-samples_v<<spine_version>> -m\"doc-reform markup-samples spine-<<spine_version>>\" HEAD";
 
 .PHONY : all build release \
 	distclean init \
 	tangle gitsnapshot
 #+END_SRC
+
+** version info SET VERSION :version:set:project:
+*** spine project VERSION :version:set:project:
+
+#+NAME: spine_version
+#+HEADER: :noweb yes
+#+BEGIN_SRC emacs-lisp
+<<./sisudoc_spine_version_info_and_doc_header_including_copyright_and_license.org:spine_project_version()>>
+#+END_SRC
diff --git a/org/config_nix.org b/org/config_nix.org
index 0b27d4e..80c905d 100644
--- a/org/config_nix.org
+++ b/org/config_nix.org
@@ -1,6 +1,6 @@
 -*- mode: org -*-
-#+TITLE:       configuration nix
-#+DESCRIPTION: makefile for spine
+#+TITLE:       sisudoc spine (doc_reform) (project) configuration nix
+#+DESCRIPTION: configuration nix
 #+FILETAGS:    :spine:build:tools:
 #+AUTHOR:      Ralph Amissah
 #+EMAIL:       [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]]
@@ -28,7 +28,7 @@
   inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
   inputs.flake-utils.url = "github:numtide/flake-utils";
   inputs.spine = {
-    url = "git+file:///home/ralph/grotto/repo/git.repo/projects/doc-reform/code/software/spine";
+    url = "git+file:///home/ralph/grotto/repo/git.repo/projects/doc-reform/code/software/sisudoc-spine";
     inputs.nixpkgs.follows = "nixpkgs";
     flake = true;
   };
@@ -44,7 +44,7 @@
     spine,
     d-overlay,
   } @ inputs: let
-    version = "<<spine_version_set>>";
+    version = "<<spine_version>>";
     shell = ./shell.nix;
     devEnv = ./nixDevEnv.sh;
     supportedSystems = ["x86_64-linux"]; # [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
@@ -409,12 +409,12 @@ with (
               runHook preInstall
               mkdir -p $out/bin
               cp -r "${targetOf package}" $out/bin
-              #cp -rv "${targetOf package}" $out/spine-markup-samples/.
-              #cp -rv ./markup $out/spine-markup-samples/.
+              #cp -rv "${targetOf package}" $out/sisudoc-spine-markup-samples/.
+              #cp -rv ./markup $out/sisudoc-spine-markup-samples/.
               runHook postInstall
             '';
             #postInstall= ''
-            #  cp -rv ./markup $out/spine-markup-samples/.
+            #  cp -rv ./markup $out/sisudoc-spine-markup-samples/.
             #'';
             meta =
               lib.optionalAttrs (package ? description) {
@@ -429,7 +429,7 @@ with (
 );
   mkDubDerivation rec {
     pname = "spine";
-    version = "<<spine_version_set>>";
+    version = "<<spine_version>>";
     #zipfile = "spine-0.12.0-tag-0.11.2.r107.gf89a107.tar.gz";
     src = fetchTarball {
       url = "<<spine_tarball_path_url>>";
@@ -452,14 +452,6 @@ with (
 
 #src = ./.;
 
-** variables used SET
-*** spine version SET VERSION :version:set:project:
-
-#+NAME: spine_version_set
-#+BEGIN_SRC sh
-0.14.0
-#+END_SRC
-
 #+NAME: project_path_local_out_static
 #+HEADER: :noweb yes
 #+BEGIN_SRC nix
@@ -481,7 +473,7 @@ file://<<spine_tarball_path>>/<<spine_tarball_filename>>
 #+NAME: spine_git_file_path
 #+HEADER: :noweb yes
 #+BEGIN_SRC nix
-/home/ralph/grotto/repo/git.repo/projects/doc-reform/code/software/spine
+/home/ralph/grotto/repo/git.repo/projects/doc-reform/code/software/sisudoc-spine
 #+END_SRC
 
 #+NAME: nixpkgs_local
@@ -690,7 +682,7 @@ $SpineBIN/spine --very-verbose --sqlite-db-create --output="$SpineOUTversioned"
 ,*** sqlite db (shared) - populate db
 
 ,#+BEGIN_SRC sh
-$SpineBIN/spine --very-verbose --sqlite-update --output="$SpineOUTversioned" $SpineDOC/spine-markup-samples/markup/pod/*
+$SpineBIN/spine --very-verbose --sqlite-update --output="$SpineOUTversioned" $SpineDOC/sisudoc-spine-markup-samples/markup/pod/*
 ,#+END_SRC
 
 ,*** sqlite db (shared) - drop db
@@ -785,7 +777,7 @@ webserv:
   data_root_url:               "https://sisudoc.org"
   data_root_path:              "/srv/www/spine"
   images_root_part:            "image"
-  cgi_search_form_title:       "≅ SiSU Spine search"
+  cgi_search_form_title:       "≅ SiSU Spine search ፨"
   cgi_http:                    "https"
   cgi_domain:                  "sisudoc.org"
   cgi_bin_url:                 "http://sisudoc.org/cgi-bin"
@@ -816,3 +808,12 @@ ls $SpineOutstatic/latex/*.tex
 #echo "emacs nixNote_.org"
 #echo "cat nixNote_.org"
 #+END_SRC
+
+** version info SET VERSION :version:set:project:
+*** spine project VERSION :version:set:project:
+
+#+NAME: spine_version
+#+HEADER: :noweb yes
+#+BEGIN_SRC emacs-lisp
+<<./sisudoc_spine_version_info_and_doc_header_including_copyright_and_license.org:spine_project_version()>>
+#+END_SRC
diff --git a/org/sisudoc_spine_version_info_and_doc_header_including_copyright_and_license.org b/org/sisudoc_spine_version_info_and_doc_header_including_copyright_and_license.org
new file mode 100644
index 0000000..14cccaf
--- /dev/null
+++ b/org/sisudoc_spine_version_info_and_doc_header_including_copyright_and_license.org
@@ -0,0 +1,109 @@
+-*- mode: org -*-
+#+TITLE:       sisudoc spine (doc_reform) object-centric document abstraction
+#+DESCRIPTION: documents - structuring, publishing in multiple formats & search
+#+FILETAGS:    :spine:abstraction:
+#+AUTHOR:      Ralph Amissah
+#+EMAIL:       [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]]
+#+COPYRIGHT:   Copyright (C) 2015 - 2024 Ralph Amissah
+#+LANGUAGE:    en
+#+STARTUP:     content hideblocks hidestars noindent entitiespretty
+#+PROPERTY:    header-args  :noweb yes
+#+PROPERTY:    header-args+ :exports code
+#+PROPERTY:    header-args+ :results no
+#+PROPERTY:    header-args+ :cache no
+#+PROPERTY:    header-args+ :padline no
+#+PROPERTY:    header-args+ :mkdirp yes
+#+OPTIONS:     H:3 num:nil toc:t \n:t ::t |:t ^:nil -:t f:t *:t
+
+- [[./doc-reform.org][doc-reform.org]]  [[./][org/]]
+
+* spine doc header including copyright & license
+
+#+NAME: spine_doc_header_including_copyright_and_license
+#+BEGIN_SRC org
+/+
+- Name: SisuDoc Spine, Doc Reform [a part of]
+  - Description: documents, structuring, processing, publishing, search
+    - static content generator
+
+  - Author: Ralph Amissah
+    [ralph.amissah@gmail.com]
+
+  - Copyright: (C) 2015 - 2024 Ralph Amissah, All Rights Reserved.
+
+  - License: AGPL 3 or later:
+
+    Spine (SiSU), a framework for document structuring, publishing and
+    search
+
+    Copyright (C) Ralph Amissah
+
+    This program is free software: you can redistribute it and/or modify it
+    under the terms of the GNU AFERO General Public License as published by the
+    Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
+
+    This program is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+    more details.
+
+    You should have received a copy of the GNU General Public License along with
+    this program. If not, see [https://www.gnu.org/licenses/].
+
+    If you have Internet connection, the latest version of the AGPL should be
+    available at these locations:
+    [https://www.fsf.org/licensing/licenses/agpl.html]
+    [https://www.gnu.org/licenses/agpl.html]
+
+  - 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
+      - standard SiSU object citation numbering & system
+
+  - Homepages:
+    [https://www.sisudoc.org]
+    [https://www.doc-reform.org]
+
+  - Git
+    [https://git.sisudoc.org/]
+
++/
+#+END_SRC
+
+* spine version info SET VERSION
+** version in full
+
+#+NAME: spine_project_version
+#+BEGIN_SRC org
+<<spine_project_version_part_major>>.<<spine_project_version_part_minor>>.<<spine_project_version_part_patch>>
+#+END_SRC
+
+** version parts (major, minor, patch)
+
+#+NAME: spine_project_version_major_minor_patch
+#+BEGIN_SRC org
+<<spine_project_version_part_major>>, <<spine_project_version_part_minor>>, <<spine_project_version_part_patch>>
+#+END_SRC
+
+*** major
+
+#+NAME: spine_project_version_part_major
+#+BEGIN_SRC org
+0
+#+END_SRC
+
+*** minor
+
+#+NAME: spine_project_version_part_minor
+#+BEGIN_SRC org
+16
+#+END_SRC
+
+*** patch
+
+#+NAME: spine_project_version_part_patch
+#+BEGIN_SRC org
+0
+#+END_SRC
diff --git a/org/spine-bespoke-output-homepage-html.org b/org/spine-bespoke-output-homepage-html.org
index a65e6c0..35c916b 100644
--- a/org/spine-bespoke-output-homepage-html.org
+++ b/org/spine-bespoke-output-homepage-html.org
@@ -17,7 +17,7 @@
 
 * homepage index.html
 
-#+HEADER: :tangle "../markup/spine-bespoke-output/html/homepage.index.html"
+#+HEADER: :tangle "../markup/sisudoc-spine-bespoke-output/html/homepage.index.html"
 #+BEGIN_SRC html
 <!DOCTYPE html>
 <html>