Merge tag 'sisu_7.3.0' into debian

SiSU 7.3.0
author: Ralph Amissah <ralph.amissah@gmail.com> 2023-10-30 22:31:28 -0400
committer: Ralph Amissah <ralph.amissah@gmail.com> 2023-10-30 22:31:28 -0400
commit: ad803956c1f7ce1a4b0e820a21881a58a326b7f7 (patch)
tree: eb36cfcd0bcbed76a51b0e97e0a46609769ca232 /org
parent: debian/changelog (7.2.1-2) (diff)
parent: version & changelog, tag for release (diff)
30 files changed, 1257 insertions, 844 deletions
diff --git a/org/abstraction.org b/org/abstraction.org
index c31f36b6..477a5869 100644
--- a/org/abstraction.org
+++ b/org/abstraction.org
@@ -6881,7 +6881,7 @@ module SiSU_AO_Syntax
       dob
     end
     def bodymarkup(dob)
-      # << http://www.jus.uio.no/sisu/sisu_markup_table/markup >>
+      # << https://git.sisudoc.org/sisu-markup >>
       # See: data/sisu/sample/document_samples_sisu_markup/
       ## fontface
       # *{emphasis}*        e{emphasis}e       <strong>emphasis</strong>
@@ -7304,6 +7304,6 @@ encoding: utf-8
 
   - Git
     <https://git.sisudoc.org/projects/>
-    <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
-    <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
+    <https://git.sisudoc.org/projects/sisu>
+    <https://git.sisudoc.org/projects/sisu-markup>
 #+END_SRC
diff --git a/org/cgi.org b/org/cgi.org
index a1504a02..ab364e20 100644
--- a/org/cgi.org
+++ b/org/cgi.org
@@ -163,7 +163,7 @@ module  SiSU_CGI_SQLite                                 #% database building doc
 #!/usr/bin/env ruby
 =begin
 #{about}
- * Description: generates naive cgi search form for search of sisu database (sqlite)
+ ,* Description: generates naive cgi search form for search of sisu database (sqlite)
 #{gpl}
 =end
       begin
@@ -482,8 +482,8 @@ module SiSU_CGI_SQL
       <<-'WOK_SQL'
  * Name: SiSU information Structuring Universe
  * Author: Ralph Amissah
-   * http://www.jus.uio.no/sisu
-   * http://www.jus.uio.no/sisu/SiSU/download
+   * https://sisudoc.org/
+   * https://git.sisudoc.org/
       WOK_SQL
     end
     def gpl
@@ -520,7 +520,6 @@ module SiSU_CGI_SQL
    available at these locations:
    <http://www.fsf.org/licenses/gpl.html>
    [http://www.gnu.org/licenses/gpl.html]
-   <http://www.jus.uio.no/sisu/gpl.fsf>
 
  * SiSU uses:
    * Standard SiSU markup syntax,
@@ -528,8 +527,8 @@ module SiSU_CGI_SQL
    * Standard SiSU object citation numbering and system
 
  * Homepages:
-   [http://www.jus.uio.no/sisu]
-   [http://www.sisudoc.org]
+   [https://sisudoc.org]
+   [https://git.sisudoc.org]
 
  * Ralph Amissah
    [ralph@amissah.com]
@@ -568,7 +567,7 @@ module SiSU_CGI_SQL
       <meta name="sourcefile" content="SiSU._sst" />
       SiSU search form (sample): SiSU information Structuring Universe
       </title>
-      <link rel="generator" href="http://www.jus.uio.no/sisu" />
+      <link rel="generator" href="https://git.sisudoc.org" />
       <link rel="shortcut icon" href="#{@image_src}/rb7.ico" />
       <link href="../_sisu/css/html.css" rel="stylesheet">
     </head>
@@ -965,8 +964,8 @@ module SiSU_CGI_SQL
     <br>
       #{v.project} is software for document structuring, publishing and search,
     <br>
-    <a href="http://www.jus.uio.no/sisu" >
-      www.jus.uio.no/sisu
+    <a href="https://sisudoc.org" >
+      sisudoc.org
     </a>
     and
     <a href="http://www.sisudoc.org" >
@@ -1459,6 +1458,6 @@ encoding: utf-8
 
   - Git
     <https://git.sisudoc.org/projects/>
-    <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
-    <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
+    <https://git.sisudoc.org/projects/sisu>
+    <https://git.sisudoc.org/projects/sisu-markup>
 #+END_SRC
diff --git a/org/config.org b/org/config.org
index c14d7510..6a131bf3 100644
--- a/org/config.org
+++ b/org/config.org
@@ -307,6 +307,6 @@ encoding: utf-8
 
   - Git
     <https://git.sisudoc.org/projects/>
-    <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
-    <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
+    <https://git.sisudoc.org/projects/sisu>
+    <https://git.sisudoc.org/projects/sisu-markup>
 #+END_SRC
diff --git a/org/sisu_build.org b/org/config_build.org
index b0f32dfd..6e6e805f 100644
--- a/org/sisu_build.org
+++ b/org/config_build.org
@@ -59,7 +59,7 @@ git log --pretty=format:"%h %ad - %s%d [%an]" --graph --date=short --no-merges >
 #+BEGIN_SRC ruby
 #% constants
 module SiSUversion
-  SiSU_version                       = '7.2.1'
+  SiSU_version                       = '7.3.0'
 end
 module Dev
   GPGpubKey                          = '1BB4B289'
@@ -80,11 +80,9 @@ end
 
 -  Description:
 
--  Homepage: <http://www.jus.uio.no/sisu/SiSU>
-             <http://search.sisudoc.org>
--  Download: <http://www.jus.uio.no/sisu/download>
+-  Homepage: <https://sisudoc.org>
 
--  Copyright: (C) 2015, 2020 Ralph Amissah
+-  Copyright: (C) 2015, 2023 Ralph Amissah
 
 -  License:
 
@@ -357,7 +355,7 @@ module Project_details
     'documents - structuring, publishing in multiple formats & search'
   end
   def self.homepage
-    'http://www.sisudoc.org'
+    'https://www.sisudoc.org'
   end
   def self.thor
     "ruby-thor files for the installation/setup of #{name}"
@@ -736,7 +734,7 @@ proceed? }
       vn=version_number(vi)
       <<-WOK
 - sisu_#{vn}.orig.tar.xz (#{vi[:date]}:#{vi[:date_stamp].gsub(/20\d\dw/,'')})
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_#{vn}
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_#{vn}
       WOK
     end
     def self.changelog_header_release(filename,ch,vi)
@@ -784,7 +782,7 @@ proceed? }
       vn=version_number(vi)
       <<-WOK
 - sisu_#{vn}.orig.tar.xz (Open commit window: #{vi[:date]}; Pre-Release)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_#{vn}
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_#{vn}
       WOK
     end
     def self.changelog_header_pre_release_write(filename,ch)
@@ -923,7 +921,6 @@ Gem::Specification.new do |s|
                      Dir['bin/#{Project_details.name.downcase}gem'] +
                      Dir['bin/#{Project_details.name.downcase}']
   s.executables << '#{Project_details.name.downcase}gem' << '#{Project_details.name.downcase}'
-  s.has_rdoc       = false
 end
     WOK
   end
@@ -945,7 +942,6 @@ Gem::Specification.new do |s|
                      Dir['bin/#{Project_details.name.downcase}gem'] +
                      Dir['bin/#{Project_details.name.downcase}']
   s.executables << '#{Project_details.name.downcase}gem' << '#{Project_details.name.downcase}'
-  s.has_rdoc       = false
 end
     WOK
   end
@@ -1452,8 +1448,7 @@ __END__
  Common Rakefile, Rantfile installer for SiSU
    softlink Rakefile and Rantfile to this file
 
- - Homepage: <http://search.sisudoc.org>
- - Download: <http://www.jus.uio.no/sisu/download>
+ - Homepage: <https://sisudoc.org>
 
  Copyright (C) 2007 Ralph Amissah
 
@@ -1464,11 +1459,11 @@ __END__
 
  Rake is a Ruby build program by Jim Weirich
  - Rake may be downloaded and installed from:
-     <http://rake.rubyforge.org/>
+     <https://rake.rubyforge.org/>
 
  Rant is a Ruby build program by Stefan Lang
  - Rant may be downloaded and installed from:
-     <http://make.rubyforge.org/>
+     <https://make.rubyforge.org/>
 
  Notes on use:
    [if rake is preferred and installed]
@@ -1957,13 +1952,12 @@ task :note_sources do
   puts <<-WOK
 
   SiSU project:
-      <http://sisudoc.org>
-      <http://www.jus.uio.no/sisu>
+      <https://sisudoc.org>
   sisu source code is available at:
-      <http://git.sisudoc.org>
-      <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+      <https://git.sisudoc.org>
+      <https://git.sisudoc.org/projects/sisu>
   sisu markup samples are provided/packaged separately as sisu-markup-samples:
-      <http://git.sisudoc.org/gitweb/?p=doc/sisu-markup-samples.git;a=summary>
+      <https://git.sisudoc.org/projects/sisu-markup>
   WOK
 end
 task :note_installation do
@@ -2317,9 +2311,8 @@ proceed? }
     def self.changelog_header(vi)
       <<-WOK
 -- #{vi[:version]}.orig.tar.xz (#{vi[:date]}:#{vi[:date_stamp].gsub(/20\d\dw/,'')})
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_#{vi[:version]}
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_#{vi[:version]}-1
-http://www.jus.uio.no/sisu/pkg/src/sisu_#{vi[:version]}.orig.tar.xz
+https://git.sisudoc.org/projects/sisu/tag/?h=sisu_#{vi[:version]}
+https://git.sisudoc.org/projects/sisu/tag/?h=debian/sisu_#{vi[:version]}-1
   sisu_#{vi[:version]}.orig.tar.xz
   sisu_#{vi[:version]}-1.dsc
       WOK
@@ -2524,243 +2517,6 @@ WOK
 end
 #+END_SRC
 
-* nix
-
-** envrc
-
-#+HEADER: :tangle ../.envrc
-#+BEGIN_SRC sh
-NIX_ENFORCE_PURITY=0
-if ! has nix_direnv_version || ! nix_direnv_version 1.4.0; then
-# https://github.com/nix-community/nix-direnv
-  source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/1.4.0/direnvrc" "sha256-4XfVDjv75eHMWN4G725VW7BoOV4Vl3vAabK4YXIfPyE="
-fi
-if [ -e .env/local ]; then
-  source_env_if_exists .env/local || source .env/local
-fi
-#+END_SRC
-
-#+HEADER: :tangle ../.envrc-local_
-#+BEGIN_SRC sh
-export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos
-#export NIX_PATH=nixpkgs=/nixpkgs-ra/nixpkgs
-## reload when these files change
-use flake
-watch_file flake.nix
-eval "$(nix print-dev-env)"
-export SisuVER=$(git describe --long --tags | sed 's/^[ a-z_-]\+\([0-9.]\+\)/\1/;s/\([^-]*-g\)/r\1/;s/-/./g')
-export SisuSRC=/grotto-ra/repo/git.repo/projects/project-sisu/sisu
-export SisuDOC=/grotto-ra/repo/git.repo/projects/project-sisu/susu-markup/sisu-markup-samples/data/samples/current
-export SisuOUT=/tmp/sisu/$SisuVER/www
-export SisuOUTstatic=/var/www
-
-export RUBYLIB+=`pwd`/lib
-#+END_SRC
-
-** shell.nix
-
-*** shell.nix TODO
-
-#+HEADER: :tangle ../shell.nix
-#+HEADER: :shebang #!/usr/bin/env -S nix-shell --pure
-#+HEADER: :tangle-mode (identity #o755)
-#+BEGIN_SRC nix
-{ pkgs ? import <nixpkgs> {} }:
-with pkgs;
-mkShell {
-  buildInputs = [
-    <<ruby_current>>
-    <<packages_project_relevant>>
-    <<packages_build>>
-    <<packages_extra>>
-  ];
-  shellHook = ''
-    if [[ -e ".envrc" ]]; then
-      source .envrc
-    fi
-    eval "$(starship init bash)"
-  '';
-}
-#+END_SRC
-
-#+BEGIN_SRC nix
-#!/usr/bin/env -S nix-shell --pure
-{ pkgs ? import <nixpkgs> {} }:
-with pkgs;
-mkShell {
-  buildInputs = [
-    ruby_3_1
-    rubyPackages_3_1.rake
-    rubyPackages_3_1.sqlite3
-    rubyPackages_3_1.thor
-    sqlite
-    unzip
-    xz
-    zip
-    openssl
-    #texlive-combined-full
-    nixFlakes
-    validatePkgConfig
-    jq
-    git
-    ### candy
-    starship
-  ];
-  shellHook = ''
-    if [[ -e ".envrc" ]]; then
-      source .envrc
-    fi
-    eval "$(starship init bash)"
-  '';
-}
-#+END_SRC
-
-
-#+HEADER: :NO-tangle ../shell.nix
-#+BEGIN_SRC nix
-{ pkgs ? import <nixpkgs> {} }:
-pkgs.mkShell {
-  buildInputs = [
-    (import ./packages.nix { inherit pkgs; })
-  ];
-}
-#+END_SRC
-
-*** packages.nix
-**** default
-
-#+HEADER: :NO-tangle ../packages.nix
-#+BEGIN_SRC nix
-{ pkgs ? import <nixpkgs> {} }:
-with pkgs; [
-  <<ruby_current>>
-  <<packages_project_relevant>>
-  <<packages_build>>
-]
-#+END_SRC
-
-**** ruby 3.1
-
-#+HEADER: :tangle ../nix/pkglst/packages_ruby_3_1.nix
-#+BEGIN_SRC nix
-{ pkgs ? import <nixpkgs> {} }:
-with pkgs; [
-  <<ruby_version_3_1>>
-  <<packages_project_relevant>>
-  <<packages_build>>
-]
-#+END_SRC
-
-**** ruby 3.0
-
-#+HEADER: :tangle ../nix/pkglst/packages_ruby_3_0.nix
-#+BEGIN_SRC nix
-{ pkgs ? import <nixpkgs> {} }:
-with pkgs; [
-  <<ruby_version_3_0>>
-  <<packages_project_relevant>>
-  <<packages_build>>
-]
-#+END_SRC
-
-**** ruby 2.6
-
-#+HEADER: :tangle ../nix/pkglst/packages_ruby_2_6.nix
-#+BEGIN_SRC nix
-{ pkgs ? import <nixpkgs> {} }:
-with pkgs; [
-  <<ruby_version_2_6>>
-  <<packages_project_relevant>>
-  <<packages_build>>
-]
-#+END_SRC
-
-*** ruby legacy
-
-#+NAME: ruby_legacy
-#+BEGIN_SRC nix
-<<ruby_version_2_6>>
-#+END_SRC
-*** ruby current
-
-#+NAME: ruby_current
-#+BEGIN_SRC nix
-<<ruby_version_3_1>>
-#+END_SRC
-
-*** ruby next
-
-#+NAME: ruby_next
-#+BEGIN_SRC nix
-<<ruby_version_3_1>>
-#+END_SRC
-
-*** ruby 2.6 - ruby_version_2_6
-
-#+NAME: ruby_version_2_6
-#+BEGIN_SRC nix
-ruby_2_6
-rubyPackages_2_6.rake
-rubyPackages_2_6.sqlite3
-rubyPackages_2_6.thor
-#+END_SRC
-
-*** ruby 3.0 - ruby_version_3_0
-
-#+NAME: ruby_version_3_0
-#+BEGIN_SRC nix
-ruby_3_0
-rubyPackages_3_0.rake
-rubyPackages_3_0.sqlite3
-rubyPackages_3_0.thor
-#+END_SRC
-
-*** ruby 3.1 - ruby_version_3_1
-
-#+NAME: ruby_version_3_1
-#+BEGIN_SRC nix
-ruby_3_1
-rubyPackages_3_1.rake
-rubyPackages_3_1.sqlite3
-rubyPackages_3_1.thor
-#+END_SRC
-
-*** nix related packages
-
-#+NAME: nix_packages
-#+BEGIN_SRC nix
-nix
-bundler
-bundix
-#+END_SRC
-
-*** project relevant packages
-
-#+NAME: packages_project_relevant
-#+BEGIN_SRC nix
-sqlite
-unzip
-xz
-zip
-openssl
-#texlive-combined-full
-#+END_SRC
-
-*** project misc build packages
-
-#+NAME: packages_build
-#+BEGIN_SRC nix
-nixFlakes
-validatePkgConfig
-jq
-git
-#+END_SRC
-
-#+NAME: packages_extra
-#+BEGIN_SRC nix
-starship
-#+END_SRC
-
 * descriptions
 ** README
 
@@ -2799,7 +2555,7 @@ manifests of generated output. Book indexes may be made.
 Some document markup samples are provided in the package sisu -markup-samples.
 
 Homepages:
-- <http://www.sisudoc.org/>
+- <https://www.sisudoc.org/>
 
 INSTALL OR RUN WITHOUT INSTALLATION
 ***********************************
@@ -2870,7 +2626,7 @@ For a list of alternative actions you may type:
 
   rake -T
 
-Rake: <http://rake.rubyforge.org/> <http://rubyforge.org/frs/?group_id=50>
+Rake: <https://rake.rubyforge.org/> <https://rubyforge.org/frs/?group_id=50>
 
 
 ----------------------------------------
@@ -2918,8 +2674,8 @@ ruby setup.rb setup
 ruby setup.rb install
 
 further information:
-<http://i.loveruby.net/en/projects/setup/>
-<http://i.loveruby.net/en/projects/setup/doc/usage.html>
+<https://i.loveruby.net/en/projects/setup/>
+<https://i.loveruby.net/en/projects/setup/doc/usage.html>
 
   ruby setup.rb config && ruby setup.rb setup && sudo ruby setup.rb install
 
@@ -2946,8 +2702,7 @@ adding the following to your sources list /etc/apt/sources.list
 
 #/etc/apt/sources.list
 
-deb http://www.jus.uio.no/sisu/archive unstable main non-free
-deb-src http://www.jus.uio.no/sisu/archive unstable main non-free
+deb https://www.jus.uio.no/sisu/archive unstable main non-free
 
 The non-free section is for sisu markup samples provided, which contain
 authored works the substantive text of which cannot be changed, and which as a
@@ -2977,7 +2732,7 @@ The package is divided into the following components:
   *Debian* Free Software Guidelines non-free)
 
 *SiSU* is available off Debian Unstable and Testing [link:
-<http://packages.debian.org/cgi-bin/search_packages.pl?searchon=names&subword=1&version=all&release=all&keywords=sisu>]
+<https://packages.debian.org/cgi-bin/search_packages.pl?searchon=names&subword=1&version=all&release=all&keywords=sisu>]
 [^1] install it using apt-get, aptitude or alternative *Debian* install tools.
 
 DEPENDENCIES
@@ -3033,7 +2788,7 @@ document, produces multiple output formats including: /plaintext/, /HTML/,
 /XHTML/, /XML/, /EPUB/, /ODT/ (/OpenDocument/ (/ODF/) text), /LaTeX/, /PDF/,
 info, and /SQL/ (/PostgreSQL/ and /SQLite/) , which share text object numbers
 ("object citation numbering") and the same document structure information. For
-more see: <http://sisudoc.org> or <http://www.jus.uio.no/sisu>
+more see: <https://sisudoc.org> or <https://git.sisudoc.org>
 
 DOCUMENT PROCESSING COMMAND FLAGS
 .................................
@@ -3772,12 +3527,10 @@ ONLINE
 ......
 
 Online markup examples are available together with the respective outputs
-produced from <http://www.jus.uio.no/sisu/SiSU/examples.html> or from
-<http://www.jus.uio.no/sisu/sisu_examples/>
+produced from <https://git.sisudoc.org/sisu-markup> or from
 
 There is of course this document, which provides a cursory overview of sisu
 markup and the respective output produced:
-<http://www.jus.uio.no/sisu/sisu_markup/>
 
 an alternative presentation of markup syntax:
 /usr/share/doc/sisu/on_markup.txt.gz
@@ -3843,24 +3596,20 @@ to this one:
   :num_top: 1
   :breaks: new=C; break=1
   :bold: /Gnu|Debian|Ruby|SiSU/
-  :home_button_text: {SiSU}http://sisudoc.org; {git}http://git.sisudoc.org
-  :footer: {SiSU}http://sisudoc.org; {git}http://git.sisudoc.org
+  :home_button_text: {SiSU}https://sisudoc.org; {git}https://git.sisudoc.org
+  :footer: {SiSU}https://sisudoc.org; {git}https://git.sisudoc.org
   :manpage: name=sisu - documents: markup, structuring, publishing in multiple standard formats, and search;
      synopsis=sisu [-abcDdeFhIiMmNnopqRrSsTtUuVvwXxYyZz0-9] [filename/wildcard ]
      . sisu [-Ddcv] [instruction]
      . sisu [-CcFLSVvW]
 
 @links:
-  { SiSU Homepage }http://www.sisudoc.org/
-  { SiSU Manual }http://www.sisudoc.org/sisu/sisu_manual/
-  { Book Samples & Markup Examples }http://www.jus.uio.no/sisu/SiSU/examples.html
-  { SiSU Download }http://www.jus.uio.no/sisu/SiSU/download.html
-  { SiSU Changelog }http://www.jus.uio.no/sisu/SiSU/changelog.html
-  { SiSU Git repo }http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary
-  { SiSU List Archives }http://lists.sisudoc.org/pipermail/sisu/
-  { SiSU @ Debian }http://packages.qa.debian.org/s/sisu.html
-  { SiSU Project @ Debian }http://qa.debian.org/developer.php?login=sisu@lists.sisudoc.org
-  { SiSU @ Wikipedia }http://en.wikipedia.org/wiki/SiSU
+  { SiSU Homepage }https://www.sisudoc.org/
+  { SiSU Manual }https://www.sisudoc.org/sisu/sisu_manual/
+  { SiSU Git repo }https://git.sisudoc.org/sisu/
+  { SiSU @ Debian }https://packages.qa.debian.org/s/sisu.html
+  { SiSU Project @ Debian }https://qa.debian.org/developer.php?login=sisu@lists.sisudoc.org
+  { SiSU @ Wikipedia }https://en.wikipedia.org/wiki/SiSU
 
 AVAILABLE HEADERS
 .................
@@ -3925,8 +3674,8 @@ This is a sample header
   :isbn: [ISBN]
   :oclc:
 
-@links: { SiSU }http://www.sisudoc.org
-  { FSF }http://www.fsf.org
+@links: { SiSU }https://www.sisudoc.org
+  { FSF }https://www.fsf.org
 
 @make:
   :num_top: 1
@@ -3936,8 +3685,8 @@ This is a sample header
   :promo: sisu, ruby, sisu_search_libre, open_society
   :bold: [regular expression of words/phrases to be made bold]
   :italics: [regular expression of words/phrases to italicise]
-  :home_button_text: {SiSU}http://sisudoc.org; {git}http://git.sisudoc.org
-  :footer: {SiSU}http://sisudoc.org; {git}http://git.sisudoc.org
+  :home_button_text: {SiSU}https://sisudoc.org; {git}https://git.sisudoc.org
+  :footer: {SiSU}https://sisudoc.org; {git}https://git.sisudoc.org
 
 @original:
   :language: [language]
@@ -4206,33 +3955,33 @@ decoration is omitted).
 
 *markup example:*
 
-normal text http://www.sisudoc.org/ continues
+normal text https://www.sisudoc.org/ continues
 
 *resulting output:*
 
-normal text <http://www.sisudoc.org/> continues
+normal text <https://www.sisudoc.org/> continues
 
 An escaped url without decoration
 
 *markup example:*
 
-normal text _http://www.sisudoc.org/ continues
+normal text _https://www.sisudoc.org/ continues
 
-deb _http://www.jus.uio.no/sisu/archive unstable main non-free
+deb _https://www.jus.uio.no/sisu/archive unstable main non-free
 
 *resulting output:*
 
-normal text http://www.sisudoc.org/ continues
+normal text https://www.sisudoc.org/ continues
 
-deb http://www.jus.uio.no/sisu/archive unstable main non-free
+deb https://www.jus.uio.no/sisu/archive unstable main non-free
 
 where a code block is used there is neither decoration nor hyperlinking, code
 blocks are discussed later in this document
 
 *resulting output:*
 
-deb http://www.jus.uio.no/sisu/archive unstable main non-free
-deb-src http://www.jus.uio.no/sisu/archive unstable main non-free
+deb https://www.jus.uio.no/sisu/archive unstable main non-free
+deb-src https://www.jus.uio.no/sisu/archive unstable main non-free
 
 
 ----------------------------------------
@@ -4244,22 +3993,22 @@ To link text or an image to a url the markup is as follows
 
 *markup example:*
 
-about { SiSU }http://url.org markup
+about { SiSU }https://url.org markup
 
 *resulting output:*
 
-about SiSU [link: <http://www.sisudoc.org/>] markup
+about SiSU [link: <https://www.sisudoc.org/>] markup
 
 A shortcut notation is available so the url link may also be provided
 automatically as a footnote
 
 *markup example:*
 
-about {~^ SiSU }http://url.org markup
+about {~^ SiSU }https://url.org markup
 
 *resulting output:*
 
-about SiSU [link: <http://www.sisudoc.org/>] [^7] markup
+about SiSU [link: <https://www.sisudoc.org/>] [^7] markup
 
 Internal document links to a tagged location, including an ocn
 
@@ -4295,24 +4044,24 @@ LINKING IMAGES
 [image: "a better way"]
  [image: "Way Better - with Gnu/Linux, Debian and Ruby"]
 
-{~^ ruby_logo.png "Ruby" }http://www.ruby-lang.org/en/
+{~^ ruby_logo.png "Ruby" }https://www.ruby-lang.org/en/
 
 *resulting output:*
 
 tux.png 64x80 [link: local image]
 
-tux.png 64x80 "Gnu/Linux - a better way" [link: <http://www.sisudoc.org/>]
+tux.png 64x80 "Gnu/Linux - a better way" [link: <https://www.sisudoc.org/>]
 
 GnuDebianLinuxRubyBetterWay.png 100x101 "Way Better - with Gnu/Linux, Debian
-and Ruby" [link: <http://www.sisudoc.org/>]
+and Ruby" [link: <https://www.sisudoc.org/>]
 
-ruby_logo.png 70x90 "Ruby" [link: <http://www.ruby-lang.org/en/>] [^8]
+ruby_logo.png 70x90 "Ruby" [link: <https://www.ruby-lang.org/en/>] [^8]
 
 *linked url footnote shortcut*
 
-{~^ [text to link] }http://url.org
+{~^ [text to link] }https://url.org
 
-% maps to: { [text to link] }http://url.org ~{ http://url.org }~
+% maps to: { [text to link] }https://url.org ~{ https://url.org }~
 
 % which produces hyper-linked text within a document/paragraph, with an endnote providing the url for the text location used in the hyperlink
 
@@ -4337,21 +4086,21 @@ TREE
 
 */"Viral Spiral"/, David Bollier*
 
-"Viral Spiral", David Bollier [link: <http://www.sisudoc.org/sisu/en/manifest/viral_spiral.david_bollier.manifest.html>]
-      document manifest [link: <http://www.sisudoc.org/sisu/en/manifest/viral_spiral.david_bollier.manifest.html>]
-      html, segmented text [link: <http://www.sisudoc.org/sisu/en/html/viral_spiral.david_bollier/viral_spiral.david_bollier.toc.html>]
-      html, scroll, document in one [link: <http://www.sisudoc.org/sisu/en/html/viral_spiral.david_bollier.html>]
-      epub [link: <http://www.sisudoc.org/sisu/en/epub/viral_spiral.david_bollier.epub>]
-      pdf, landscape [link: <http://www.sisudoc.org/sisu/en/pdf/viral_spiral.david_bollier.landscape.a4.pdf>]
-      pdf, portrait [link: <http://www.sisudoc.org/sisu/en/pdf/viral_spiral.david_bollier.landscape.a4.pdf>]
-      odf: odt, open document text [link: <http://www.sisudoc.org/sisu/en/odt/viral_spiral.david_bollier.odt>]
-      xhtml scroll [link: <http://www.sisudoc.org/sisu/en/xhtml/viral_spiral.david_bollier.xhtml>]
-      xml, sax [link: <http://www.sisudoc.org/sisu/en/xml_sax/viral_spiral.david_bollier.sax.xml>]
-      xml, dom [link: <http://www.sisudoc.org/sisu/en/xml_dom/viral_spiral.david_bollier.dom.xml>]
-      concordance [link: <http://www.sisudoc.org/sisu/en/html/viral_spiral.david_bollier/concordance.html>]
-      dcc, document content certificate (digests) [link: <http://www.sisudoc.org/sisu/en/digest/viral_spiral.david_bollier.hash_digest.txt>]
-      markup source text [link: <http://www.sisudoc.org/sisu/en/src/viral_spiral.david_bollier.sst>]
-      markup source (zipped) pod [link: <http://www.sisudoc.org/sisu/en/src/viral_spiral.david_bollier.sst.zip>]
+"Viral Spiral", David Bollier [link: <https://www.sisudoc.org/sisu/en/manifest/viral_spiral.david_bollier.manifest.html>]
+      document manifest [link: <https://www.sisudoc.org/sisu/en/manifest/viral_spiral.david_bollier.manifest.html>]
+      html, segmented text [link: <https://www.sisudoc.org/sisu/en/html/viral_spiral.david_bollier/viral_spiral.david_bollier.toc.html>]
+      html, scroll, document in one [link: <https://www.sisudoc.org/sisu/en/html/viral_spiral.david_bollier.html>]
+      epub [link: <https://www.sisudoc.org/sisu/en/epub/viral_spiral.david_bollier.epub>]
+      pdf, landscape [link: <https://www.sisudoc.org/sisu/en/pdf/viral_spiral.david_bollier.landscape.a4.pdf>]
+      pdf, portrait [link: <https://www.sisudoc.org/sisu/en/pdf/viral_spiral.david_bollier.landscape.a4.pdf>]
+      odf: odt, open document text [link: <https://www.sisudoc.org/sisu/en/odt/viral_spiral.david_bollier.odt>]
+      xhtml scroll [link: <https://www.sisudoc.org/sisu/en/xhtml/viral_spiral.david_bollier.xhtml>]
+      xml, sax [link: <https://www.sisudoc.org/sisu/en/xml_sax/viral_spiral.david_bollier.sax.xml>]
+      xml, dom [link: <https://www.sisudoc.org/sisu/en/xml_dom/viral_spiral.david_bollier.dom.xml>]
+      concordance [link: <https://www.sisudoc.org/sisu/en/html/viral_spiral.david_bollier/concordance.html>]
+      dcc, document content certificate (digests) [link: <https://www.sisudoc.org/sisu/en/digest/viral_spiral.david_bollier.hash_digest.txt>]
+      markup source text [link: <https://www.sisudoc.org/sisu/en/src/viral_spiral.david_bollier.sst>]
+      markup source (zipped) pod [link: <https://www.sisudoc.org/sisu/en/src/viral_spiral.david_bollier.sst.zip>]
 
 GROUPED TEXT / BLOCKED TEXT
 ...........................
@@ -4900,7 +4649,7 @@ pb: Harvard University Press
 edn: (edition)
 yr: 2006
 pl: U.S.
-url: http://cyber.law.harvard.edu/wealth_of_networks/Main_Page
+url: https://cyber.law.harvard.edu/wealth_of_networks/Main_Page
 note:
 sn: Benkler, /{Wealth of Networks}/ (2006)
 id: Benkler2006
@@ -4951,7 +4700,7 @@ pb: publisher
 edn: edition
 yr: year (yyyy or yyyy-mm or yyyy-mm-dd) (required)
 pg: pages
-url: http://url
+url: https://url
 note: note
 id: create_short_identifier e.g. authorSurnameYear
     (used in substitutions: when found within text will be
@@ -5097,7 +4846,7 @@ Configure substitution in _sisu/sisu_document_make
 
 ----------------------------------------
 
- [1]: <http://packages.qa.debian.org/s/sisu.html>
+ [1]: <https://packages.qa.debian.org/s/sisu.html>
 
  [2]: from the *Debian* control file
 
@@ -5124,13 +4873,13 @@ Configure substitution in _sisu/sisu_document_make
 
  [+2]: editors notes, numbered plus symbol footnote/endnote series
 
- [7]: <http://www.sisudoc.org/>
+ [7]: <https://www.sisudoc.org/>
 
- [8]: <http://www.ruby-lang.org/en/>
+ [8]: <https://www.ruby-lang.org/en/>
 
  [9]: Table from the Wealth of Networks by Yochai Benkler
 
- <http://www.jus.uio.no/sisu/the_wealth_of_networks.yochai_benkler>
+ <https://sisudoc.org/spine/en/html/the_wealth_of_networks.yochai_benkler/toc.html>
 
  [10]: for which you may alternatively use the full form author: title: and year:
 
@@ -5342,13 +5091,12 @@ Configure substitution in _sisu/sisu_document_make
 
   In any event, my resulting technical opinions (in my modest domain of
   action) may be regarded as encapsulated within SiSU
-  [http://www.sisudoc.org/]
+  [https://www.sisudoc.org/]
 
-  http://www.sisudoc.org/
-  http://www.jus.uio.no/sisu/
+  https://www.sisudoc.org/
 
-  git clone git://git.sisudoc.org/git/code/sisu.git --branch upstream
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary
+  git clone git://git.sisudoc.org/software/sisu --branch upstream
+  https://git.sisudoc.org/sisu/
   (there may be additional commits in the upstream branch)
   git clone --depth 1 git://git.sisudoc.org/git/code/sisu.git --branch upstream
 
@@ -5452,7 +5200,7 @@ Configure substitution in _sisu/sisu_document_make
 **** Summary
   SiSU information Structuring Universe
   Structured information, Serialized Units    <www.sisudoc.org>   or
-  <www.jus.uio.no/sisu/> software for electronic texts, document collections,
+  <git.sisudoc.org/> software for electronic texts, document collections,
   books, digital libraries, and search, with "atomic search" and text positioning
   system (shared text citation numbering: "ocn")
   outputs include: plaintext, html, XHTML, XML, ODF (OpenDocument), EPUB, LaTeX,
@@ -5482,7 +5230,7 @@ Configure substitution in _sisu/sisu_document_make
 
   SiSU is an Open Source project initiated and led by Ralph Amissah
   <ralph.amissah@gmail.com> and can be contacted via mailing list
-  <http://lists.sisudoc.org/listinfo/sisu> at <sisu@lists.sisudoc.org>. SiSU is
+  <https://lists.sisudoc.org/listinfo/sisu> at <sisu@lists.sisudoc.org>. SiSU is
   licensed under the GNU General Public License.
 
 ***** notes
@@ -5674,35 +5422,33 @@ Configure substitution in _sisu/sisu_document_make
   <ralph@amissah.com>
   <ralph.amissah@gmail.com>
   <sisu@lists.sisudoc.org>
-  <http://lists.sisudoc.org/listinfo/sisu>
+  <https://lists.sisudoc.org/listinfo/sisu>
   2010
   w3 since October 3 1993
 *** Finding SiSU
 **** source
-  http://git.sisudoc.org/gitweb/
+  https://git.sisudoc.org/sisu/
 
 ***** sisu
   sisu git repo:
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary
+  https://git.sisudoc.org/sisu/
 
 ****** most recent source without repo history
-  git clone --depth 1 git://git.sisudoc.org/git/code/sisu.git --branch upstream
+  git clone --depth 1 git://git.sisudoc.org/software/sisu --branch upstream
 ****** full clone
-  git clone git://git.sisudoc.org/git/code/sisu.git --branch upstream
+  git clone git://git.sisudoc.org/software/sisu --branch upstream
 
 ***** sisu-markup-samples git repo:
-  http://git.sisudoc.org/gitweb/?p=doc/sisu-markup-samples.git;a=summary
+  https://git.sisudoc.org/sisu-markup
 
 **** mailing list
   sisu at lists.sisudoc.org
-  http://lists.sisudoc.org/listinfo/sisu
+  https://lists.sisudoc.org/listinfo/sisu
 
 **** irc oftc #sisu
 
 **** home pages
-    <http://www.sisudoc.org/>
-    <http://search.sisudoc.org/>
-    <http://www.jus.uio.no/sisu>
+    <https://www.sisudoc.org/>
 
 *** Installation
 
@@ -5728,19 +5474,18 @@ Configure substitution in _sisu/sisu_document_make
 
   using git:
 
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log
+  https://git.sisudoc.org/sisu/
 
-    git clone git://git.sisudoc.org/git/code/sisu.git --branch upstream
-    git clone --depth 1 git://git.sisudoc.org/git/code/sisu.git --branch upstream
+    git clone git://git.sisudoc.org/software/sisu --branch upstream
+    git clone --depth 1 git://git.sisudoc.org/software/sisu --branch upstream
 
   or, identify latest available source:
 
   https://packages.debian.org/sid/sisu
-  http://packages.qa.debian.org/s/sisu.html
-  http://qa.debian.org/developer.php?login=sisu@lists.sisudoc.org
+  https://packages.qa.debian.org/s/sisu.html
+  https://qa.debian.org/developer.php?login=sisu@lists.sisudoc.org
 
-  http://sisudoc.org/sisu/archive/pool/main/s/sisu/
+  https://sisudoc.org/sisu/archive/pool/main/s/sisu/
 
   and download the:
 
@@ -5755,12 +5500,12 @@ Configure substitution in _sisu/sisu_document_make
     apt-get install devscripts
 
   and then you can get it from Debian:
-    dget -xu http://ftp.fi.debian.org/debian/pool/main/s/sisu/sisu_5.4.5-1.dsc
+    dget -xu https://ftp.fi.debian.org/debian/pool/main/s/sisu/sisu_5.4.5-1.dsc
 
   or off sisu repos
-    dget -x http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_5.4.5-1.dsc
+    dget -x https://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_5.4.5-1.dsc
   or
-    dget -x http://sisudoc.org/sisu/archive/pool/main/s/sisu/sisu_5.4.5-1.dsc
+    dget -x https://sisudoc.org/sisu/archive/pool/main/s/sisu/sisu_5.4.5-1.dsc
 
 ****** 2. Unpack the source
 
@@ -5819,7 +5564,7 @@ Configure substitution in _sisu/sisu_document_make
 
     rake -T
 
-  Rake: <http://rake.rubyforge.org/> <http://rubyforge.org/frs/?group_id=50>
+  Rake: <https://rake.rubyforge.org/> <https://rubyforge.org/frs/?group_id=50>
 
 ***** installation with setup.rb
 
@@ -5832,8 +5577,8 @@ Configure substitution in _sisu/sisu_document_make
   ruby setup.rb install
 
   further information:
-  <http://i.loveruby.net/en/projects/setup/>
-  <http://i.loveruby.net/en/projects/setup/doc/usage.html>
+  <https://i.loveruby.net/en/projects/setup/>
+  <https://i.loveruby.net/en/projects/setup/doc/usage.html>
 
     ruby setup.rb config && ruby setup.rb setup && sudo ruby setup.rb install
 
@@ -5853,8 +5598,8 @@ Configure substitution in _sisu/sisu_document_make
 
   #/etc/apt/sources.list
 
-  deb http://www.jus.uio.no/sisu/archive unstable main non-free
-  deb-src http://www.jus.uio.no/sisu/archive unstable main non-free
+  deb https://www.jus.uio.no/sisu/archive unstable main non-free
+  deb-src https://www.jus.uio.no/sisu/archive unstable main non-free
 
   The non-free section is for sisu markup samples provided, which contain
   authored works the substantive text of which cannot be changed, and which as a
@@ -5884,7 +5629,7 @@ Configure substitution in _sisu/sisu_document_make
     *Debian* Free Software Guidelines non-free)
 
     *SiSU* is available off Debian Unstable and Testing [link:
-    <http://packages.debian.org/cgi-bin/search_packages.pl?searchon=names&subword=1&version=all&release=all&keywords=sisu>]
+    <https://packages.debian.org/cgi-bin/search_packages.pl?searchon=names&subword=1&version=all&release=all&keywords=sisu>]
     [^1] install it using apt-get, aptitude or alternative *Debian* install tools.
 
 **** Arch Linux
@@ -6030,112 +5775,6 @@ Configure substitution in _sisu/sisu_document_make
   data/sisu/conf/editor-syntax-etc/emacs/
   data/sisu/conf/editor-syntax-etc/emacs/sisu-mode.el
 
-** git
-*** gitignore
-
-#+HEADER: :tangle ../.gitignore
-#+BEGIN_SRC sh
-# git ls-files --others --exclude-from=.git/info/exclude
-*
-!README
-!COPYRIGHT
-!CHANGELOG
-!CHANGELOGS/
-!CHANGELOGS/CHANGELOG
-!CHANGELOGS/CHANGELOG_v*
-!makefile
-!Rakefile
-!Rantfile
-!qi
-!setup/
-!setup/*
-!version
-!version.txt
-!conf/
-!conf/**
-!*.json
-!*.org
-!*.rb
-!*.txt
-!*.yml
-!*.nix
-!nix/
-!nix/**
-!org/
-!bin
-!bin/sisu
-!bin/sisu-*
-!bin/sisugem
-!lib
-!lib/**
-!man
-!man/**
-!data
-!data/doc
-!data/doc/**
-!data/sisu
-!data/sisu/**
-!*.sst
-!*.ssm
-!**/*.sst
-!**/*.ssm
-!debian/
-!debian/changelog
-!debian/compat
-!debian/control
-!debian/copyright
-!debian/gbp.conf
-!debian/sisu*.manpages
-!debian/sisu*.install
-!debian/manpages/
-!debian/manpages/sisu*.7
-!debian/rules
-!debian/sisu\.*
-!debian/source/
-!debian/source/format
-!debian/watch
-*~
-*_
-\#*
-*.\#*
-*.tmp
-*_tmp
-*.gem
-*.gemspec
-!sisu.gemspec
-*_.rb
-*.rb_
-0???-*.patch
-*.gz
-*.xz
-*_
-.*
-!.gitignore
-!.envrc
-#+END_SRC
-
-##+HEADER: :tangle ../.gitignore
-#+BEGIN_SRC sh
-# git ls-files --others --exclude-from=.git/info/exclude
-,*~
-,*_
-\#*
-,*.\#*
-,*.tmp
-,*_tmp
-.*
-,*.gem
-,*.gemspec
-!.gitignore
-!.envrc
-,*_.rb
-,*.rb_
-.pc
-0???-*.patch
-,*.gz
-,*.xz
-#+END_SRC
-
 *** todo
   sisu_todo.org
 
@@ -6174,14 +5813,14 @@ encoding: utf-8
     more details.
 
     You should have received a copy of the GNU General Public License along with
-    this program. If not, see <http://www.gnu.org/licenses/>.
+    this program. If not, see <https://www.gnu.org/licenses/>.
 
     If you have Internet connection, the latest version of the GPL should be
     available at these locations:
-    <http://www.fsf.org/licensing/licenses/gpl.html>
-    <http://www.gnu.org/licenses/gpl.html>
+    <https://www.fsf.org/licensing/licenses/gpl.html>
+    <https://www.gnu.org/licenses/gpl.html>
 
-    <http://www.sisudoc.org/sisu/en/manifest/gpl.fsf.html>
+    <https://www.sisudoc.org/sisu/en/manifest/gpl.fsf.html>
 
   - SiSU uses:
     - Standard SiSU markup syntax,
@@ -6189,10 +5828,10 @@ encoding: utf-8
     - Standard SiSU object citation numbering and system
 
   - Homepages:
-    <http://www.sisudoc.org>
+    <https://www.sisudoc.org>
 
   - Git
     <https://git.sisudoc.org/projects/>
-    <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
-    <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
+    <https://git.sisudoc.org/projects/sisu>
+    <https://git.sisudoc.org/projects/sisu-markup>
 #+END_SRC
diff --git a/org/config_git.org b/org/config_git.org
new file mode 100644
index 00000000..68ff2cea
--- /dev/null
+++ b/org/config_git.org
@@ -0,0 +1,121 @@
+-*- mode: org -*-
+#+TITLE:       configuration git
+#+DESCRIPTION: documents - structuring, various output representations & search
+#+FILETAGS:    :sisu:configure:git:
+#+AUTHOR:      Ralph Amissah
+#+EMAIL:       [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]]
+#+COPYRIGHT:   Copyright (C) 2015 - 2023 Ralph Amissah
+#+LANGUAGE:    en
+#+STARTUP:     content hideblocks hidestars noindent entitiespretty
+#+PROPERTY:    header-args  :exports code
+#+PROPERTY:    header-args+ :noweb yes
+#+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
+
+* git
+** .gitignore :gitignore:
+
+#+HEADER: :tangle "../.gitignore"
+#+BEGIN_SRC sh
+# git ls-files --others --exclude-from=.git/info/exclude
+# git check-ignore -v flake.lock
+# git clean -ix
+# find . -name "*_" | xargs rm -rf
+,*
+!.gitignore
+!.gitattributes
+!nix/**
+!*.nix
+!flake.lock
+!README
+!COPYRIGHT
+!CHANGELOG
+!CHANGELOGS/
+!CHANGELOGS/CHANGELOG
+!CHANGELOGS/CHANGELOG_v*
+!makefile
+!Rakefile
+!Rantfile
+!qi
+!setup/
+!setup/*
+!version
+!version.txt
+!conf/
+!conf/**
+!*.json
+!*.org
+!org/
+!org/*.org
+!*.rb
+!*.txt
+!*.yml
+!bin
+!bin/sisu
+!bin/sisu-*
+!bin/sisugem
+!lib
+!lib/**
+!man
+!man/**
+!data
+!data/doc
+!data/doc/**
+!data/sisu
+!data/sisu/**
+!*.sst
+!*.ssm
+!*.ssi
+!**/*.sst
+!**/*.ssm
+!**/*.ssi
+!debian/
+!debian/changelog
+!debian/compat
+!debian/control
+!debian/copyright
+!debian/gbp.conf
+!debian/sisu*.manpages
+!debian/sisu*.install
+!debian/manpages/
+!debian/manpages/sisu*.7
+!debian/rules
+!debian/sisu\.*
+!debian/source/
+!debian/source/format
+!debian/watch
+,*~
+,*_
+\#*
+,*.\#*
+,*.tmp
+,*_tmp
+,*.gem
+,*.gemspec
+!sisu.gemspec
+,*_.rb
+,*.rb_
+0???-*.patch
+,*.gz
+,*.xz
+,*_
+.*
+!.gitignore
+!.gitattributes
+!.envrc
+!.envrc-local
+!.envrc-nix
+#+END_SRC
+
+** .gitattributes :gitattributes:
+
+#+HEADER: :tangle "../.gitattributes"
+#+BEGIN_SRC sh
+/org export-ignore
+.gitattributes export-ignore
+tangle export-ignore
+#flake.lock export-ignore
+#+END_SRC
diff --git a/org/config_nix.org b/org/config_nix.org
new file mode 100644
index 00000000..b7f3248e
--- /dev/null
+++ b/org/config_nix.org
@@ -0,0 +1,527 @@
+-*- mode: org -*-
+#+TITLE:       configuration nix
+#+DESCRIPTION: makefile for spine
+#+FILETAGS:    :sisu:build:tools:
+#+AUTHOR:      Ralph Amissah
+#+EMAIL:       [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]]
+#+COPYRIGHT:   Copyright (C) 2015 - 2023 Ralph Amissah
+#+LANGUAGE:    en
+#+STARTUP:     content hideblocks hidestars noindent entitiespretty
+#+PROPERTY:    header-args  :exports code
+#+PROPERTY:    header-args+ :noweb yes
+#+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
+
+* nix :nix:
+
+#+NAME: nixpkgs_local
+#+BEGIN_SRC sh
+/srv/nix/nixpkgs
+#+END_SRC
+
+- default.nix
+- shell.nix
+
+** envrc :envrc:
+*** .envrc
+
+- https://github.com/nix-community/nix-direnv
+  - source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/${NixDirEnvVersion}/direnvrc" "sha256-0000000000000000000000000000000000000000000="
+
+#+HEADER: :tangle ../.envrc
+#+BEGIN_SRC sh
+if [ -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
+fi
+#+END_SRC
+
+*** .envrc-nix
+
+#+HEADER: :tangle ../.envrc-nix
+#+BEGIN_SRC sh
+NIX_ENFORCE_PURITY=1
+# - https://github.com/nix-community/nix-direnv
+#NixDirEnvSHA="sha256-0000000000000000000000000000000000000000000="
+#direnv fetchurl https://raw.githubusercontent.com/nix-community/nix-direnv/${NixDirEnvVersion}/direnvrc
+NixDirEnvVersion="2.4.0"
+NixDirEnvSHA="sha256-XQzUAvL6pysIJnRJyR7uVpmUSZfc7LSgWQwq/4mBr1U="
+if ! has nix_direnv_version || ! nix_direnv_version ${NixDirEnvVersion}; then
+  source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/${NixDirEnvVersion}/direnvrc" "${NixDirEnvSHA}"
+fi
+watch_file flake.lock
+watch_file flake.nix
+watch_file shell.nix
+watch_file makefile
+watch_file .envrc
+watch_file .envrc-local
+watch_file .envrc-nix
+nix_direnv_watch_file flake.nix
+nix_direnv_watch_file shell.nix
+nix_direnv_watch_file .envrc
+nix_direnv_watch_file .envrc-local
+nix_direnv_watch_file .envrc-nix
+#nix flake update
+#nix flake check
+echo ""
+PATH_add result/bin
+nix flake show
+#use flake .
+#+END_SRC
+
+*** .envrc-local CHECK MODIFY
+
+- bespoke modify appropriately and generate if needed
+
+#+HEADER: :tangle ../.envrc-local_
+#+HEADER: :noweb yes
+#+BEGIN_SRC sh
+export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos
+#export NIX_PATH=nixpkgs=/nixpkgs-ra/nixpkgs
+## reload when these files change
+use flake
+watch_file flake.nix
+#eval "$(nix print-dev-env)"
+export sisuVER=$(git describe --long --tags | sed 's/^[ a-z_-]\+\([0-9.]\+\)/\1/;s/\([^-]*-g\)/r\1/;s/-/./g')
+#export sisuBIN=bin
+export sisuSRC=~/grotto/repo/git.repo/projects/project-sisu/sisu
+export sisuDOC=~/grotto/repo/git.repo/projects/project-sisu/susu-markup/sisu-markup-samples/data/samples/current
+export sisuOUT=/var/www
+export sisuOUTver=/tmp/sisu/$sisuVER/www
+export RUBYLIB+=`pwd`/lib
+#+END_SRC
+
+#+BEGIN_SRC sh
+ export Date=`date "+%Y%m%d"`
+ export sisuver=$(git describe --long --tags | sed 's/^[ a-z_-]\+\([0-9.]\+\)/\1/;s/\([^-]*-g\)/r\1/;s/-/./g')
+ ### set local values in .envrc-local (or modify here if you must)
+ # export sisuPROJ=~/grotto/repo/git.repo/projects/doc-reform/code/software/sisu
+ # export sisuDOC=~/grotto/repo/git.repo/projects/project-sisu/doc-reform-markup/sisu-markup-samples
+ # export sisuSRC=~/grotto/repo/git.repo/projects/project-sisu/sisu
+ # export sisuDOC=~/grotto/repo/git.repo/projects/project-sisu/susu-markup/sisu-markup-samples/data/samples/current
+ # export sisuOUT=/srv/www/sisu
+ # export sisuOUTver=/srv/www/sisu/$sisuVER/www
+ # export sisu=/srv/www/sisu
+ # export sisu=/var/www/sqlite
+ # export sisu=/srv/www/sisu/sqlite
+ export sisu=$sisuPROJ/src
+ export sisu=$sisuPROJ/result/lib
+ export sisu=$sisuDOC/markup/pod
+ export sisu=$sisuOUT/$sisuVER
+ export sisu='http://localhost/sisu_search'
+ # export sisuSearchActionRemote='https://sisudoc.org/sisu_search'
+ export sisuCGIform='sisu_search'
+ export sisuSQLdb='sisusearch.db'
+ export PROG_VER_GIT="`git describe --long --tags | sed -e 's/^[ a-z_-]\+\([0-9.]\+\)/\1/;s/\([^-]*-g\)/r\1/;s/-/./g'`"
+ #export PROG_VER_DECLARED="`cat ./views/version.txt | grep --color=never "enum" | sed 's/.\+(\([0-9]\+\),[ \t]\+\([0-9]\+\),[ \t]\+\([0-9]\+\)[ \t]*).\+/\1.\2.\3/g'`"
+ export sisuNixHelp="cat ./.env/nix-commands"
+ export sisuTest="nix shell .#default --print-build-logs --command sisu --very-verbose --epub --html --html-link-search --html-link-curate --curate --output=\"\$sisuOUT\" $sisuPOD/*"
+ export sisuHtml="sisu --very-verbose --html --html-link-search --html-link-curate --curate --sqlite-update --sqlite-db-filename=\"sisu.search.db\" --cgi-sqlite-search-filename=\"sisu_search\" --sqlite-db-path=\"\$sisuDBpath\" --output=\"\$sisuOUT\" $sisuPOD/*"
+ export sisuEpub="sisu --very-verbose --epub --output=\"\$sisuOUT\" $sisuPOD/*"
+ export sisuLatex="sisu --very-verbose --latex --output=\"\$sisuOUT\" $sisuPOD/*"
+ export sisuPdf="sisu --very-verbose --pdf --output=\"\$sisuOUT\" $sisuPOD/*"
+ export sisuSqliteCreateDB="sisu --very-verbose --sqlite-db-recreate --sqlite-db-path=\"$sisuDBpath\" --sqlite-db-filename=\"sisu.search.db\""
+ export sisuSqlite="sisu --very-verbose --sqlite-discrete --sqlite-db-path=\"$sisuDBpath\" --sqlite-db-filename=\"sisu.search.db\" --output=\"\$sisuOUT\" $sisuPOD/*"
+ #export sisuSqlite="sisu --very-verbose --sqlite-update --sqlite-db-path=\"$sisuDBpath\" --sqlite-db-filename=\"sisu.search.db\" --output=\"\$sisuOUT\" $sisuPOD/*"
+#+END_SRC
+
+** flake :flake:
+*** flake
+**** flake.nix
+
+#+HEADER: :tangle ../flake.nix
+#+HEADER: :noweb yes
+#+BEGIN_SRC nix
+{
+  description = "sisu parser & document generator";
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; # "github:nixos/nixpkgs"; "github:NixOS/nixpkgs/nixpkgs-unstable"; "nixpkgs/nixos-unstable"; "nixpkgs/nixos-21.11";
+  inputs.flake-utils.url = "github:numtide/flake-utils";
+  outputs = {
+    self,
+    nixpkgs,
+    flake-utils,
+  } @ inputs: let
+    pname = "sisu";
+    version = "<<sisu_version_set>>";
+    shell = ./shell.nix; # ./default.nix;
+    devEnv = ./shell.nix; # ./.envrc; # ./shell.nix; # ./default.nix;
+    supportedSystems = ["x86_64-linux"]; # [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
+    forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
+    nixpkgsFor = forAllSystems (system: import nixpkgs {inherit system;}); # nixpkgs instantiated for supported system types
+    checkPhase = ''
+      runHook preCheck
+      runHook postCheck
+    '';
+    preInstall = "";
+    installPhase = ''
+      runHook preInstall
+      mkdir -p $out/lib
+      mkdir -p $out/setup
+      mkdir -p $out/data
+      mkdir -p $out/bin
+      cp -R ./lib/* $out/lib/.
+      cp -R ./data/* $out/data/.
+      cp -R ./setup/* $out/setup/.
+      ln -s $out/setup/sisu_version.rb $out/version
+      install -m755 ./bin/sisu $out/bin/sisu
+      runHook postInstall
+    '';
+    postInstall = "";
+  in {
+    packages = forAllSystems (system: let
+      pkgs = nixpkgsFor.${system};
+    in
+      with pkgs; {
+        default = stdenv.mkDerivation {
+          inherit pname;
+          inherit version;
+          meta.mainProgram = "sisu";
+          executable = true;
+          src = self;
+          inherit shell;
+          inherit devEnv;
+          buildPhase = "";
+          inherit checkPhase;
+          inherit installPhase;
+          inherit postInstall;
+        };
+        #vendorSha256 = "sha256-0Q00000000000000000000000000000000000000000=";
+      });
+    apps = forAllSystems (system: {
+      default = {
+        type = "app";
+        program = "${self.packages.${system}.default}/bin/sisu";
+      };
+    });
+    devShells = forAllSystems (system: let
+      pkgs = nixpkgsFor.${system};
+      shellHook = ''
+        #${pkgs.nix}/bin/nix build ".#" --print-build-logs;
+        nix build ".#" --print-build-logs;
+        echo ""
+        sisu -v
+      '';
+    in
+      with pkgs; {
+        default = mkShell {
+          name = "sisu dev base shell";
+          inherit shell;
+          inherit devEnv;
+          packages = [
+            <<ruby_current>>
+            sqlite
+            jq
+            git
+          ];
+          inherit shellHook;
+        };
+        dsh-epub = mkShell {
+          name = "sisu dev shell for epub output";
+          inherit shell;
+          inherit devEnv;
+          packages = [
+            <<ruby_current>>
+            sqlite
+            graphicsmagick
+            zip
+            unzip
+            xz
+            libxml2
+            html-tidy
+            xmlstarlet
+            epubcheck
+            ebook_tools
+            libxml2
+            html-tidy
+            xmlstarlet
+            epubcheck
+            ebook_tools
+            epr
+            sigil
+            calibre #(suite includes: ebook-viewer)
+            foliate
+            jq
+            #git
+          ];
+          inherit shellHook;
+        };
+        dsh-html = mkShell {
+          name = "sisu dev shell for html output";
+          inherit shell;
+          inherit devEnv;
+          packages = [
+            <<ruby_current>>
+            sqlite
+            graphicsmagick
+            zip
+            unzip
+            xz
+            jq
+            #git
+          ];
+          inherit shellHook;
+        };
+        dsh-latex-pdf = mkShell {
+          name = "sisu dev shell for latex & pdf output";
+          inherit shell;
+          inherit devEnv;
+          packages = [
+            <<ruby_current>>
+            sqlite
+            graphicsmagick
+            zip
+            unzip
+            xz
+            source-sans-pro
+            source-serif-pro
+            source-code-pro
+            texlive.combined.scheme-full
+            noto-fonts
+            noto-fonts-cjk-sans
+            takao
+            jq
+            #git
+          ];
+          inherit shellHook;
+        };
+        dsh-sqlite = mkShell {
+          name = "sisu dev shell for sqlite3 output";
+          inherit shell;
+          inherit devEnv;
+          packages = [
+            <<ruby_current>>
+            sqlite
+            graphicsmagick
+            zip
+            unzip
+            xz
+            jq
+            #git
+          ];
+          inherit shellHook;
+        };
+        dsh-i18n = mkShell {
+          name = "sisu dev shell internationalization, po4a";
+          inherit shell;
+          inherit devEnv;
+          packages = [
+            <<ruby_current>>
+            sqlite
+            graphicsmagick
+            perl538Packages.Po4a
+            jq
+            #git
+          ];
+          inherit shellHook;
+        };
+        #default = import ./shell.nix {inherit pkgs;};
+      });
+  };
+}
+#+END_SRC
+
+** shell.nix TODO
+
+#+HEADER: :tangle ../shell.nix
+#+HEADER: :shebang "#!/usr/bin/env -S nix-shell --impure\n#!nix-shell -i bash"
+#+HEADER: :tangle-mode (identity #o755)
+#+BEGIN_SRC nix
+{pkgs ? import <nixpkgs> {}}:
+with pkgs;
+  mkShell {
+    buildInputs = [
+      <<ruby_current>>
+      <<packages_project_relevant>>
+      <<packages_build>>
+      <<packages_extra>>
+    ];
+    shellHook = ''
+    '';
+  }
+#+END_SRC
+{ pkgs ? import <nixpkgs> {} }:
+with pkgs;
+mkShell {
+  buildInputs = [
+    <<ruby_current>>
+    sqlite
+    graphicsmagick
+    unzip
+    xz
+    zip
+    openssl
+    #texlive-combined-full
+    nixFlakes
+    validatePkgConfig
+    nix-output-monitor
+    nix-tree
+    jq
+    git
+    #starship
+  ];
+  shellHook = ''
+  '';
+}
+#+END_SRC
+
+** packages.nix
+*** default
+
+#+HEADER: :NO-tangle ../packages.nix
+#+BEGIN_SRC nix
+{ pkgs ? import <nixpkgs> {} }:
+with pkgs; [
+  <<ruby_current>>
+  <<packages_project_relevant>>
+  <<packages_build>>
+]
+#+END_SRC
+
+*** ruby 3.2
+
+#+HEADER: :tangle-NO ../nix/pkglst/packages_ruby_3_2.nix
+#+BEGIN_SRC nix
+{ pkgs ? import <nixpkgs> {} }:
+with pkgs; [
+  <<ruby_version_3_2>>
+  <<packages_project_relevant>>
+  <<packages_build>>
+]
+#+END_SRC
+
+*** ruby 3.1
+
+#+HEADER: :tangle-NO ../nix/pkglst/packages_ruby_3_1.nix
+#+BEGIN_SRC nix
+{ pkgs ? import <nixpkgs> {} }:
+with pkgs; [
+  <<ruby_version_3_1>>
+  <<packages_project_relevant>>
+  <<packages_build>>
+]
+#+END_SRC
+
+*** ruby 3.0
+
+#+HEADER: :tangle-NO ../nix/pkglst/packages_ruby_3_0.nix
+#+BEGIN_SRC nix
+{ pkgs ? import <nixpkgs> {} }:
+with pkgs; [
+  <<ruby_version_3_0>>
+  <<packages_project_relevant>>
+  <<packages_build>>
+]
+#+END_SRC
+
+*** ruby legacy
+
+#+NAME: ruby_legacy
+#+BEGIN_SRC nix
+<<ruby_version_3_1>>
+#+END_SRC
+
+*** ruby current
+
+#+NAME: ruby_current
+#+BEGIN_SRC nix
+<<ruby_version_3_3>>
+#+END_SRC
+
+*** ruby next
+
+#+NAME: ruby_next
+#+BEGIN_SRC nix
+<<ruby_version_3_3>>
+#+END_SRC
+
+*** ruby 3.3 - ruby_version_3_3
+
+#+NAME: ruby_version_3_3
+#+BEGIN_SRC nix
+ruby_3_3
+rubyPackages_3_3.rake
+rubyPackages_3_3.sqlite3
+rubyPackages_3_3.thor
+#+END_SRC
+
+*** ruby 3.2 - ruby_version_3_2
+
+#+NAME: ruby_version_3_2
+#+BEGIN_SRC nix
+ruby_3_2
+rubyPackages_3_2.rake
+rubyPackages_3_2.sqlite3
+rubyPackages_3_2.thor
+#+END_SRC
+
+*** ruby 3.1 - ruby_version_3_1
+
+#+NAME: ruby_version_3_1
+#+BEGIN_SRC nix
+ruby_3_1
+rubyPackages_3_1.rake
+rubyPackages_3_1.sqlite3
+rubyPackages_3_1.thor
+#+END_SRC
+
+*** ruby 3.0 - ruby_version_3_0
+
+#+NAME: ruby_version_3_0
+#+BEGIN_SRC nix
+ruby_3_0
+rubyPackages_3_0.rake
+rubyPackages_3_0.sqlite3
+rubyPackages_3_0.thor
+#+END_SRC
+
+*** nix related packages
+
+#+NAME: nix_packages
+#+BEGIN_SRC nix
+nix
+bundler
+bundix
+#+END_SRC
+
+*** project relevant packages
+
+#+NAME: packages_project_relevant
+#+BEGIN_SRC nix
+sqlite
+graphicsmagick
+unzip
+xz
+zip
+openssl
+#texlive-combined-full
+#+END_SRC
+
+*** project misc build packages
+
+#+NAME: packages_build
+#+BEGIN_SRC nix
+nixFlakes
+validatePkgConfig
+nix-output-monitor
+nix-tree
+jq
+git
+#+END_SRC
+
+#+NAME: packages_extra
+#+BEGIN_SRC nix
+#starship
+#+END_SRC
+
+** variables
+** spine version SET VERSION :version:set:project:
+
+#+NAME: sisu_version_set
+#+BEGIN_SRC sh
+0.7.3
+#+END_SRC
diff --git a/org/css.org b/org/css.org
index 370858c0..c43ae94a 100644
--- a/org/css.org
+++ b/org/css.org
@@ -3505,6 +3505,6 @@ encoding: utf-8
 
   - Git
     <https://git.sisudoc.org/projects/>
-    <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
-    <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
+    <https://git.sisudoc.org/projects/sisu>
+    <https://git.sisudoc.org/projects/sisu-markup>
 #+END_SRC
diff --git a/org/db.org b/org/db.org
index 469416b3..e9dc3809 100644
--- a/org/db.org
+++ b/org/db.org
@@ -4817,6 +4817,6 @@ encoding: utf-8
 
   - Git
     <https://git.sisudoc.org/projects/>
-    <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
-    <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
+    <https://git.sisudoc.org/projects/sisu>
+    <https://git.sisudoc.org/projects/sisu-markup>
 #+END_SRC
diff --git a/org/digests.org b/org/digests.org
index 20831af8..b3378b27 100644
--- a/org/digests.org
+++ b/org/digests.org
@@ -327,6 +327,6 @@ encoding: utf-8
 
   - Git
     <https://git.sisudoc.org/projects/>
-    <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
-    <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
+    <https://git.sisudoc.org/projects/sisu>
+    <https://git.sisudoc.org/projects/sisu-markup>
 #+END_SRC
diff --git a/org/env.org b/org/env.org
index 28df5017..bd6ed25c 100644
--- a/org/env.org
+++ b/org/env.org
@@ -257,7 +257,6 @@ module SiSU_Clear
           and @md.sfx_src =~/ss[ftsumc]/
             @env_out_root=@env.path.output
             @env_out="#{@env.path.output}/#{@fnb}"
-            @@publisher='SiSU http://www.jus.uio.no/sisu'
             @env_pdf="#{@env_out_root}/pdf"
           end
         end
@@ -7731,6 +7730,7 @@ module SiSU_Sys_Call
         when /pdflatex/
           "#{texpdf} -interaction=#{mode} #{@input} #{tell}\n"
         end
+        #puts texpdf_cmd
         system(texpdf_cmd)
       else STDERR.puts "\t*WARN* none of the following programs are installed: #{@texpdf}"
       end
@@ -8568,7 +8568,7 @@ module SiSU_Info_About
        sisu --txt --html --epub --odt --pdf --sqlite --manpage --texinfo --concordance --qrcode --verbose sisu.ssm
        cd -
      See output produced, or see man pages: man sisu
-     <http://www.sisudoc.org/> <http://www.jus.uio.no/sisu/>
+     <https://sisudoc.org> <https://git.sisudoc.org/sisu>
         WOK
     end
   end
@@ -8630,6 +8630,6 @@ encoding: utf-8
 
   - Git
     <https://git.sisudoc.org/projects/>
-    <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
-    <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
+    <https://git.sisudoc.org/projects/sisu>
+    <https://git.sisudoc.org/projects/sisu-markup>
 #+END_SRC
diff --git a/org/harvest.org b/org/harvest.org
index 4d37bd31..f1db6d16 100644
--- a/org/harvest.org
+++ b/org/harvest.org
@@ -717,7 +717,7 @@ module SiSU_HarvestTopics
 <meta name="dc.title" content= "SiSU metadata harvest, Topics - SiSU 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="#{sv.project} #{sv.version} of #{sv.date_stamp} (n*x and Ruby!)" />
-<link rel="generator" href="http://www.jus.uio.no/sisu/SiSU" />
+<link rel="generator" href="https://git.sisudoc.org/sisu" />
 <link href="#{css_path}" rel="stylesheet">
 <link rel="shortcut icon" href="../_sisu/image/rb7.ico" />
 </head>
@@ -1195,7 +1195,7 @@ module SiSU_HarvestAuthors
 <meta name="dc.title" content= "SiSU metadata harvest, Authors - SiSU 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="#{sv.project} #{sv.version} of #{sv.date_stamp} (n*x and Ruby!)" />
-<link rel="generator" href="http://www.jus.uio.no/sisu/SiSU" />
+<link rel="generator" href="https://git.sisudoc.org/sisu" />
 <link href="#{css_path}" rel="stylesheet" >
 <link rel="shortcut icon" href="../_sisu/image/rb7.ico" />
 </head>
@@ -1454,6 +1454,6 @@ encoding: utf-8
 
   - Git
     <https://git.sisudoc.org/projects/>
-    <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
-    <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
+    <https://git.sisudoc.org/projects/sisu>
+    <https://git.sisudoc.org/projects/sisu-markup>
 #+END_SRC
diff --git a/org/html.org b/org/html.org
index 15f3a87a..22117ba4 100644
--- a/org/html.org
+++ b/org/html.org
@@ -1073,14 +1073,12 @@ WOK
 [<a href="http://sisudoc.org/sisu_manual/en/html/sisu/toc.html">Manual</a>]
 </p>
 <p>
-[<a href="http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary">Source</a>]
-[<a href="http://lists.sisudoc.org/listinfo/sisu">List Info (sisu@lists.sisudoc.org)</a>]
+[<a href="http://git.sisudoc.org/projects/sisu">Source</a>]
 </p>
 
 <h1>SiSU Markup Samples</h1>
 <p>
-[<a href="http://git.sisudoc.org/gitweb/?p=doc/sisu-markup-samples.git;a=summary">Source</a>]
-[<a href="http://sisudoc.org/sisu_markup_samples.html">Output</a>]
+[<a href="http://git.sisudoc.org/projects/sisu-markup-samples">Source</a>]
 </p>
 
 <hr />
@@ -1092,8 +1090,8 @@ WOK
     &lt;www.sisudoc.org&gt;
   </a>
   &nbsp;&nbsp;or&nbsp;&nbsp;
-  <a href="http://www.jus.uio.no/sisu/" target="_top">
-    &lt;www.jus.uio.no/sisu/&gt;
+  <a href="https://git.sisudoc.org" target="_top">
+    &lt;git.sisudoc.org/&gt;
   </a>
 software for electronic texts, document collections, books, digital libraries &amp; search, with "atomic search" &amp; text locating system (shared object citation numbering: "<i>ocn</i>").
 Outputs include: plaintext, HTML, EPUB, ODT (OpenDocumentText), (XHTML, XML,) LaTeX, PDF, SQL (PostgreSQL and SQLite).
@@ -4101,7 +4099,7 @@ module SiSU_Concordance
         @data=SiSU_HTML::Source::HTML_Environment.new(particulars).tuned_file_instructions
         @file=SiSU_Env::FileOp.new(@md)
         @fnb=@md.fnb
-        @lex_button=%{<a href="http://www.jus.uio.no/sisu/" target="_top"><img border="0" height="44" width="144" valign="center" src="#{@file.path_rel_links.html_seg_2}_sisu/image/sisu.png" alt="SiSU home --&gt;"></a>}
+        @lex_button=%{<a href="https://git.sisudoc.org/" target="_top"><img border="0" height="44" width="144" valign="center" src="#{@file.path_rel_links.html_seg_2}_sisu/image/sisu.png" alt="SiSU home --&gt;"></a>}
         @doc_details =<<WOK
 <table summary="links to text related to this rudimentary index" width="96%" border="0" cellpadding="0" align="center"><tr><td width="2%" align="right">&nbsp;</td><td width="94%" valign="top" align="justify"><h1 class="small"><a href="#{@md.file.base_filename.html_segtoc}"><b>#{@md.title.full}</b></a></h1><p class="bold">#{@md.author}</p></td></tr></table>
 WOK
@@ -4134,7 +4132,7 @@ WOK
   <meta name="Description" content="&nbsp;SiSU created">
   <meta name="keywords" content="word index for #{@md.title.full}">
   <meta name="generator" content="SiSU (Linux &amp; Ruby!)">
-  <link rel="generator" href="http://www.jus.uio.no/sisu" />
+  <link rel="generator" href="https://git.sisudoc.org/" />
   <link rel="shortcut icon" href="../_sisu/image/rb7.ico" />
   #{stylesheet.css_head_seg}
 </head>
@@ -5216,7 +5214,7 @@ SiSU manifest: #{@md.title.full}
 </title>
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="sourcefile" content="#{@md.fns}" />
-<link rel="generator" href="http://www.jus.uio.no/sisu" />
+<link rel="generator" href="https://git.sisudoc.org/" />
 <link rel="shortcut icon" href="#{@f.path_rel_links.html_scroll_css}_sisu/image_sys/rb7.ico" />
 #{@stylesheet.css_head}
 </head>
@@ -5981,6 +5979,6 @@ encoding: utf-8
 
   - Git
     <https://git.sisudoc.org/projects/>
-    <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
-    <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
+    <https://git.sisudoc.org/projects/sisu>
+    <https://git.sisudoc.org/projects/sisu-markup>
 #+END_SRC
diff --git a/org/hub.org b/org/hub.org
index 705bbf21..e0017540 100644
--- a/org/hub.org
+++ b/org/hub.org
@@ -3163,6 +3163,6 @@ encoding: utf-8
 
   - Git
     <https://git.sisudoc.org/projects/>
-    <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
-    <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
+    <https://git.sisudoc.org/projects/sisu>
+    <https://git.sisudoc.org/projects/sisu-markup>
 #+END_SRC
diff --git a/org/i18n.org b/org/i18n.org
index a4c43266..6ba38e63 100644
--- a/org/i18n.org
+++ b/org/i18n.org
@@ -2001,8 +2001,8 @@ encoding: utf-8
 
   - Git
     <https://git.sisudoc.org/projects/>
-    <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
-    <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
+    <https://git.sisudoc.org/projects/sisu>
+    <https://git.sisudoc.org/projects/sisu-markup>
 #+END_SRC
 
 * NOTES
diff --git a/org/json.org b/org/json.org
index 3ea186d4..ca712ac4 100644
--- a/org/json.org
+++ b/org/json.org
@@ -1014,7 +1014,7 @@ module SiSU_XML_Tags #Format
      * #{rubyv}
      * #{sc}
      * #{lastdone}
-     * SiSU http://www.jus.uio.no/sisu
+     * SiSU https://git.sisudoc.org/
 -->
 WOK
      else
@@ -1025,7 +1025,7 @@ WOK
      * #{rubyv}
      * #{sc}
      * #{lastdone}
-     * SiSU http://www.jus.uio.no/sisu
+     * SiSU https://git.sisudoc.org/
 -->
 WOK
       end
@@ -1621,6 +1621,6 @@ encoding: utf-8
 
   - Git
     <https://git.sisudoc.org/projects/>
-    <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
-    <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
+    <https://git.sisudoc.org/projects/sisu>
+    <https://git.sisudoc.org/projects/sisu-markup>
 #+END_SRC
diff --git a/org/manpage.org b/org/manpage.org
index 2b9f1142..2f4b78bb 100644
--- a/org/manpage.org
+++ b/org/manpage.org
@@ -144,7 +144,7 @@ GSUB
        sisu_vim(7)
 .TP
 .SH HOMEPAGE
-       More information about SiSU can be found at <http://www.sisudoc.org/> or <http://www.jus.uio.no/sisu/>
+       More information about SiSU can be found at <https://sisudoc.org/> or <https://git.sisudoc.org/>
 .TP
 .SH SOURCE
        <http://git.sisudoc.org/>
@@ -434,6 +434,6 @@ encoding: utf-8
 
   - Git
     <https://git.sisudoc.org/projects/>
-    <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
-    <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
+    <https://git.sisudoc.org/projects/sisu>
+    <https://git.sisudoc.org/projects/sisu-markup>
 #+END_SRC
diff --git a/org/misc.org b/org/misc.org
index abb23cc1..054cf5ad 100644
--- a/org/misc.org
+++ b/org/misc.org
@@ -1160,7 +1160,6 @@ module SiSU_Relaxng
    available at these locations:
    <http://www.fsf.org/licenses/gpl.html>
    [http://www.gnu.org/licenses/gpl.html]
-   <http://www.jus.uio.no/sisu/gpl.fsf>
 
  * SiSU uses:
    * Standard SiSU markup syntax,
@@ -1168,8 +1167,8 @@ module SiSU_Relaxng
    * Standard SiSU object citation numbering and system
 
  * Homepages:
-   [http://www.jus.uio.no/sisu]
-   [http://www.sisudoc.org]
+   [https://www.sisudoc.org]
+   [https://git.sisudoc.org]
 
  * Ralph Amissah
    [ralph@amissah.com]
@@ -2687,7 +2686,7 @@ __END__
      * Ruby version: ruby 1.8.5 (2006-08-25) [i486-linux]
      *
      * Last Generated on: Sat Nov 18 15:28:08 +0000 2006
-     * SiSU http://www.jus.uio.no/sisu
+     * SiSU https://git.sisudoc.org
 -->
 #+END_SRC
 
@@ -4118,6 +4117,6 @@ encoding: utf-8
 
   - Git
     <https://git.sisudoc.org/projects/>
-    <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
-    <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
+    <https://git.sisudoc.org/projects/sisu>
+    <https://git.sisudoc.org/projects/sisu-markup>
 #+END_SRC
diff --git a/org/object_munge.org b/org/object_munge.org
index b950545c..9bb04e98 100644
--- a/org/object_munge.org
+++ b/org/object_munge.org
@@ -328,6 +328,6 @@ encoding: utf-8
 
   - Git
     <https://git.sisudoc.org/projects/>
-    <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
-    <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
+    <https://git.sisudoc.org/projects/sisu>
+    <https://git.sisudoc.org/projects/sisu-markup>
 #+END_SRC
diff --git a/org/param.org b/org/param.org
index 27a9520e..ed989165 100644
--- a/org/param.org
+++ b/org/param.org
@@ -977,7 +977,6 @@ module SiSU_Param
             @dir_out="#{@env.path.output}/#{@fnb}"
             @dir_tex=@env.processing_path.tex
             @dir_lout=@env.processing_path.lout
-            @@publisher='SiSU http://www.jus.uio.no/sisu'
           end
           @txt_path=@txt_path ||= @env.path.output
           @stmp=%{#{@fns}}[/^(.+?)\..*/m,1]
@@ -2362,6 +2361,6 @@ encoding: utf-8
 
   - Git
     <https://git.sisudoc.org/projects/>
-    <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
-    <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
+    <https://git.sisudoc.org/projects/sisu>
+    <https://git.sisudoc.org/projects/sisu-markup>
 #+END_SRC
diff --git a/org/shared.org b/org/shared.org
index b6e98f08..cc13ea34 100644
--- a/org/shared.org
+++ b/org/shared.org
@@ -1335,7 +1335,7 @@ WOK
 #{Ax[:tab]*2}#{inf_xml}
 #{Ax[:tab]}</#{@attrib}>
 #{Ax[:tab]}</metadata>
-	<br />
+  <br />
 WOK
       end
       def metadata
@@ -1999,7 +1999,6 @@ Dx={
 }
 Tex={
   backslash:                 "\\\\",
-  backslash:                 "\\\\",
   tilde:                     '\\\\\\~',
 }
 Px={
@@ -2299,6 +2298,6 @@ encoding: utf-8
 
   - Git
     <https://git.sisudoc.org/projects/>
-    <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
-    <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
+    <https://git.sisudoc.org/projects/sisu>
+    <https://git.sisudoc.org/projects/sisu-markup>
 #+END_SRC
diff --git a/org/sisu-bin.org b/org/sisu-bin.org
index 1ee0d567..4b1163a6 100644
--- a/org/sisu-bin.org
+++ b/org/sisu-bin.org
@@ -26,7 +26,7 @@
 <<sisu_project_version_current_set>>
 #+END_SRC
 
-#+NAME: sisu_version_current_set
+#+NAME: sisu_project_version_current_set
 #+BEGIN_SRC yaml
 ---
 :project: SiSU
@@ -762,6 +762,6 @@ encoding: utf-8
 
   - Git
     <https://git.sisudoc.org/projects/>
-    <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
-    <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
+    <https://git.sisudoc.org/projects/sisu>
+    <https://git.sisudoc.org/projects/sisu-markup>
 #+END_SRC
diff --git a/org/sisu.org b/org/sisu.org
index 18fb96b1..df68f826 100644
--- a/org/sisu.org
+++ b/org/sisu.org
@@ -125,6 +125,6 @@ encoding: utf-8
 
   - Git
     <https://git.sisudoc.org/projects/>
-    <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
-    <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
+    <https://git.sisudoc.org/projects/sisu>
+    <https://git.sisudoc.org/projects/sisu-markup>
 #+END_SRC
diff --git a/org/src.org b/org/src.org
index c8d06d79..0fa9b607 100644
--- a/org/src.org
+++ b/org/src.org
@@ -3443,6 +3443,6 @@ encoding: utf-8
 
   - Git
     <https://git.sisudoc.org/projects/>
-    <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
-    <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
+    <https://git.sisudoc.org/projects/sisu>
+    <https://git.sisudoc.org/projects/sisu-markup>
 #+END_SRC
diff --git a/org/sst.org b/org/sst.org
index 93945585..76b72c7c 100644
--- a/org/sst.org
+++ b/org/sst.org
@@ -1714,6 +1714,6 @@ encoding: utf-8
 
   - Git
     <https://git.sisudoc.org/projects/>
-    <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
-    <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
+    <https://git.sisudoc.org/projects/sisu>
+    <https://git.sisudoc.org/projects/sisu-markup>
 #+END_SRC
diff --git a/org/texinfo.org b/org/texinfo.org
index 37756c51..fbb7f5fd 100644
--- a/org/texinfo.org
+++ b/org/texinfo.org
@@ -944,6 +944,6 @@ encoding: utf-8
 
   - Git
     <https://git.sisudoc.org/projects/>
-    <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
-    <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
+    <https://git.sisudoc.org/projects/sisu>
+    <https://git.sisudoc.org/projects/sisu-markup>
 #+END_SRC
diff --git a/org/texpdf.org b/org/texpdf.org
index dd1d2486..58f9130a 100644
--- a/org/texpdf.org
+++ b/org/texpdf.org
@@ -40,7 +40,7 @@ module SiSU_TeX
   @@tabular="{tabular}"
   @@column_instruct=@@squigle_close=@@tex_line_mode=@@tex_word_mode=@@line_mode=''
   @@tex_debug_counter=@@table_pagebreak_counter=@@tex_footnote_call_counter=@@tex_table_flag=@@tex_counter=@@tex_column=@@tex_columns=@@tex_columns=@@counting=0
-  @@tex_pattern_margin_number=/\\\\begin\\\{tiny\\\}\\\\hspace\\\{0mm\\\}\\\\end\\\{tiny\\\}\\\{\\\\marginpar.+?\s+/
+  @@tex_pattern_margin_number=/\\\\ocn\\\{[0-9]+\\\}/
   @@n=@@tableheader=@@rights=nil
   @@date ||=SiSU_Env::InfoDate.new
   class Source
@@ -711,65 +711,6 @@ module SiSU_TeX
         end
         dob
       end
-      def tex_box_listings
-        <<-WOK
-\\definecolor{listinggray}{gray}{0.9}
-\\definecolor{lbcolor}{rgb}{0.9,0.9,0.9}
-\\lstset{
-	backgroundcolor=\\color{lbcolor},
-	tabsize=4,
-	rulecolor=,
-	language=,
-  basicstyle=\\scriptsize,
-  upquote=true,
-  aboveskip={1.5\\baselineskip},
-  columns=fixed,
-  showstringspaces=false,
-  extendedchars=true,
-  breaklines=true,
-  prebreak = \\raisebox{0ex}[0ex][0ex]{\\ensuremath{\\hookleftarrow}},
-  frame=single,
-  showtabs=false,
-  showspaces=false,
-  showstringspaces=false,
-  identifierstyle=\\ttfamily,
-  keywordstyle=\\color[rgb]{0,0,1},
-  commentstyle=\\color[rgb]{0.133,0.545,0.133},
-  stringstyle=\\color[rgb]{0.627,0.126,0.941},
-}
-        WOK
-      end
-      def tex_box_boites
-        <<-WOK
-\\def\\codeblockboitebox{%
-  \\def\\bkvz@before@breakbox{\\ifhmode\\par\\fi\\vskip\\breakboxskip\\relax}%
-  \\def\\bkvz@set@linewidth{\\advance\\linewidth -2\\fboxrule
-    \\advance\\linewidth -2\\fboxsep} %
-  \\def\\bk@line{\\hbox to \\linewidth{%
-      \\ifbkcount\\smash{\\llap{\\the\\bk@lcnt\\ }}\\fi
-      \\psframebox*[framesep=0pt,linewidth=0pt]{%
-        \\vrule\\@width\\fboxrule \\hskip\\fboxsep
-        \\box\\bk@bxa
-        \\hskip\\fboxsep \\vrule\\@width\\fboxrule
-        }%
-      }}%
-  %\\def\\bkvz@top{\\hrule\\@height\\fboxrule}
-  \\def\\bkvz@top{\\hrule height .6pt}%
-  \\def\\bkvz@bottom{\\hrule\\@height\\fboxrule}%
-  \\breakbox}
-\\def\\endcodeblockboitebox{\\endbreakbox}
-        WOK
-      end
-      def tex_codeblock
-        codeblock_box=if @codeblock_box=='listings'
-          tex_box_listings
-        elsif @codeblock_box=='boites'
-          tex_box_boites
-        else
-          tex_box_boites
-        end
-        codeblock_box
-      end
       def markup(data)
         @tex_file=[]
         home=the_text.txt_home.gsub(/#{Mx[:br_line]}|#{Mx[:br_nl]}|#{Mx[:br_paragraph]}|\\\\/,' - ') #no line splitting in heading neither html nor latex
@@ -788,31 +729,6 @@ module SiSU_TeX
         end
         @tex_file << <<-WOK
 #{@tex_ml.header}#{@tex_ml.footer}
-\\tolerance=300
-\\clubpenalty=300
-\\widowpenalty=300
-\\makeatother
-\\makeatother
-\\chardef\\txtbullet="2022
-\\chardef\\tilde="7E
-%\\chardef\\asterisk="2A
-\\def\\asterisk{{\\rm \\char42} }
-\\definecolor{Light}{gray}{.92}
-\\newcommand{\\Codeblock}[1]{\\normaltext\\raggedright\\small\\ttfamily\\texbackslash#1}
-\\newcommand{\\monosp}[1]{\\normaltext\\ttfamily\\texbackslash#1}
-\\newcommand{\\parasep}{\\\\ \\begin{center}*\\hspace{2em}*\\hspace{2em}*\\end{center} \\\\}
-\\newcommand{\\hardspace}{{~}}
-%\\newcommand{\\hardspace}{\\hspace{.5em}}
-\\newcommand{\\caret}{{\\^{~}}}
-\\newcommand{\\pipe}{{\\textbar}}
-\\newcommand{\\curlyopen}{\{}
-\\newcommand{\\curlyclose}{\}}
-\\newcommand{\\lt}{{\UseTextSymbol{OML}{<}}}
-\\newcommand{\\gt}{{\UseTextSymbol{OML}{>}}}
-\\newcommand{\\slash}{{/}}
-\\newcommand{\\underscore}{\\_}
-\\newcommand{\\exclaim}{\\Verbatim{!}}
-#{tex_codeblock}
 % (tilde hash amp affected by http)
 % \\sloppy
 \\begin{document}
@@ -870,8 +786,12 @@ module SiSU_TeX
         x={}
         if (@make.build.toc?)
           toc=<<-WOK
+\\clearpage
+\\pagenumbering{roman}
+\\setcounter{page}{1}
 \\renewcommand{\\contentsname}{#{@translate.contents}}
 \\tableofcontents
+\\clearpage
           WOK
           toc_pb={ l: @tex_ml.newpage(:landscape), p: @tex_ml.newpage(:portrait) }
         else
@@ -884,6 +804,9 @@ module SiSU_TeX
 \\pagestyle{fancy}
 #{toc}#{toc_pb[:l]}
 \\pagenumbering{arabic}
+\\clearpage
+\\setcounter{page}{2}
+\\clearpage
 #{@tex_ml.paraskip_normal}
 #{@tex_ml.newpage(:landscape)}
           WOK
@@ -895,6 +818,9 @@ module SiSU_TeX
 #{toc}#{toc_pb[:p]}
 #{@tex_ml.newpage(:portrait)}
 \\pagenumbering{arabic}
+\\clearpage
+\\setcounter{page}{2}
+\\clearpage
 #{@tex_ml.paraskip_normal}
 #{@tex_ml.newpage(:portrait)}
           WOK
@@ -960,7 +886,7 @@ module SiSU_TeX
             #    tags=tags +"\\hspace{0mm}\\hypertarget{#{t}}{\\hspace{0mm}}"
             #  end
             #end
-            "\\begin{tiny}\\hspace{0mm}\\end{tiny}{\\marginpar{\\begin{tiny}\\hspace{0mm}\\hypertarget{#{dob.ocn}}{#{dob.ocn}}#{tags}\\end{tiny}}}" #ocn object citation numbering
+            "\\ocn{#{dob.ocn}}" #ocn object citation numbering
           else ''
           end
           dob.tmp = paranumber_display + dob.tmp
@@ -1348,7 +1274,7 @@ module SiSU_TeX_Pdf
     include SiSU_Parts_TeXpdf
     attr_accessor :string,:string1,:orientation,:url,:dir,:tex
     @@sys=SiSU_Env::SystemCall.new
-    @@tex_pattern_margin_number=/\\begin\{tiny\}\\hspace\{0mm\}\\end\{tiny\}\{\\marginpar.+?\}\}\}/
+    @@tex_pattern_margin_number=/\\ocn\{[0-9]+\}/
     @@tableheader={
       'a4' => { p: 0, l: 0 },
       'a5' => { p: 0, l: 0 },
@@ -1374,7 +1300,7 @@ module SiSU_TeX_Pdf
       show_ocn=(@make.build.ocn?) \
       ? dob.ocn
       : ''
-      "\\begin{tiny}\\hspace{0mm}\\end{tiny}{\\marginpar{\\begin{tiny}\\hspace{0mm}\\hypertarget{#{dob.ocn}}{#{show_ocn}}\\end{tiny}}}" #ocn object citation numbering
+      "\\ocn{#{dob.ocn}}" #ocn object citation numbering
     end
     def table_special_characters(r)
       r=r.gsub(/#{Mx[:tc_p]}/mu,'&').
@@ -1546,7 +1472,7 @@ module SiSU_TeX_Pdf
       dob.tmp=dob.tmp.gsub(/\\begin\{(bfseries|itshape)\}(.+?)\\end\{\1\}/m,'\2').
         gsub(/#{Mx[:url_o]}|#{Mx[:url_c]}/,'')
       cont_ln=dob.tmp.dup
-      cont_ln=cont_ln.gsub(/\\begin\{(monosp)\}(.+?)\\end\{\1\}/m,'\2').
+      cont_ln=cont_ln.gsub(/\\ocn\{[0-9]*\}/m,'').
         gsub(@@tex_pattern_margin_number,'').
         gsub(/#{Tex[:backslash]*2}/,"#{Tex[:backslash]*4}"). # added w42
         gsub(/\\footnote\[\d+\]\{%.+?\\end\{scriptsize\}\s*\}/m,''). #arbitrary bugfix, revisit should not be necessary, eg. wta.1994 2004w22
@@ -1620,9 +1546,9 @@ module SiSU_TeX_Pdf
         when /9/ then '8.0em'
         else      '-1.0em'
         end
-        "\\begin{Bullet}{#{indent}}$\\txtbullet$\\hspace{\\enspace}#{@dob.tmp}\\end{Bullet}"
+        "\\begin{Bullet}{#{indent}}#{@dob.tmp}\\end{Bullet}"
       else
-        "\\begin{Bullet}{-5mm}$\\txtbullet$\\hspace{\\enspace}#{@dob.tmp}\\end{Bullet}"
+        "\\begin{Bullet}{-5mm}#{@dob.tmp}\\end{Bullet}"
       end
       blt
     end
@@ -1991,52 +1917,72 @@ module SiSU_TeX_Pdf
       case @tex2pdf
       when /xe/
         if @md.opt.lng =~/(?:zh|ja|ko)/
-          <<-WOK
-\\usepackage{ucs, fontspec, xltxtra, xunicode, xeCJK}
-\\setmainCJKlanguage{#{tex_head_lang[:mainlang]}}
-\\setCJKmainfont{#{texpdf_fontface_cjk}}
-\\XeTeXlinebreaklocale "#{tex_head_lang[:mainlang]}"
-\\XeTeXlinebreakskip = 0pt plus 1pt
-\\setotherlanguage{#{tex_head_lang[:otherlang]}}
-\\setmainfont{#{texpdf_fontface}}
-\\setmonofont[Scale=0.85]{#{texpdf_fontface_mono}}
-          WOK
+          if @md.opt.lng =~/zh/
+            <<-WOK
+\\setCJKmainfont{Noto}
+\\setCJKmainfont{Noto Sans CJK TC}
+\\setCJKsansfont{Noto Sans CJK TC}
+\\setCJKmonofont{Noto Sans Mono CJK TC}
+\\setmainlanguage{#{tex_head_lang[:mainlang]}}
+\\setotherlanguage{english}
+% \\setmainfont{#{texpdf_fontface_cjk}}
+% \\setotherfont{#{texpdf_fontface}}
+\\setotherfont{Noto Sans}
+% \\setmonofont[Scale=0.85]{#{texpdf_fontface_mono}}
+            WOK
+          elsif @md.opt.lng =~/ja/
+            <<-WOK
+\\setCJKmainfont{TakaoMincho}
+\\setCJKsansfont{TakaoMincho Sans}
+\\setCJKmonofont{TakaoMincho Sans Mono CJK JP}
+%\\setCJKmainfont{Noto Serif CJK JP}
+%\\setCJKsansfont{Noto Sans CJK JP}
+%\\setCJKmonofont{Noto Sans Mono CJK JP}
+\\setmainlanguage{#{tex_head_lang[:mainlang]}}
+\\setotherlanguage{english}
+% \\setmainfont{#{texpdf_fontface_cjk}}
+% \\setotherfont{#{texpdf_fontface}}
+\\setotherfont{Noto Sans}
+% \\setmonofont[Scale=0.85]{#{texpdf_fontface_mono}}
+            WOK
+          elsif @md.opt.lng =~/ko/
+            <<-WOK
+\\setCJKmainfont{Noto}
+\\setCJKmainfont{Noto Sans CJK KR}
+\\setCJKsansfont{Noto Sans CJK KR}
+\\setCJKmonofont{Noto Sans Mono CJK KR}
+\\setmainlanguage{#{tex_head_lang[:mainlang]}}
+\\setotherlanguage{english}
+% \\setmainfont{#{texpdf_fontface_cjk}}
+% \\setotherfont{#{texpdf_fontface}}
+\\setotherfont{Noto Sans}
+% \\setmonofont[Scale=0.85]{#{texpdf_fontface_mono}}
+            WOK
+          else puts "lang error"
+          end
         elsif (tex_head_lang[:mainlang] == "english" \
         && (tex_head_lang[:otherlang] == "english" \
           || tex_head_lang[:otherlang] == "" \
           || tex_head_lang[:otherlang].length == 0))
           <<-WOK
-\\usepackage{polyglossia, ucs, fontspec, xltxtra, xunicode}
-\\setmainlanguage{#{tex_head_lang[:mainlang]}}
-\\setmainfont{#{texpdf_fontface}}
-\\setmonofont[Scale=0.85]{#{texpdf_fontface_mono}}
-% \\setsansfont{#{texpdf_fontface_sans}}
-% \\setromanfont{#{texpdf_fontface_serif}}
+% \\setmainlanguage{#{tex_head_lang[:mainlang]}}
+% \\setmainfont{#{texpdf_fontface}}
+% \\setmonofont[Scale=0.85]{#{texpdf_fontface_mono}}
           WOK
         else
           <<-WOK
-\\usepackage{polyglossia, ucs, fontspec, xltxtra, xunicode}
-\\setmainlanguage{#{tex_head_lang[:mainlang]}}
-\\setotherlanguage{english}
-\\setmainfont{#{texpdf_fontface}}
-\\setmonofont[Scale=0.85]{#{texpdf_fontface_mono}}
-% \\setsansfont{#{texpdf_fontface_sans}}
-% \\setromanfont{#{texpdf_fontface_serif}}
+% \\setmainlanguage{#{tex_head_lang[:mainlang]}}
+% \\setotherlanguage{english}
+% \\setmainfont{#{texpdf_fontface}}
+% \\setmonofont[Scale=0.85]{#{texpdf_fontface_mono}}
           WOK
         end
       when /pdf/
-        if @md.file_encoding =~ /iso-?8859/i                                   #% iso8859
-          <<-WOK
-% \\usepackage[latin1]{inputenc}
-\\usepackage{fontspec}
-          WOK
-        else                                                                   #% utf-8 assumed
         <<-WOK
-\\usepackage{babel}
+\\usepackage[#{tex_head_lang[:mainlang]},#{tex_head_lang[:otherlang]}]{babel}
 \\usepackage{ucs}
-\\usepackage[utf8x]{inputenc}
-          WOK
-        end
+\\usepackage[utf8x]{inputenc} %
+        WOK
       end
     end
     def tex_head_info
@@ -2049,36 +1995,336 @@ module SiSU_TeX_Pdf
 %% #{rubyv}
 %% LaTeX output
 %% #{lastdone}
-%% SiSU http://www.jus.uio.no/sisu
+%% SiSU https://git.sisudoc.org/
+      WOK
+    end
+    def tex_head_paper_characters
+       if @md.opt.lng =~/(?:zh|ja|ko)/
+         <<-WOK
+\\renewcommand*\\familydefault{\\sfdefault}
+\\usepackage[UTF8, fontset=TakaoMincho]{ctex}
+%\\usepackage[UTF8, fontset=Takao明朝]{ctex}
+%\\usepackage[UTF8, fontset=none]{ctex}
+\\usepackage{ctexhook}
+\\usepackage[T1]{fontenc}
+\\usepackage{newunicodechar}
+\\usepackage[utf8]{inputenc}
+         WOK
+       else
+         <<-WOK
+% \\usepackage[scaled]{dejavu}
+\\renewcommand*\\familydefault{\\sfdefault}
+%\\usepackage{inconsolata}
+\\usepackage[T1]{fontenc}
+\\usepackage{newunicodechar}
+\\usepackage[utf8]{inputenc}
+         WOK
+       end
+    end
+    def tex_head_paper_shared
+      <<-WOK
+\\usepackage{alltt}
+\\usepackage[
+  unicode=true,
+  pdfusetitle,
+  pdfsubject={},
+  pdfkeywords={},         % keywords list {} {} {},
+  pdftoolbar=true,
+  pdfmenubar=true,
+  pdfwindowui=true,
+  pdffitwindow=false,     % window fit to page when opened
+  pdfstartview={FitH},    % fits the width of the page to the window
+  pdfnewwindow=true,      % links in new window
+  pdfborder={0 0 1},
+  plainpages=false,       % was true
+  bookmarks=true,
+  bookmarksopen=false,
+  bookmarksnumbered=false,
+  backref=false,
+  breaklinks=false,
+  colorlinks=true,
+  urlcolor=black,
+  filecolor=black,
+  linkcolor=black,
+  citecolor=black,        % links_mono_or_color_set
+]{hyperref}
+\\PassOptionsToPackage{hyphens}{url}\\usepackage{hyperref}
+\\usepackage[usenames]{color}
+\\definecolor{myblack}{rgb}{0,0,0}
+\\definecolor{myred}{rgb}{0.75,0,0}
+\\definecolor{mygreen}{rgb}{0,0.5,0}
+\\definecolor{myblue}{rgb}{0,0,0.5}
+\\definecolor{mywhite}{rgb}{1,1,1}
+\\usepackage{textcomp}
+\\usepackage[parfill]{parskip}
+\\usepackage[normalem]{ulem}
+\\usepackage{soul}
+\\usepackage{longtable}
+\\usepackage{graphicx}
+\\usepackage[tc]{titlepic}
+\\usepackage{amssymb}
+\\usepackage{amsmath}
+\\usepackage[cm]{sfmath}
+\\usepackage{underscore}
+\\usepackage{listings}
+\\setcounter{secnumdepth}{2}
+\\setcounter{tocdepth}{4}
+\\usepackage{bookmark}
+\\usepackage{microtype}
+\\makeatletter
+\\usepackage[multiple,ragged]{footmisc}
+\\setlength\\footnotemargin{12pt}
+\\usepackage[para]{manyfoot}
+\\DeclareNewFootnote{A}
+\\makeatother
+\\chardef\\txtbullet="2022
+\\chardef\\tilde="7E
+\\def\\asterisk{{\\rm \\char42} }
+\\definecolor{Light}{gray}{.92}
+\\definecolor{listinggray}{gray}{0.9}
+\\definecolor{lbcolor}{rgb}{0.9,0.9,0.9}
+\\lstset{%
+  backgroundcolor=\\color{lbcolor},
+  tabsize=4,
+  rulecolor=,
+  language=,
+  basicstyle={\\ttfamily\\scriptsize},
+  upquote=true,
+  columns=fixed,
+  showstringspaces=false,
+  extendedchars=true,
+  breaklines=true,
+  prebreak = \\raisebox{0ex}[0ex][0ex]{\\ensuremath{\\hookleftarrow}},
+  frame=single,
+  showtabs=false,
+  showspaces=false,
+  showstringspaces=false,
+  identifierstyle=\\ttfamily,
+  keywordstyle=\\color[rgb]{0,0,1},
+  commentstyle=\\color[rgb]{0.133,0.545,0.133},
+  stringstyle=\\color[rgb]{0.627,0.126,0.941},
+}
+\\DeclareTOCStyleEntry[numwidth+=8pt]{part}{part}
+\\DeclareTOCStyleEntry[numwidth+=4pt]{section}{section}
+\\DeclareTOCStyleEntry[numwidth+=3pt]{section}{paragraph}
+\\DeclareTOCStyleEntry[numwidth+=3pt]{section}{subparagraph}
+\\DeclareTOCStyleEntry[numwidth+=3pt]{section}{subsection}
+\\DeclareTOCStyleEntries[indent+=4pt]{section}{section,subsection,subsubsection}
+\\DeclareTOCStyleEntries[numwidth+=3pt]{section}{paragraph,subparagraph}
+\\usepackage{ltxcmds}
+      WOK
+    end
+    def tex_head_paper_newenv_newcmd
+      <<-WOK
+\\newenvironment{ParagraphIndent}[1]{%
+  \\begin{list}{}{%
+    \\setlength\\topsep{0pt}%
+    \\addtolength{\\leftmargin}{#1}
+    \\setlength\\parsep{0pt plus 1pt}%
+  }
+  \\item[]
+} {\\end{list}}
+\\newenvironment{ParagraphHang}[2]{%
+  \\begin{list}{}{%
+    \\setlength\\topsep{0pt}%
+    \\addtolength{\\leftmargin}{#1}
+    \\itemindent=#2
+    \\setlength\\parsep{0pt plus 1pt}%
+  }
+  \\item[]
+} {\\end{list}}
+\\newenvironment{Bullet}[1]{%
+  \\begin{list}{}{%
+    \\setlength\\topsep{0pt}%
+    \\addtolength{\\leftmargin}{#1}
+    \\itemindent=-1em
+    \\setlength\\parsep{0pt plus 1pt}%
+  }
+  \\item[]
+  $\\txtbullet$\\hspace{\\enspace}
+} {\\end{list}}
+\\newcommand{\\monosp}[1]{\\normaltext\\ttfamily\\texbackslash#1}
+\\newcommand{\\br}{\\hfill\\break}
+\\newcommand{\\brl}[1]{%
+  \\ifx&#1&%
+    \\hfill\\break
+  \\else
+    \\vspace{#1ex}
+  \\fi
+}
+\\newcommand{\\brln}{\\hspace*{\\fill}\\linebreak}
+\\newcommand{\\objBlockOpen}{%
+  \\setlength{\\parskip}{0.5ex plus0.2ex minus0.1ex}\\raggedright
+  \\begin{footnotesize}
+}
+\\newcommand{\\objBlockClose}{%
+  \\end{footnotesize}
+  \\setlength{\\parskip}{1ex plus0.5ex minus0.2ex}
+}
+\\newcommand{\\objGroupOpen}{%
+  \\setlength{\\parskip}{0.5ex plus0.2ex minus0.1ex}
+  \\begin{footnotesize}
+}
+\\newcommand{\\objGroupClose}{%
+  \\end{footnotesize}
+}
+\\newcommand{\\objPoemVerseOpen}{%
+  \\setlength{\\parskip}{0.1ex plus0.1ex minus0.1ex}
+  \\begin{footnotesize}
+
+}
+\\newcommand{\\objPoemVerseClose}{%
+
+  \\end{footnotesize}
+  \\setlength{\\parskip}{1ex plus0.5ex minus0.2ex}
+  \\linebreak
+}
+\\newcommand{\\parasep}{%
+  \\smallskip \\begin{center}*\\hspace{2em}*\\hspace{2em}*\\end{center} \\br
+}
+\\newcommand{\\spaces}[1]{{\\hspace*{#1ex}}}
+\\newcommand{\\s}{\\hspace*{1ex}}
+\\newcommand{\\hardspace}{\\hspace*{1ex}}
+\\newcommand{\\-}{\\hspace*{1ex}}
+\\newcommand{\\caret}{{\\^{~}}}
+\\newcommand{\\pipe}{{\\textbar}}
+\\newcommand{\\curlyOpen}{{}
+\\newcommand{\\curlyClose}{}}
+\\newcommand{\\lt}{{UseTextSymbol{OML}{<}}}
+\\newcommand{\\gt}{{UseTextSymbol{OML}{>}}}
+\\newcommand{\\slash}{{/}}
+\\newcommand{\\underscore}{\\_}
+\\newcommand{\\exclaim}{\\Verbatim{!}}
+\\newcommand{\\linktext}[2]{%
+  {\\href{#1}
+  {\\;\\ulcorner\\,\\textup{{#2}}\\,\\lrcorner}}
+}
+\\newcommand{\\linkurl}[2]{%
+  \\;{\\href{#1}
+  {\\;\\scriptsize\\ttfamily\\ulcorner\\,\\textup{{#2}}\\,\\lrcorner}}
+}
+\\newcommand{\\link}[2]{%
+  {\\begin{scriptsize}\\color{black}\\urlstyle{tt}\\href{#1}
+  {\\;\\ulcorner\\,{#2}\\,\\lrcorner}\\end{scriptsize}}
+}
+\\newcommand{\\objCodeBlock}[1]{\\normaltext\\raggedright\\small\\ttfamily\\texbackslash#1}
+\\newcommand{\\objCodeOpen}{%
+  \\normaltext\\raggedright\\small\\ttfamily\\texbackslash
+  \\begin{lstlisting}
+}
+\\newcommand{\\objCodeClose}{%
+  \\end{lstlisting}
+}
+\\newcommand{\\ocn}[1]{%
+  \\setlength{\\parindent}{0em}
+  \\ifx&#1&% #1 is empty
+    \\hspace{-0.5ex}{\\marginpar{\\begin{tiny}\\end{tiny}}}
+  \\else% #1 is nonempty
+    \\hspace{-0.5ex}{\\marginpar{\\begin{tiny}\\hspace{0em}\\hypertarget{#1}{#1}\\end{tiny}}}
+  \\fi
+}
+\\newcommand{\\ocnhold}[1]{%
+  \\begin{tiny}\\hspace{0mm}\\end{tiny}{\\marginpar{\\begin{tiny}\\hspace{0mm}\\hypertarget{#1}{#1}\\end{tiny}}}
+}
+\\newcommand{\\objCodeBlockHold}[1]{\\normaltext\\raggedright\\small\\ttfamily\\texbackslash#1}
+\\newcommand{\\objTableOpen}[1]{%
+  \\setlength{\\LTleft}{0pt}
+  \\setlength{\\LTright}{\\fill}
+  \\begin{tiny}
+  \\begin{longtable}{#1}
+}
+\\newcommand{\\objTableClose}{%
+  \\end{longtable}
+  \\end{tiny}
+}
+      WOK
+    end
+    def tex_head_paper_orient(orientation)
+      colorlinks = <<-WOK
+  colorlinks=true,    % myblack
+  urlcolor=myblue,    % \\href{...}{...}   external url
+  filecolor=mygreen,  % \\href{...}        local file
+  linkcolor=myred,    % \\href{...} and \\pageref{...}
+      WOK
+      colorlinks = (orientation == "landscape") ? colorlinks : ""
+      <<-WOK
+\\usepackage[#{tex_head_lang[:mainlang]},#{tex_head_lang[:otherlang]}]{babel}
+\\usepackage[autostyle, english = american]{csquotes}
+% \\MakeOuterQuote{"} % not required, using '' as quote delimiter
+\\selectlanguage{#{tex_head_lang[:mainlang]}}
+\\hypersetup{
+  pdftitle={#{@md.title.short}},
+  pdfauthor={#{@md.creator.author}},
+  pdfsubject={},
+#{colorlinks}
+}
+\\usepackage{fancyhdr}
+\\lhead[ ]{ }
+\\chead[ \\fancyplain{} \\bfseries \\footnotesize \\leftmark ]{ \\fancyplain{} \\bfseries \\footnotesize \\rightmark }
+\\rhead[ ]{ }
+\\lfoot[\\textrm{\\thepage}]{\\tiny \\href{https://sisudoc.org}{SiSU}}
+    \\cfoot{\\href{https://git.sisudoc.org}{git}}
+\\rfoot[\\tiny \\href{}{}]{\\textrm{\\thepage}}
+\\begin{document}
+\\thispagestyle{empty}
+\\title{#{@md.title.full}}
+\\author{ \\textnormal{#{@md.creator.author}}}
+\\date{\\begin{tiny}2015-08-23\\end{tiny}}
+\\maketitle
+\\addcontentsline{toc}{part}{#{@md.title.full}}
+\\newpage
+\\pagestyle{fancy}
+\\pagenumbering{alph}
+\\setcounter{page}{1}
       WOK
     end
     def tex_head_paper_portrait(d)
       multicol=(@md.book_idx ? '\usepackage{multicol}' : '')
       <<-WOK
 #{tex_head_info}
+\\documentclass[11pt,a4paper,titlepage,makeidx]{scrartcl}
+\\usepackage{fontspec}
+% \\usepackage{lmodern} %%issue remove for now (consider later)
 \\usepackage{geometry}
-\\documentclass[#{d[:fontsize]},#{d[:papertype]},titlepage]{scrartcl}        %with titlepage
-\\setlength{\\textheight}{#{d[:textheight]}mm} \\setlength{\\textwidth}{#{d[:textwidth]}mm}
-\\setlength{\\oddsidemargin}{#{d[:oddsidemargin]}} \\setlength{\\evensidemargin}{#{d[:evensidemargin]}}
-\\setlength{\\topmargin}{#{d[:topmargin]}} \\setlength{\\headheight}{#{d[:headheight]}}
-\\setlength{\\headsep}{#{d[:headsep]}}
+\\geometry{%
+  #{d[:papertype]},
+  portrait,
+  left=#{d[:left]},
+  right=#{d[:right]},
+  top=#{d[:top]},
+  bottom=#{d[:bottom]},
+}
+% \\ProvidesPackage{./sty/spineShared}
+\\usepackage{multicol}
 \\setlength{\\marginparsep}{#{d[:marginparsep]}}
 \\setlength{\\marginparwidth}{#{d[:marginparwidth]}}
+#{tex_head_paper_characters}
+#{tex_head_paper_shared}
+#{tex_head_paper_newenv_newcmd}
+#{tex_head_paper_orient("portrait")}
 #{multicol}
       WOK
     end
     def tex_head_paper_landscape(d)
       <<-WOK
 #{tex_head_info}
+\\documentclass[11pt,a4paper,landscape,titlepage,twocolumn,makeidx]{scrartcl}
 \\usepackage{geometry}
-\\documentclass[#{d[:fontsize]},#{d[:papertype]},landscape,titlepage,twocolumn]{scrartcl}        %with titlepage
-\\setlength{\\textheight}{#{d[:textheight]}mm} \\setlength{\\textwidth}{#{d[:textwidth]}mm}
-\\setlength{\\oddsidemargin}{#{d[:oddsidemargin]}} \\setlength{\\evensidemargin}{#{d[:evensidemargin]}}
-\\setlength{\\topmargin}{#{d[:topmargin]}} \\setlength{\\headheight}{#{d[:headheight]}}
-\\setlength{\\headsep}{#{d[:headsep]}}
-\\setlength{\\columnsep}{#{d[:columnsep]}}
+\\geometry{%
+  #{d[:papertype]},
+  landscape,
+  left=#{d[:left]},
+  right=#{d[:right]},
+  top=#{d[:top]},
+  bottom=#{d[:bottom]},
+}
+\\usepackage{multicol}
 \\setlength{\\marginparsep}{#{d[:marginparsep]}}
 \\setlength{\\marginparwidth}{#{d[:marginparwidth]}}
+#{tex_head_paper_characters}
+#{tex_head_paper_shared}
+#{tex_head_paper_newenv_newcmd}
+#{tex_head_paper_orient("landscape")}
       WOK
     end
     def tex_head_paper_portrait_dvi(d)
@@ -2104,6 +2350,8 @@ module SiSU_TeX_Pdf
       when :portrait
         fontsize=(fontsize_set==:na) ? '11pt' : (fontsize_set + 'pt')
         d[:papertype],d[:fontsize]='a4paper',fontsize
+        d[:left],d[:right]='30mm','20mm'
+        d[:top],d[:bottom]='30mm','30mm'
         d[:oddsidemargin],d[:evensidemargin],d[:topmargin]='0mm','0mm','-12pt'
         d[:headheight],d[:headsep],d[:columnsep]='12pt','35pt',''
         d[:marginparsep],d[:marginparwidth]='4mm','8mm'
@@ -2123,12 +2371,16 @@ module SiSU_TeX_Pdf
         when /book|b5/i   #book default - larger
           fontsize=(fontsize_set==:na) ? '11pt' : (fontsize_set + 'pt')
           d[:papertype],d[:fontsize]='b5paper',fontsize
+          d[:left],d[:right]='20mm','20mm'
+          d[:top],d[:bottom]='20mm','20mm'
           d[:oddsidemargin],d[:evensidemargin],d[:topmargin]='-4mm','-4mm','-36pt'
           d[:headheight],d[:headsep],d[:columnsep]='12pt','20pt',''
           d[:textheight],d[:textwidth]=@tx.b5.portrait.h,@tx.b5.portrait.w
         when /a5/i
           fontsize=(fontsize_set==:na) ? '11pt' : (fontsize_set + 'pt')
           d[:papertype],d[:fontsize]='a5paper',fontsize
+          d[:left],d[:right]='20mm','20mm'
+          d[:top],d[:bottom]='20mm','20mm'
           d[:oddsidemargin],d[:evensidemargin],d[:topmargin]='-4mm','-4mm','-36pt'
           d[:headheight],d[:headsep],d[:columnsep]='11pt','12pt',''
           d[:marginparsep],d[:marginparwidth]='4mm','6mm'
@@ -2141,6 +2393,8 @@ module SiSU_TeX_Pdf
       when :landscape
         fontsize=(fontsize_set==:na) ? '11pt' : (fontsize_set + 'pt')
         d[:papertype],d[:fontsize]='a4paper',fontsize
+        d[:left],d[:right]='30mm','20mm'
+        d[:top],d[:bottom]='30mm','30mm'
         d[:oddsidemargin],d[:evensidemargin],d[:topmargin]='6mm','6mm','-12mm'
         d[:headheight],d[:headsep],d[:columnsep]='12pt','20pt','40pt'
         d[:marginparsep],d[:marginparwidth]='4mm','8mm'
@@ -2160,10 +2414,14 @@ module SiSU_TeX_Pdf
         when /book|b5/i       #book default - larger
           fontsize=(fontsize_set==:na) ? '11pt' : (fontsize_set + 'pt')
           d[:papertype],d[:fontsize],d[:columnsep]='b5paper',fontsize,'35pt'
+          d[:left],d[:right]='25mm','25mm'
+          d[:top],d[:bottom]='20mm','20mm'
           d[:textheight],d[:textwidth]=@tx.b5.landscape.h,@tx.b5.landscape.w
         when /a5/i
           fontsize=(fontsize_set==:na) ? '10pt' : (fontsize_set + 'pt')
           d[:papertype],d[:fontsize],d[:columnsep]='a5paper',fontsize,'32pt'
+          d[:left],d[:right]='25mm','25mm'
+          d[:top],d[:bottom]='20mm','20mm'
           d[:textheight],d[:textwidth]=@tx.a5.landscape.h,@tx.a5.landscape.w
         else                            #default currently A4
           fontsize=(fontsize_set==:na) ? '12pt' : (fontsize_set + 'pt')
@@ -2226,53 +2484,14 @@ module SiSU_TeX_Pdf
       else ''
       end
       <<-WOK
-\\usepackage{alltt}
-\\usepackage{thumbpdf}
-\\usepackage[#{@tex2pdf},
-  #{hyperlinks_color?.strip}
-  pdftitle={#{@txt}},
-  pdfauthor={#{author}},
-  pdfsubject={#{@subject}},
-  pdfkeywords={#{@keywords}},
-  pageanchor=true,
-  plainpages=true,
-  pdfpagelabels=true,
-  pagebackref,
-  bookmarks=true,
-  bookmarksopen=true,
-  pdfmenubar=true,
-  pdfpagemode=UseOutline,
-  pdffitwindow=true,
-  pdfwindowui=true,
-  plainpages=false,
-%  pdfusetitle=true,
-%  pdfpagelayout=SinglePage,
-%  pdfpagelayout=TwoColumnRight,
-%  pdfpagelayout=TwoColumnLeft,
-%  pdfstartpage=3,
-  pdfstartview=FitH
-]
-{hyperref}
-%% trace lost characters
-% \\tracinglostchars = 1
-% \\tracingonline = 1
-\\usepackage[usenames]{color}
-\\definecolor{myblack}{rgb}{0,0,0}
-\\definecolor{myred}{rgb}{0.75,0,0}
-\\definecolor{mygreen}{rgb}{0,0.5,0}
-\\definecolor{myblue}{rgb}{0,0,0.5}
-\\definecolor{mywhite}{rgb}{1,1,1}
-\\usepackage{url}
-\\urlstyle{sf}
-%\\usepackage{breakurl}
         WOK
     end
     def tex_head_codeblock(codeblock_box_type)
       codeblock_box=if codeblock_box_type=='listings'
         <<-WOK
-\\usepackage{listings}
-\\usepackage{color}
-\\usepackage{textcomp}
+% \\usepackage{listings}
+% \\usepackage{color}
+% \\usepackage{textcomp}
         WOK
       elsif codeblock_box_type=='boites'
         "\\usepackage{boites}"
@@ -2281,22 +2500,6 @@ module SiSU_TeX_Pdf
       end
       codeblock_box
     end
-    def tex_head_misc
-      <<-WOK
-\\usepackage{textcomp}
-\\usepackage[parfill]{parskip}
-\\usepackage[normalem]{ulem}
-\\usepackage{soul}
-\\usepackage{longtable}
-\\usepackage[tc]{titlepic}
-\\usepackage{graphicx}
-\\makeatletter
-\\parindent0pt
-%\\usepackage{mathptmx}
-\\usepackage{amssymb}
-% amssymb used for backslash
-      WOK
-    end
     def document_head_with_orientation(codeblock_box_type)
       endnotes=("\\usepackage{endnotes}" if @txt =~/endnotes?/) || '' #not implemented see also def endnotes
       @lang.list[@md.i18n[0]][:xlp]
@@ -2304,79 +2507,8 @@ module SiSU_TeX_Pdf
 #{tex_head_paper}
 #{tex_head_encode}
 #{tex_head_pdftex}
-#{tex_head_misc}
 #{tex_head_codeblock(codeblock_box_type)}
-\\setcounter{secnumdepth}{2}
-\\setcounter{tocdepth}{4}
-\\makeatletter
-#{endnotes}
-\\usepackage[multiple,ragged]{footmisc}
-\\setlength\\footnotemargin{12pt}
-\\usepackage[para]{manyfoot}
-\\DeclareNewFootnote{A}
-%\\DeclareNewFootnote[para]{A}
-\\newenvironment{ParagraphIndent}[1]%
-{
-\\begin{list}{}{%
-\\setlength\\topsep{0pt}%
-\\addtolength{\\leftmargin}{#1}
-\\setlength\\parsep{0pt plus 1pt}%
-}
-\\item[]
-}
-{\\end{list}}
-
-\\newenvironment{ParagraphHang}[2]%
-{
-\\begin{list}{}{%
-\\setlength\\topsep{0pt}%
-\\addtolength{\\leftmargin}{#1}
-\\itemindent=#2
-\\setlength\\parsep{0pt plus 1pt}%
-}
-\\item[]
-}
-{\\end{list}}
-
-\\newenvironment{Bullet}[1]%
-{
-\\begin{list}{}{%
-\\setlength\\topsep{0pt}%
-\\addtolength{\\leftmargin}{#1}
-\\itemindent=-1em
-\\setlength\\parsep{0pt plus 1pt}%
-}
-\\item[]
-}
-{\\end{list}}
-\\usepackage{fancyhdr}
-\\lhead{}
-\\renewcommand{\\part}{\\\@startsection
-  {part}{1}{-2mm}%
-  {-\\baselineskip}{0.5\\baselineskip}%
-  {\\bfseries\\large\\upshape\\raggedright}}
-\\renewcommand{\\section}{\\\@startsection
-  {section}{2}{-2mm}%
-  {-\\baselineskip}{0.5\\baselineskip}%
-  {\\bfseries\\large\\upshape\\raggedright}}
-\\renewcommand{\\subsection}{\\\@startsection
-  {subsection}{3}{-2mm}%
-  {-\\baselineskip}{0.5\\baselineskip}%
-  {\\bfseries\\large\\upshape\\raggedright}}
-\\renewcommand{\\subsubsection}{\\\@startsection
-  {subsubsection}{4}{-2mm}%
-  {-\\baselineskip}{0.5\\baselineskip}%
-  {\\normalfont\\normalsize\\bfseries\\raggedright}}
-\\renewcommand{\\paragraph}{\\\@startsection
-  {paragraph}{5}{-2mm}%
-  {-\\baselineskip}{0.5\\baselineskip}%
-  {\\normalfont\\normalsize\\itshape\\raggedright}}
-\\renewcommand{\\subparagraph}{\\\@startsection
-  {subparagraph}%{6}%{-2mm}%
-  {-\\baselineskip}{0.5\\baselineskip}%
-  {\\normalfont\\normalsize\\itshape\\raggedright}}
-% \\makeatother
-\\selectlanguage{#{@lang.list[@md.i18n[0]][:xlp]}}
+% \\selectlanguage{#{tex_head_lang[:mainlang]}}
       WOK
     end
     def a4generic
@@ -2668,9 +2800,7 @@ module SiSU_TeX_Pdf
       "\n"
     end
     def header
-      "\\lhead[ ]{ }\n" +
-      "\\chead[ \\fancyplain{} \\bfseries \\footnotesize \\leftmark ]{ \\fancyplain{} \\bfseries \\footnotesize \\rightmark }\n" +
-      "\\rhead[ ]{ }\n"
+      ""
     end
     def footer
       "\\lfoot[\\textrm{\\thepage}]{\\tiny \\href{#{@md.footer_links[:left][:url]}}{#{@md.footer_links[:left][:say]}}}\n" +
@@ -2712,7 +2842,7 @@ module SiSU_TeX_Pdf
       <<-WOK
 \\\\ ~
 {\\begin{footnotesize}#{base_prog_txt}
-\\\\ Generated by \\href{http://www.jus.uio.no/sisu}{SiSU} \\begin{tiny}[ #{v.project} #{v.version} of #{v.date_stamp} ]\\end{tiny} \\href{http://www.jus.uio.no/sisu}{www.jus.uio.no/sisu}
+\\\\ Generated by \\href{https://git.sisudoc.org/}{SiSU} \\begin{tiny}[ #{v.project} #{v.version} of #{v.date_stamp} ]\\end{tiny} \\href{https://git.sisudoc.org/}{git.sisudoc.org}
 \\\\ Copyright #{@copymark} 1997, current #{@date.year_static} Ralph Amissah, All Rights Reserved.
 \\\\ SiSU is software for document structuring, publishing and search (with object citation numbering), \\href{http://www.sisudoc.org}{www.sisudoc.org}
 \\\\ SiSU is released under \\href{http://www.fsf.org/licenses/gpl.html}{GPL 3 } or later, #{url_brace.tex_open}\\href{http://www.fsf.org/licenses/gpl.html}{http://www.fsf.org/licenses/gpl.html}#{url_brace.tex_close}.
@@ -2722,11 +2852,11 @@ module SiSU_TeX_Pdf
     end
     def doc_sc_info_footnote_full
       <<-WOK
-\\footnote{%\nGenerated by \\href{http://www.jus.uio.no/sisu}{SiSU \\ www.jus.uio.no/sisu }\\ \\newline \\scriptsize{Document version information: \\emph{sourcefile} \\uline{#{@md.fnstex}}; \\emph{version} \\uline{#{@md.sc_number}}; \\emph{date} \\uline{#{@md.sc_date}}; \\emph{time} \\uline{#{@md.sc_time}}}}
+\\footnote{%\nGenerated by \\href{https://git.sisudoc.org/}{SiSU \\ git.sisudoc.org }\\ \\newline \\scriptsize{Document version information: \\emph{sourcefile} \\uline{#{@md.fnstex}}; \\emph{version} \\uline{#{@md.sc_number}}; \\emph{date} \\uline{#{@md.sc_date}}; \\emph{time} \\uline{#{@md.sc_time}}}}
       WOK
     end
     def doc_sc_info_footnote_brief
-      " \\footnote{%\nGenerated by \\href{http://www.jus.uio.no/sisu}{SiSU} \\ \\href{http://www.jus.uio.no/sisu}{www.jus.uio.no/sisu} \\newline \\href{http://www.sisudoc.org}{www.sisudoc.org} \\\n}"
+      " \\footnote{%\nGenerated by \\href{https://git.sisudoc.org/}{SiSU} \\ \\href{https://git.sisudoc.org/}{git.sisudoc.org} \\newline \\href{https://sisudoc.org}{sisudoc.org} \\\n}"
     end
     def doc_sc_info
       v=SiSU_Env::InfoVersion.instance.get_version
@@ -2735,7 +2865,7 @@ module SiSU_TeX_Pdf
 {\\begin{footnotesize}
 Document version information: \\\\
 \\emph{sourcefile} \\uline{#{@md.fnstex}}; \\emph{version} \\uline{#{@md.sc_number}}; \\emph{date} \\uline{#{@md.sc_date}}; \\emph{time} \\uline{#{@md.sc_time}} \\\\
-Generated by \\href{http://www.jus.uio.no/sisu}{SiSU www.jus.uio.no/sisu }\\- version information: \\\\
+Generated by \\href{https://git.sisudoc.org/}{SiSU git.sisudoc.org }\\- version information: \\\\
 \\uline{ #{v.project} #{v.version} of #{v.date_stamp}}
 \\end{footnotesize}}&
       WOK
@@ -2747,7 +2877,7 @@ Generated by \\href{http://www.jus.uio.no/sisu}{SiSU www.jus.uio.no/sisu }\\- ve
 {\\begin{small}
 Document information: \\\\
 \\emph{sourcefile} \\uline{#{@md.fnstex}} \\\\
-Generated by \\href{http://www.jus.uio.no/sisu}{SiSU www.jus.uio.no/sisu } \\\\ version information: \\
+Generated by \\href{https://git.sisudoc.org/}{SiSU https://git.sisudoc.org/ } \\\\ version information: \\
 \\uline{ #{v.project} #{v.version} of #{v.date_stamp}}
 
 \\end{small}}&
@@ -2764,10 +2894,10 @@ Generated by \\href{http://www.jus.uio.no/sisu}{SiSU www.jus.uio.no/sisu } \\\\
   end
 end
 __END__
-ag usepackage texpdf*
-ag usepackage texpdf* | ag '\{.+?\}'
+rg usepackage texpdf*
+rg usepackage texpdf* | rg '\{.+?\}'
 # texpdf_format.rb
-ag usepackage texpdf* | ag --only-matching '\{.+?\}'
+rg usepackage texpdf* | rg --only-matching '\{.+?\}' |sort|uniq
 
 ,* sort & make unique
 @tex2pdf
@@ -2869,6 +2999,7 @@ xunicode.sty
 
 texlive-base:
   amssymb.sty
+
 texlive-latex-base:
   alltt.sty
   babel.sty
@@ -2881,6 +3012,7 @@ texlive-latex-base:
   multicol.sty
   textcomp.sty
   url.sty
+
 texlive-latex-extra:
   boites.sty
   breakurl.sty
@@ -2890,6 +3022,7 @@ texlive-latex-extra:
   soul.sty
   titlepic.sty
   ucs.sty
+
 texlive-latex-recommended:
   fontspec.sty
   listings.sty
@@ -2898,8 +3031,10 @@ texlive-latex-recommended:
   thumbpdf.sty
   xltxtra.sty
   xunicode.sty
+
 texlive-plain-generic:
   ulem.sty
+
 texlive-xetex:
   xeCJK.sty
 
@@ -2911,7 +3046,6 @@ texlive-latex-extra
 texlive-latex-recommended
 texlive-plain-generic
 texlive-xetex
-
 #+END_SRC
 
 * document header
@@ -2968,6 +3102,6 @@ encoding: utf-8
 
   - Git
     <https://git.sisudoc.org/projects/>
-    <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
-    <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
+    <https://git.sisudoc.org/projects/sisu>
+    <https://git.sisudoc.org/projects/sisu-markup>
 #+END_SRC
diff --git a/org/txt.org b/org/txt.org
index f4ce5391..bec17cb9 100644
--- a/org/txt.org
+++ b/org/txt.org
@@ -3216,6 +3216,6 @@ encoding: utf-8
 
   - Git
     <https://git.sisudoc.org/projects/>
-    <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
-    <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
+    <https://git.sisudoc.org/projects/sisu>
+    <https://git.sisudoc.org/projects/sisu-markup>
 #+END_SRC
diff --git a/org/utils.org b/org/utils.org
index ffbdfeeb..d5d64ebc 100644
--- a/org/utils.org
+++ b/org/utils.org
@@ -858,6 +858,6 @@ encoding: utf-8
 
   - Git
     <https://git.sisudoc.org/projects/>
-    <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
-    <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
+    <https://git.sisudoc.org/projects/sisu>
+    <https://git.sisudoc.org/projects/sisu-markup>
 #+END_SRC
diff --git a/org/xhtml.org b/org/xhtml.org
index 5c0a5cf0..35e88a5f 100644
--- a/org/xhtml.org
+++ b/org/xhtml.org
@@ -1341,7 +1341,7 @@ module SiSU_XHTML_EPUB2_Concordance
         @particulars,@md=particulars,particulars.md
         @data=SiSU_XHTML_EPUB2::Source::XHTML_Environment.new(particulars).tuned_file_instructions
         @fnb=@md.fnb
-        @lex_button=%{<a href="http://www.jus.uio.no/sisu/" target="_top"><img border="0" height="44" width="144" valign="center" src="../_sisu/image/sisu.png" alt="SiSU home"></a>}
+        @lex_button=%{<a href="https://sisudoc.org" target="_top"><img border="0" height="44" width="144" valign="center" src="../_sisu/image/sisu.png" alt="SiSU home"></a>}
         @doc_details =<<WOK
 <table summary="links to text related to this rudimentary index" width="96%" border="0" bgcolor="white" cellpadding="0" align="center"><tr><td width="2%" align="right">#{$ep[:hsp]}</td><td width="94%" valign="top" align="justify"><h1 class="small"><a href="#{@md.file.base_filename.epub}"><b>#{@md.title.full}</b></a></h1><p class="bold">#{@md.creator.author}</p></td></tr></table>
 WOK
@@ -5094,6 +5094,6 @@ encoding: utf-8
 
   - Git
     <https://git.sisudoc.org/projects/>
-    <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
-    <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
+    <https://git.sisudoc.org/projects/sisu>
+    <https://git.sisudoc.org/projects/sisu-markup>
 #+END_SRC
diff --git a/org/xml.org b/org/xml.org
index d3736b85..be79411a 100644
--- a/org/xml.org
+++ b/org/xml.org
@@ -1064,8 +1064,6 @@ __END__
 ,** Notes: tidy -xml dom.xml >> index.tidy
 #+END_SRC
 
-#+END_SRC
-
 * xml shared
 ** xml_shared.rb
 
@@ -1490,7 +1488,7 @@ module SiSU_XML_Tags #Format
     def initialize(md='',seg_name=[],tracker=0)
       @full_title=@subtitle=@author=@subject=@description=@publisher=@contributor=@date=@date_created=@date_issued=@date_available=@date_valid=@date_modified=@type=@format=@identifier=@source=@language=@relation=@coverage=@rights=@copyright=@owner=@keywords=''
       @md=md
-      @rdfurl=%{  rdf:about="http://www.jus.uio.no/lm/toc"\n}
+      @rdfurl=%{  rdf:about="https://sisudoc.org/spine/topics.html"\n}
       if defined? @md.title.full \
       and @md.title.full                          # DublinCore 1 - title
         @rdf_title=%{    dc.title="#{seg_name}#{@md.title.full}"\n}
@@ -1636,7 +1634,7 @@ module SiSU_XML_Tags #Format
      ,* #{rubyv}
      ,* #{sc}
      ,* #{lastdone}
-     ,* SiSU http://www.jus.uio.no/sisu
+     ,* SiSU https://sisudoc.org
 -->
 WOK
      else
@@ -1647,7 +1645,7 @@ WOK
      ,* #{rubyv}
      ,* #{sc}
      ,* #{lastdone}
-     ,* SiSU http://www.jus.uio.no/sisu
+     ,* SiSU https://sisudoc.org
 -->
 WOK
       end
@@ -1929,7 +1927,7 @@ module SiSU_XML_Format
       @full_title=@subtitle=@author=@subject=@description=@publisher=@contributor=@date=@type=@format=@identifier=@source=@language=@relation=@coverage=@rights=@copyright=@owner=@keywords=''
       @md=@@md
       # DublinCore 1 - title
-      @rdfurl=%{  rdf:about="http://www.jus.uio.no/lm/toc"\n}
+      @rdfurl=%{  rdf:about="https://sisudoc.org"\n}
       if defined? @md.title.full \
       and @md.title.full                          # DublinCore 1 - title
         @rdf_title=%{    dc.title="#{seg_name}#{@md.title.full}"\n}
@@ -5593,6 +5591,6 @@ encoding: utf-8
 
   - Git
     <https://git.sisudoc.org/projects/>
-    <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
-    <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
+    <https://git.sisudoc.org/projects/sisu>
+    <https://git.sisudoc.org/projects/sisu-markup>
 #+END_SRC
author	Ralph Amissah <ralph.amissah@gmail.com>	2023-10-30 22:31:28 -0400
committer	Ralph Amissah <ralph.amissah@gmail.com>	2023-10-30 22:31:28 -0400
commit	ad803956c1f7ce1a4b0e820a21881a58a326b7f7 (patch)
tree	eb36cfcd0bcbed76a51b0e97e0a46609769ca232 /org
parent	debian/changelog (7.2.1-2) (diff)
parent	version & changelog, tag for release (diff)