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
parent: debian/changelog (7.2.1-2) (diff)
parent: version & changelog, tag for release (diff)
235 files changed, 2771 insertions, 1977 deletions
diff --git a/.envrc b/.envrc
index c0adda9e..6ad5fe23 100644
--- a/.envrc
+++ b/.envrc
@@ -1,8 +1,6 @@
-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="
+if [ -f .envrc-local ]; then
+  source_env_if_exists .envrc-local || source .envrc-local
 fi
-if [ -e .env/local ]; then
-  source_env_if_exists .env/local || source .env/local
+if [ -f .envrc-nix ]; then
+  source_env_if_exists .envrc-nix || source .envrc-nix
 fi
diff --git a/.envrc-nix b/.envrc-nix
new file mode 100644
index 00000000..c495b719
--- /dev/null
+++ b/.envrc-nix
@@ -0,0 +1,27 @@
+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 .
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..0a42eb22
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,4 @@
+/org export-ignore
+.gitattributes export-ignore
+tangle export-ignore
+#flake.lock export-ignore
diff --git a/.gitignore b/.gitignore
index 50e88cab..7694190a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,13 @@
 # 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
@@ -18,13 +26,11 @@
 !conf/**
 !*.json
 !*.org
+!org/
+!org/*.org
 !*.rb
 !*.txt
 !*.yml
-!*.nix
-!nix/
-!nix/**
-!org/
 !bin
 !bin/sisu
 !bin/sisu-*
@@ -40,8 +46,10 @@
 !data/sisu/**
 !*.sst
 !*.ssm
+!*.ssi
 !**/*.sst
 !**/*.ssm
+!**/*.ssi
 !debian/
 !debian/changelog
 !debian/compat
@@ -74,4 +82,7 @@
 *_
 .*
 !.gitignore
+!.gitattributes
 !.envrc
+!.envrc-local
+!.envrc-nix
diff --git a/README b/README
index 2d1e9825..de84b575 100644
--- a/README
+++ b/README
@@ -31,7 +31,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
 ***********************************
@@ -102,7 +102,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>
 
 
 ----------------------------------------
@@ -150,8 +150,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
 
@@ -178,8 +178,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
@@ -209,7 +208,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
@@ -265,7 +264,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
 .................................
@@ -1004,12 +1003,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
@@ -1075,24 +1072,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
 .................
@@ -1157,8 +1150,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
@@ -1168,8 +1161,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]
@@ -1438,33 +1431,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
 
 
 ----------------------------------------
@@ -1476,22 +1469,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
 
@@ -1527,24 +1520,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
 
@@ -1569,21 +1562,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
 ...........................
@@ -2132,7 +2125,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
@@ -2183,7 +2176,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
@@ -2329,7 +2322,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
 
@@ -2356,13 +2349,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:
 
diff --git a/bin/sisu b/bin/sisu
index 11e9592c..12b9fbfb 100755
--- a/bin/sisu
+++ b/bin/sisu
@@ -49,8 +49,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>
 class Orient
   require 'singleton'
   include Singleton
diff --git a/bin/sisu-misc-utils b/bin/sisu-misc-utils
index 506d5b52..0733b81c 100755
--- a/bin/sisu-misc-utils
+++ b/bin/sisu-misc-utils
@@ -49,8 +49,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>
 begin
   require 'thor'
 rescue LoadError
diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2
index e012f7da..195da457 100644
--- a/data/doc/sisu/CHANGELOG_v2
+++ b/data/doc/sisu/CHANGELOG_v2
@@ -39,26 +39,26 @@ Reverse Chronological:
 --- HEAD --- [closed]
 
 * sisu_2.9.12 (2012-02-14:07/2) [see 3.1.14.orig.tar.xz]
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.14
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.1.14
 
   * v2, vim syntax highlighting, patch from Thilo Six <T.Six@gmx.de> applied
   Re: <http://thread.gmane.org/gmane.editors.vim.devel/32151> &
   <http://vimdoc.sourceforge.net/htmldoc/options.html#cpo-l>
 
 * sisu_2.9.11 (2012-01-10:02/2) [see 3.1.11.orig.tar.xz]
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.11
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.1.11
 
   * modify sisu markup version script
 
 * sisu_2.9.10 (2011-10-15:41/6) [see 3.1.1.orig.tar.xz]
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.1
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.1.1
 
   * odf:odt v1.0
     * make odt header changes easier to track
     * get rid of (binary changeset) blob
 
 * sisu_2.9.9 (2011-10-03:40/1) [see 3.1.0.orig.tar.xz]
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.0
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.1.0
 
   * bin/sisu, default sisu version 3
 
@@ -73,7 +73,7 @@ Reverse Chronological:
   * remote, image source url fix
 
 * sisu_2.9.7 (2011-06-26:25/7) [see 3.0.13.orig.tar.gz]
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.0.13
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.0.13
 
   * dal_syntax, linebreak within regular objects is \\ (<br> depreciated)
     [test, affects downstream outputs, there is the potential for breakage]
@@ -89,17 +89,17 @@ Reverse Chronological:
   * sisurc.yml, config settings
 
 * sisu_2.9.6 (2011-06-07:23/2) [see 3.0.12.orig.tar.gz]
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.0.12
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.0.12
 
   * help, s/Bul garian/Bulgarian/ (Closes: #619068)
 
 * sisu_2.9.5 (2011-05-17:20/2) [see 3.0.10.orig.tar.gz]
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.0.10
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.0.10
 
   * copyright (minor) touch, dates for setup.rb
 
 * sisu_2.9.4 (2011-05-15:19/7) [see 3.0.9.orig.tar.gz]
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.0.9
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.0.9
 
   * bin/sisu2 introduced (to complement bin/sisu3), currently same as bin/sisu
     (later switch bin/sisu to bin/sisu3; consider using update-alternatives)
@@ -110,7 +110,7 @@ Reverse Chronological:
     * sisu-mode.el assigned to FSF (GNU EMACS)
 
 * sisu_2.9.3 (2011-04-27:17/3) [see 3.0.8.orig.tar.gz]
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.0.8
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.0.8
 
   * bin/sisu3 bin/sisu /bin/sisu_webrick bin/sisu_termsheet
     * improved ruby version check
@@ -159,7 +159,7 @@ Reverse Chronological:
   * vim colors colorscheme sparse-* frugal-* Slate minor changes
 
 * sisu_2.9.2 (2011-04-20:16/3) [see 3.0.7.orig.tar.gz]
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.0.7
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.0.7
 
   * options, maintenance -M (--maintenance, new alias --keep-processing-files)
     * new alias --keep-processing-files (see Bug#622902)
@@ -180,7 +180,7 @@ Reverse Chronological:
     * url to sisu git repo source (when possible also track GNU EMACS location)
 
 * sisu_2.9.1 (2011-03-30:13/3) [see 3.0.6.orig.tar.gz]
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.0.6
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.0.6
 
   * (ruby 1.9.2 (transition related) fixes)
     * dal_doc_str
@@ -199,7 +199,7 @@ Reverse Chronological:
     * rearrange
 
 * sisu_2.9.0 (2011-03-24:12/4) [see 3.0.5.orig.tar.gz]
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.0.5
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.0.5
 
   * move to ruby >=1.9.2p180: simplify development of v3 and maintenance of v2
     * bin/sisu demand ruby >=1.9.2p180 (version checks)
@@ -217,7 +217,7 @@ Reverse Chronological:
   * vim syntax highlighting, fix typo
 
 * sisu_2.8.2 (2011-03-11:10/5) [see 3.0.3.orig.tar.gz]
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.0.3
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.0.3
 
   * dal_syntax and affected downstream output modules, revised pattern match
     for mail, (removes occasional interference with urls having embedded email
@@ -254,7 +254,7 @@ Reverse Chronological:
     * vim cleaning sisu.vim
 
 * sisu_2.8.1 (2011-03-05:09/6) [see 3.0.2.orig.tar.gz]
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.0.2
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.0.2
 
   * make sisu: v2 require >=ruby1.8.7; v3 require >=ruby1.9.2
 
@@ -270,7 +270,7 @@ Reverse Chronological:
     * small fixes
 
 * sisu_2.8.0 (2011-02-01:05/2) [see 3.0.0.orig.tar.gz]
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.0.0
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.0.0
 
   [post Debian Squeeze]
 
@@ -298,7 +298,7 @@ Reverse Chronological:
       texpdf (adjust later)
 
 * sisu_2.7.9.orig.tar.gz (2010-12-09:49/4)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_2.7.9
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_2.7.9
 
   [debian freeze, fix]
 
@@ -338,7 +338,7 @@ Reverse Chronological:
   * html search form, configuration check
 
 * sisu_2.7.8.orig.tar.gz (2010-10-25:43/1)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_2.7.8
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_2.7.8
 
   [debian freeze, fix]
 
@@ -380,7 +380,7 @@ Reverse Chronological:
       false)
 
 * sisu_2.7.7.orig.tar.gz (2010-10-17:41/7)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_2.7.7
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_2.7.7
 
   [debian freeze, fix]
 
@@ -405,7 +405,7 @@ Reverse Chronological:
   * documentation related minor updates and fixes
 
 * sisu_2.7.6.orig.tar.gz (2010-10-11:41/1)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_2.7.6
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_2.7.6
 
   [debian freeze, fix]
 
@@ -420,7 +420,7 @@ Reverse Chronological:
   * CHANGELOG v2 recount where some requests came from
 
 * sisu_2.7.5.orig.tar.gz (2010-10-09:40/6)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_2.7.5
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_2.7.5
 
   [debian freeze, fix]
 
@@ -434,7 +434,7 @@ Reverse Chronological:
   * param, metadata rights, keep colon separator from interfering with urls
 
 * sisu_2.7.4.orig.tar.gz (2010-10-08:40/5)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_2.7.4
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_2.7.4
 
   [debian freeze, fix]
 
@@ -446,7 +446,7 @@ Reverse Chronological:
     * epub (epub_tune) scaling of images, fix
 
 * sisu_2.7.3.orig.tar.gz (2010-10-06:40/3)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_2.7.3
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_2.7.3
 
   [debian freeze, fix]
 
@@ -466,7 +466,7 @@ Reverse Chronological:
   * sisu_markup.sst, document a fix (v1 & 2)
 
 * sisu_2.7.2.orig.tar.gz (2010-10-01:39/5)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_2.7.2
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_2.7.2
 
   [debian freeze, fix]
 
@@ -478,7 +478,7 @@ Reverse Chronological:
   * texpdf_format, remove a few commented out lines
 
 * sisu_2.7.1.orig.tar.gz (2010-10-01:39/5)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_2.7.1
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_2.7.1
 
   [debian freeze, fix]
 
@@ -504,7 +504,7 @@ Reverse Chronological:
   * share_src, hub cleaning
 
 * sisu_2.7.0.orig.tar.gz (2010-09-21:38/2)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_2.7.0
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_2.7.0
 
   Debian Squeeze equivalent (2.6.3-6 ported upstream)
 
@@ -567,7 +567,7 @@ Reverse Chronological:
     webrick (--webserv-webrick))
 
 * sisu_2.6.3.orig.tar.gz (2010-07-28:30/3)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_2.6.3
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_2.6.3
 
   * odf, footnotes, asterisk series (**) fix
 
@@ -668,7 +668,7 @@ Reverse Chronological:
     webrick (--webserv-webrick))
 
 * sisu_2.6.2.orig.tar.gz (2010-07-15:28/4)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_2.6.2
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_2.6.2
 
   * param, header reading more robust (re: commented out parts)
 
@@ -692,7 +692,7 @@ Reverse Chronological:
   * debian/control update ruby1.9 related depends to ruby1.9.1 (libfcgi-ruby1.9.1)
 
 * sisu_2.6.1.orig.tar.gz (2010-07-09:27/5)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_2.6.1
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_2.6.1
 
   * markup samples moved to data/doc/sisu/v2/markup-samples
 
@@ -707,7 +707,7 @@ Reverse Chronological:
   * sysenv, default output path, fix
 
 * sisu_2.6.0.orig.tar.gz (2010-07-07:27/3)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_2.6.0
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_2.6.0
 
   * sysenv, version.yml moved to /usr/share/sisu/v2/v (from /etc/sisu)
 
@@ -731,13 +731,13 @@ Reverse Chronological:
   * manpages, some additional manpages and some updates
 
 * sisu_2.5.1.orig.tar.gz (2010-06-12:23/6)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_2.5.1
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_2.5.1
 
   * texpdf, ensure programs default font is set (Liberation Sans) if none
     configured, (was intended, required fix)
 
 * sisu_2.5.0.orig.tar.gz (2010-06-11:23/5)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_2.5.0
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_2.5.0
 
   * texpdf, font selection permitted in sisurc.yml (default: texpdf_font:) or
     document header (@make: :texpdf_font:)
@@ -757,7 +757,7 @@ Reverse Chronological:
     content
 
 * sisu_2.4.3.orig.tar.gz (2010-06-05:22/6)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_2.4.3
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_2.4.3
 
   * vim/ftplugin/sisu.vim make less intrusive (both for sisu v2 & v1), includes
     the following:
@@ -779,7 +779,7 @@ Reverse Chronological:
       result of search all else closed)
 
 * sisu_2.4.2.orig.tar.gz (2010-06-01:22/2)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_2.4.2
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_2.4.2
 
   * texpdf, polyglossia (xelatex) (start using, instead of babel)
 
@@ -789,7 +789,7 @@ Reverse Chronological:
     (related to reporting "http" file not found)
 
 * sisu_2.4.1.orig.tar.gz (2010-05-26:21/3)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_2.4.1
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_2.4.1
 
   * regex match, a number of http: matches needed to be extended to include
     https:
@@ -799,7 +799,7 @@ Reverse Chronological:
     * dal_syntax fix, no auto-bold or italics on relative or internal links
 
 * sisu_2.4.0.orig.tar.gz (2010-05-26:21/3)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_2.4.0
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_2.4.0
 
   * sisu markup syntax added to, related to internal document links and
     relative links, see note on additions to vim syntax highlighting (version
@@ -819,7 +819,7 @@ Reverse Chronological:
   * sisu markup, documentation on_sisu_markup/sisu_markup.txt added much todo
 
 * sisu_2.3.5.orig.tar.gz (2010-05-18:20/2)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_2.3.5
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_2.3.5
 
   * dal_syntax, url match fix
 
@@ -830,7 +830,7 @@ Reverse Chronological:
   * vim templates for .sst .ssm & .ssi
 
 * sisu_2.3.4.orig.tar.gz (2010-05-12:19/3)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_2.3.4
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_2.3.4
 
   * dal_syntax, italics match fix
 
@@ -839,7 +839,7 @@ Reverse Chronological:
   * sysenv, switch default hash digest fingerprints to sha256 (rather than md5)
 
 * sisu_2.3.3.orig.tar.gz (2010-05-05:18/3)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_2.3.3
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_2.3.3
 
   * texpdf, special word and number optional break points, (also, reduce text
     display size of digests, reduce image size, add some url braces)
@@ -850,7 +850,7 @@ Reverse Chronological:
   * screen output (ansi), control
 
 * sisu_2.3.2.orig.tar.gz (2010-05-03:18/1)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_2.3.2
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_2.3.2
 
   * dal, markup, In cases where the line is interpreted as level 1~ (either by
     explicit 1~ tag or @make: :heading:) a hash (#) [octothorpe] will be
@@ -875,12 +875,12 @@ Reverse Chronological:
   * dal_numbering, number headings, a fix
 
 * sisu_2.3.1.orig.tar.gz (2010-04-28:17/3)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_2.3.1
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_2.3.1
 
   * param, for topic_register, an additional check required, bug fix, repost
 
 * sisu_2.3.0.orig.tar.gz (2010-04-27:17/2)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_2.3.0
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_2.3.0
 
   * db (sql)  add oclc (Online Computer Library Center) number, affects table
     structure, (hence breakage & version bump)
@@ -924,7 +924,7 @@ Reverse Chronological:
     alternatively to be in italics [requested]
 
 * sisu_2.2.0.orig.tar.gz (2010-04-20:16/2)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_2.2.0
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_2.2.0
 
   * db (sql) table structure, further review and changes (hence breakage & version bump)
     * new db name prefix "sisu_v2b_"; new pgsql db name prefix "SiSUv2b_"
@@ -959,7 +959,7 @@ Reverse Chronological:
     [2.1.1 fix release was not built, changes appear under 2.2.0]
 
 * sisu_2.1.0.orig.tar.gz (2010-04-16:15/5)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_2.1.0
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_2.1.0
 
   * db table structure, further review, minor, but disruptive
 
@@ -988,7 +988,7 @@ Reverse Chronological:
   * vim syntax highlighting, minor
 
 * sisu_2.0.5.orig.tar.gz (2010-03-31:13/3)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_2.0.5
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_2.0.5
 
   * bug fixes
     * harvest, fixes bug in harvest_topics (v2)
@@ -1001,7 +1001,7 @@ Reverse Chronological:
   * harvest, add search form for directory, if configured in sisurc.yml
 
 * sisu_2.0.4.orig.tar.gz (2010-03-23:12/2)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_2.0.4
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_2.0.4
 
   * bug fixes
     * correct method call for md.title.full a number of places [in db_import,
@@ -1010,7 +1010,7 @@ Reverse Chronological:
   * free_as_in_freedom, additional links to available material
 
 * sisu_2.0.3.orig.tar.gz (2010-03-22:12/1)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_2.0.3
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_2.0.3
 
   * bug fixes
     * odf, xml, texpdf, bulleted group, clean
@@ -1019,7 +1019,7 @@ Reverse Chronological:
     * xml_dom, behaviours fixes
 
 * sisu_2.0.2.orig.tar.gz (2010-03-21:11/7)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_2.0.2
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_2.0.2
 
   * bug fixes
     param, recommended links (reinstated)
@@ -1030,7 +1030,7 @@ Reverse Chronological:
     updated/corrected
 
 * sisu_2.0.1.orig.tar.gz (2010-03-17:11/3)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_2.0.1
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_2.0.1
 
   * bug fixes
     * html, tables fix
@@ -1043,7 +1043,7 @@ Reverse Chronological:
   * docs, add epub, more to be done
 
 * sisu_2.0.0.orig.tar.gz (2010-03-06:09/6)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_2.0.0
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_2.0.0
 
   * sisu v2
 
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index cd9f1b7b..a94eb65f 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -38,7 +38,7 @@ Reverse Chronological:
 --- HEAD --- [closed]
 
 * sisu_3.3.11.orig.tar.xz (2013-02-20:07/3)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_3.3.11
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.3.11
 
   * epub, add markup of angle brackets '<' & '>' to early markup of amp. '&'
 
@@ -47,7 +47,7 @@ Reverse Chronological:
   * b_epub.png, epub icon (for manifest) updated to use official image
 
 * sisu_3.3.10.orig.tar.xz (2013-02-10:05/7)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_3.3.10
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.3.10
 
   * vim, minimal color schemes, minor edits
 
@@ -59,12 +59,12 @@ Reverse Chronological:
      <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=bin/sisu;hb=HEAD>
 
 * sisu_3.3.9.orig.tar.xz (2013-02-06:05/3)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_3.3.9
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.3.9
 
   * utils (debug renamed), Utils::CodeMarker (from Debug::Mark)
 
 * sisu_3.3.8.orig.tar.xz (2013-02-03:04/7)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_3.3.8
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.3.8
 
   * sysenv, on --redirect, stop creation of redundant dir
 
@@ -76,7 +76,7 @@ Reverse Chronological:
       clear/obvious) [sync with v4]
 
 * sisu_3.3.7.orig.tar.xz (2013-01-31:04/4)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_3.3.7
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.3.7
 
   * dal, on ocn excluded paragraphs (~# -#), hang/indent bullet, fix
     [bug reported indirectly by Cory Doctorow (discovered in work with markup)]
@@ -85,7 +85,7 @@ Reverse Chronological:
     (markup specified v auto)
 
 * sisu_3.3.6.orig.tar.xz (2013-01-27:03/7)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_3.3.6
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.3.6
 
   * epub some fixing, more documents render in more readers/viewers
     * ncx fix, navpoint_close
@@ -97,7 +97,7 @@ Reverse Chronological:
     associated skin and associated images
 
 * sisu_3.3.5.orig.tar.xz (2013-01-23:03/3)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_3.3.5
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.3.5
 
   * epub
     * remove unnecessary conversion of some utf-8 characters to xhtml
@@ -119,7 +119,7 @@ Reverse Chronological:
   * param, match possible sisu version, detail
 
 * sisu_3.3.4.orig.tar.xz (2013-01-01:00/2)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_3.3.4
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.3.4
 
   * html_segments (by_filename by_filetype) internal document links do not
     work filenames need to include lang code, fixed
@@ -137,7 +137,7 @@ Reverse Chronological:
     (colored location markers to show when line passed within running code)
 
 * sisu_3.3.3.orig.tar.xz (2012-10-03:40/3)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_3.3.3
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.3.3
 
   * cosmetic, code
     * true ? x : y
@@ -206,12 +206,12 @@ Reverse Chronological:
     * cursor line & column: on; off, <leader>cu (existing cu+ & cu-)
 
 * sisu_3.3.2.orig.tar.xz (2012-06-30:26/6)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.3.2
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.3.2
 
   * texpdf, xetex screen reporting of warnings off unless sisu -pV used
 
 * sisu_3.3.1.orig.tar.xz (2012-06-23:25/6)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.3.1
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.3.1
 
   * texpdf_format, urls in headings break pdf documents, fix
     (e.g. output generation of document sample gpl.fsf.sst pdf fixed)
@@ -223,7 +223,7 @@ Reverse Chronological:
   * hub, some re-arrangement
 
 * sisu_3.3.0.orig.tar.xz (2012-06-17:24/7)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.3.0
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.3.0
 
   * shared_sisupod_source, common build for sisu (markup) source representations
     to be used by sisupod.txz, git, (and src)
@@ -235,7 +235,7 @@ Reverse Chronological:
     NOTE there are no changes to sisu markup (only the sharing of source files)
 
 * sisu_3.2.12.orig.tar.xz (2012-06-06:23/3)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.2.12
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.2.12
 
   * hub, post bundles
     * sisupod_make, file selection selection for tar.xz, fix
@@ -256,7 +256,7 @@ Reverse Chronological:
   * Rake, Rant installer sisu installer require ruby >= 1.9.3
 
 * sisu_3.2.11.orig.tar.xz (2012-06-03:22/7)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.2.11
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.2.11
 
   * images, regular & sisupod
     * shared_images, --html, --xhtml, --xml*
@@ -272,7 +272,7 @@ Reverse Chronological:
   * error & warning messages touched, revisit
 
 * sisu_3.2.10.orig.tar.xz (2012-05-28:22/1)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.2.10
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.2.10
 
   * hub
     * "requires", fix
@@ -306,7 +306,7 @@ Reverse Chronological:
     * sisupood image copying/processing, broken
 
 * sisu_3.2.9.orig.tar.xz (2012-05-19:20/6)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.2.9
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.2.9
 
   * harvest
     * harvest by filename output paths
@@ -316,7 +316,7 @@ Reverse Chronological:
   * options, create manifest touched
 
 * sisu_3.2.8.orig.tar.xz (2012-05-12:19/6)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.2.8
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.2.8
 
   * sisupod make, re-fixed, check again
 
@@ -337,7 +337,7 @@ Reverse Chronological:
     * rescue & error warnings, more touched
 
 * sisu_3.2.7.orig.tar.xz (2012-05-06:18/7)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.2.7
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.2.7
 
   * hub, options, fixes
     * dbi: pgsql, sqlite
@@ -349,7 +349,7 @@ Reverse Chronological:
   * rescue & error warnings, some touched
 
 * sisu_3.2.6.orig.tar.xz (2012-05-01:18/2)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.2.6
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.2.6
 
   * harvest (metadata, site/document summary) fixes
     * harvest_topics, sort fix
@@ -362,14 +362,14 @@ Reverse Chronological:
     * manifest re-run on (currently generated) translated files if any
 
 * sisu_3.2.5.orig.tar.xz (2012-04-22:16/7)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.2.5
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.2.5
 
   * shared_html_lite, codeblock fix, affecting sql:
     SELECT ocn,body FROM doc_objects WHERE t_is='code';
     SELECT ocn,clean FROM doc_objects;
 
 * sisu_3.2.4.orig.tar.xz (2012-04-21:16/6)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.2.4
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.2.4
 
   * db bugfix in maintenance mode (variable name reused)
 
@@ -381,7 +381,7 @@ Reverse Chronological:
   * rescue reporting
 
 * sisu_3.2.3.orig.tar.xz (2012-04-15:15/7)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.2.3
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.2.3
 
   * param, dal_syntax, document header (simple regex) substitution list
     added, note $ and curly braces are escaped to allow the following:
@@ -398,7 +398,7 @@ Reverse Chronological:
     @make:)
 
 * sisu_3.2.2.orig.tar.xz (2012-04-05:14/4)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.2.2
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.2.2
 
   * reporting
     * urls
@@ -408,7 +408,7 @@ Reverse Chronological:
   * sysenv, path.style (a quick fix, review)
 
 * sisu_3.2.1.orig.tar.xz (2012-03-21:12/3)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.2.1
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.2.1
 
   * documentation sisu_commands, rearranged; update with regard to
     excludes; & discreet sqlite output
@@ -418,7 +418,7 @@ Reverse Chronological:
   * COPYRIGHT add markup samples "Free as in Freedom"
 
 * sisu_3.2.0.orig.tar.xz (2012-03-19:12/1)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.2.0
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.2.0
 
   * start 3.2: merge v3dv (3.2) into v3 (3.1)
     * conf/sisu/v3dv --> conf/sisu/v3
@@ -430,7 +430,7 @@ Reverse Chronological:
     file <http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/>
 
 * sisu_3.1.15.orig.tar.xz (2012-03-12:11/1)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.15
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.1.15
 
   * v3dv: sysenv, ProcessingSettings, start to use hooks to make it possible to
     control (via: the command line; the document markup header, or; the
@@ -492,7 +492,7 @@ Reverse Chronological:
     [proposed next version starts 3.2, (merge dev branch after 3.1.15)]
 
 * sisu_3.1.14.orig.tar.xz (2012-02-14:07/2)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.14
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.1.14
 
   * v3dv: sysenv, output_dir_structure, rewritten, affected code modified
 
@@ -530,7 +530,7 @@ Reverse Chronological:
     [documents not generated until v3.2.0 (when v3dv branch is merged into v3)]
 
 * sisu_3.1.13.orig.tar.xz (2012-02-03:05/5)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.13
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.1.13
 
   * v3 v3dv, path & url links, updates for multi output directory structure
     possibilities (fixes)
@@ -547,7 +547,7 @@ Reverse Chronological:
     <http://vimdoc.sourceforge.net/htmldoc/options.html#cpo-l>
 
 * sisu_3.1.12.orig.tar.xz (2012-01-23:04/1)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.12
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.1.12
 
   * texpdf, tampering with "safe" special character transformations, a fix (that
     may introduce new issues, watch) [in response to report of a pdf title bug
@@ -563,7 +563,7 @@ Reverse Chronological:
     [suggested by, Timothy Hume, used to get sisu texpdf to work on MacOS]
 
 * sisu_3.1.11.orig.tar.xz (2012-01-10:02/2)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.11
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.1.11
 
   * date, year 2012, update
 
@@ -578,13 +578,13 @@ Reverse Chronological:
   * modify.rb, prep script for year update, & changing module & class names
 
 * sisu_3.1.10.orig.tar.xz (2011-12-31:52/6)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.10
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.1.10
 
   * html, epub, (& xml) codeblocks, treatment of '<<' & '>>', fix
     (codeblock, remove legacy match rule, watch)
 
 * sisu_3.1.9.orig.tar.xz (2011-12-19:51/1)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.9
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.1.9
 
   * manually created html files in _sisu/home (*.html) copied as home pages
     (previous behavior was only to copy _sisu/home/index.html)
@@ -600,7 +600,7 @@ Reverse Chronological:
     --glob at this time
 
 * sisu_3.1.8.orig.tar.xz (2011-12-13:50/2)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.8
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.1.8
 
   * texpdf, output by filetype, fix, produce pdf files with language code as
     part of filename (previously written over)
@@ -608,7 +608,7 @@ Reverse Chronological:
   * odf:odt, codeblocks, a match fix, affects e.g. "<<"
 
 * sisu_3.1.7.orig.tar.xz (2011-12-08:49/4)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.7
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.1.7
 
   * dal, codeblocks
     * internal document identifier tags removed, consider
@@ -627,7 +627,7 @@ Reverse Chronological:
     * html
 
 * sisu_3.1.6.orig.tar.xz (2011-12-02:48/5)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.6
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.1.6
 
   * dal, codeblocks, start flush left (no buffer spaces at start of line) to
     allow cut & paste [requested by chals irc.oftc] (fixed issue, numbering of
@@ -646,7 +646,7 @@ Reverse Chronological:
     * removed iconv, required a number of places without being used, watch
 
 * sisu_3.1.5.orig.tar.xz (2011-11-21:47/1)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.5
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.1.5
 
   * images, embedded symbol (previously overlooked, pre use of utf-8)
     * param, sisu markup image regex match
@@ -666,20 +666,20 @@ Reverse Chronological:
     versions of a sisu document in the same directory tree
 
 * sisu_3.1.4.orig.tar.xz (2011-11-11:45/5)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.4
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.1.4
 
   * FileUtils, make more consistent (and explicit) use of
     * explicit calls (more verbose, easier to find)
     * replace system calls
 
 * sisu_3.1.3.orig.tar.xz (2011-11-05:44/6)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.3
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.1.3
 
   * header, @make: :bold: :italic: fix necessary, Re (3.1.2): (bold & italic
     pattern matching) possibility to ignore case (reinstated)
 
 * sisu_3.1.2.orig.tar.xz (2011-10-31:44/1)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.2
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.1.2
 
   * sysenv, skins, a fix
     [return to, identify sisupod more definitively]
@@ -695,7 +695,7 @@ Reverse Chronological:
   * conf/convert/modify.rb minor fixes
 
 * sisu_3.1.1.orig.tar.xz (2011-10-15:41/6)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.1
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.1.1
 
   * odf:odt v1.0
     * make odt header changes easier to track
@@ -705,7 +705,7 @@ Reverse Chronological:
   * manifest, odt url lnk, fix
 
 * sisu_3.1.0.orig.tar.xz (2011-10-03:40/1)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.0
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_3.1.0
 
   * bin/sisu, default sisu version 3
 
diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4
index 072a617a..57e96d75 100644
--- a/data/doc/sisu/CHANGELOG_v4
+++ b/data/doc/sisu/CHANGELOG_v4
@@ -28,14 +28,14 @@ Reverse Chronological:
 --- HEAD --- [closed]
 
 * sisu_4.2.21.orig.tar.xz (2014-01-26:03/7)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.21
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.2.21
 
   [closed]
 
   - bin/sisu changes to simplify switching to new stable and development branches
 
 * sisu_4.2.20.orig.tar.xz (2014-01-20:03/1)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.20
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.2.20
 
   [good time to consider rollover: closing v4 branch, replacing it with v5 &
   introducing v6 for development, proposed for this release + 1]
@@ -45,14 +45,14 @@ Reverse Chronological:
   - sysenv for texpdf, fix for when tex to pdf generator is absent
 
 * sisu_4.2.19.orig.tar.xz (2014-01-17:02/5)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.19
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.2.19
 
   - bin/sisu experimentation
     - start preparing for ruby changes
     - work on fix for bug related to gem path & system installed sisu
 
 * sisu_4.2.18.orig.tar.xz (2014-01-12:01/7)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.18
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.2.18
 
   - texinfo, fixes
 
@@ -60,7 +60,7 @@ Reverse Chronological:
     (multiple document file-sizes may be produced)
 
 * sisu_4.2.17.orig.tar.xz (2014-01-06:01/1)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.17
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.2.17
 
   - bin/sisu
     - (ensure SiSU_version_dir) fix
@@ -74,12 +74,12 @@ Reverse Chronological:
     - html scroll toc, clean links where none, exclude metadata
 
 * sisu_4.2.16.orig.tar.xz (2013-12-15:49/7)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.16
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.2.16
 
   - Rakefile, (installer), reduce actions
 
 * sisu_4.2.15.orig.tar.xz (2013-12-09:49/1)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.15
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.2.15
 
   - Rakefile, (installer) improve, re-arrange
 
@@ -87,7 +87,7 @@ Reverse Chronological:
   work]
 
 * sisu_4.2.14.orig.tar.xz (2013-12-03:48/2)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.14
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.2.14
 
   - rake create build & install sisu gemspec; (.gitignore), work on
     - gemspec adjusted to install only libraries related to a version (v4 or v5)
@@ -96,7 +96,7 @@ Reverse Chronological:
   - bin/sisu, simplify in relation to sisu gem
 
 * sisu_4.2.13.orig.tar.xz (2013-12-02:48/1)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.13
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.2.13
 
   - rake create build & install sisu gemspec; bin/sisugem (add .gitignore)
     - rake gemcbi #(create build install sisu gem)
@@ -121,7 +121,7 @@ Reverse Chronological:
     where library is being drawn)
 
 * sisu_4.2.12.orig.tar.xz (2013-11-08:44/5)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.12
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.2.12
 
   - rake (& rant) sisu installer
     - do less by default
@@ -136,23 +136,23 @@ Reverse Chronological:
     - add sisu-html-scroll, sisu-html-seg, sisu-pdf-portrait, sisu-pdf-landscape
 
 * sisu_4.2.11.orig.tar.xz (2013-11-05:44/2)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.11
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.2.11
 
 [5.0.24 changes only]
 
 * sisu_4.2.10.orig.tar.xz (2013-11-02:43/6)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.10
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.2.10
 
   - constants, ocn output delimiter (where used) changed to 「...」
     (from square brackets [...])
 
 * sisu_4.2.9.orig.tar.xz (2013-10-27:42/7)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.9
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.2.9
 
   - dal, document_structure_check_info
 
 * sisu_4.2.8.orig.tar.xz (2013-10-23:42/3)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.8
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.2.8
 
   - dal, parent & node info, fix
     (used e.g. for mind map type output (last for kdissert output, no longer
@@ -163,14 +163,14 @@ Reverse Chronological:
     markup with straight linear structure
 
 * sisu_4.2.7.orig.tar.xz (2013-10-17:41/4)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.7
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.2.7
 
   - constants, change a couple of internal processing delimiter characters, that
     might be used in ordinary marked up text (to characters even less likely to
     be of use in ordinary (marked up) text)
 
 * sisu_4.2.6.orig.tar.xz (2013-10-16:41/3)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.6
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.2.6
 
   - constants, change a couple of internal processing delimiter characters, that
     might be used in ordinary marked up text
@@ -180,12 +180,12 @@ Reverse Chronological:
   - markup sample, update book index markup, appearance, minor
 
 * sisu_4.2.5.orig.tar.xz (2013-09-22:37/7)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.5
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.2.5
 
   - bin/sisu update language list ja ko zh, fix
 
 * sisu_4.2.4.orig.tar.xz (2013-09-21:37/6)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.4
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.2.4
 
   - i18n CJK: zh ja ko, add languages Chinese, Japanese, Korean
     - texpdf, has large texlive xetex dependencies (Korean untested)
@@ -215,12 +215,12 @@ Reverse Chronological:
   - minor cleaning
 
 * sisu_4.2.3.orig.tar.xz (2013-09-07:35/6)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.3
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.2.3
 
 [5.0.16 changes only]
 
 * sisu_4.2.2.orig.tar.xz (2013-09-05:35/4)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.2
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.2.2
 
   - dal, grouped text with fontface spanning newlines, partial solution, merge
     from 5.0.14
@@ -232,7 +232,7 @@ Reverse Chronological:
   - vim syntax, book index markup, hilight delimeters
 
 * sisu_4.2.1.orig.tar.xz (2013-08-28:34/3)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.1
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.2.1
 
   - config files (by filetype & filename) touched
 
@@ -248,7 +248,7 @@ Reverse Chronological:
   - dal, text blocks, tuning
 
 * sisu_4.2.0.orig.tar.xz (2013-08-25:33/7)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.0
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.2.0
 
   - merge v5
     - syntax add
@@ -269,7 +269,7 @@ Reverse Chronological:
     review further)
 
 * sisu_4.1.12.orig.tar.xz (2013-08-21:33/3)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.1.12
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.1.12
 
   - messages to terminal
     - code marker
@@ -277,12 +277,12 @@ Reverse Chronological:
     - fuchsia (sp.)
 
 * sisu_4.1.11.orig.tar.xz (2013-08-08:31/4)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.1.11
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.1.11
 
   - dal_expand_insertions, refinement for monolingual output
 
 * sisu_4.1.10.orig.tar.xz (2013-08-08:31/4)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.1.10
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.1.10
 
   [merge 5.0.10 lib]
   - output structure by, add monolingual alternative for :filetype or :filename
@@ -307,30 +307,30 @@ Reverse Chronological:
     - monolingual output search form option
 
 * sisu_4.1.9.orig.tar.xz (2013-08-01:30/4)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.1.9
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.1.9
 
 * sisu_4.1.8.orig.tar.xz (2013-07-30:30/2)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.1.8
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.1.8
 
 * sisu_4.1.7.orig.tar.xz (2013-06-25:25/2)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.1.7
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.1.7
 
   - "general code cleaning" fix
 
 * sisu_4.1.6.orig.tar.xz (2013-06-25:25/2)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.1.6
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.1.6
 
   - general code cleaning, sync with v5
 
 * sisu_4.1.5.orig.tar.xz (2013-06-22:23/6)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.1.5
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.1.5
 
   - vim
     - colorscheme def, mark current line
     - ftplugin sisu.vim, c-\ hard wrap lines to line width (moved from c-j)
 
 * sisu_4.1.4.orig.tar.xz (2013-06-06:22/4)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.1.4
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.1.4
 
   - db, population of database (--update), import of master files (.ssm), fix
     (Note: for .ssm: @md.fns (is set during runtime & is) != @opt.fns @md.opt.fns,
@@ -343,14 +343,14 @@ Reverse Chronological:
   - sysenv, requested load warning removed, less screen clutter, consider
 
 * sisu_4.1.3.orig.tar.xz (2013-05-30:21/4)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.1.3
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.1.3
 
   - sysenv, pgsql db connect fix
 
   - cgi_pgsql, cgi helper script, sample search form generator, detail
 
 * sisu_4.1.2.orig.tar.xz (2013-05-29:21/3)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.1.2
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.1.2
 
   - help update, concentrate on man pages
     - documentation, manpage update
@@ -371,7 +371,7 @@ Reverse Chronological:
       db user (pg)                    --db-user=''
 
 * sisu_4.1.1.orig.tar.xz (2013-05-19:19/7)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.1.1
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.1.1
 
   - vim, ftplugin, sisu.vim, statusline
 
@@ -379,7 +379,7 @@ Reverse Chronological:
     'sisu -F')
 
 * sisu_4.1.0.orig.tar.xz (2013-05-08:18/3)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.1.0
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.1.0
 
   - v4:
     - v5 opened
@@ -390,19 +390,19 @@ Reverse Chronological:
   - cgi script for sample search form, minor fixes
 
 * sisu_4.0.21.orig.tar.xz (2013-05-06:18/1)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.21
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.0.21
 
   - minor sysenv, cgi_sql_common
 
 * sisu_4.0.20.orig.tar.xz (2013-04-11:14/4)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.20
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.0.20
 
   - sisurc.yml, reorganize configuration files
 
   - cgi sample search form, minor
 
 * sisu_4.0.19.orig.tar.xz (2013-04-08:14/1)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.19
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.0.19
 
   - sysenv, yamlrc, minor
 
@@ -411,7 +411,7 @@ Reverse Chronological:
   - zap, delete output files, based on given (existing) source file name
 
 * sisu_4.0.18.orig.tar.xz (2013-03-29:12/5)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.18
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.0.18
 
   - dal, screen_text_color, distinguish doc abstraction as start of processing
 
@@ -424,7 +424,7 @@ Reverse Chronological:
     - fixes
 
 * sisu_4.0.17.orig.tar.xz (2013-03-25:12/1)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.17
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.0.17
 
   - manifest & harvest, links to default site home page index.html
 
@@ -437,7 +437,7 @@ Reverse Chronological:
   - hub, non-verbose terminal info reduced, minor
 
 * sisu_4.0.16.orig.tar.xz (2013-03-18:11/1)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.16
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.0.16
 
   - hub, processing flow, sequence, fix
     - re-run manifests at end of general processing run:
@@ -447,14 +447,14 @@ Reverse Chronological:
   - sysenv, epub images where processing multilingual doc in lang code sub-dir
 
 * sisu_4.0.15.orig.tar.xz (2013-03-18:11/1)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.15
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.0.15
 
   - share document source, markup text file &/or sisupod
     - processing flow, correct sequence
     - terminal reporting
 
 * sisu_4.0.14.orig.tar.xz (2013-03-16:10/6)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.14
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.0.14
 
   - harvest, authors, topics, terminal info
 
@@ -468,7 +468,7 @@ Reverse Chronological:
     - backround rsync only for processing of single sisu markup files
 
 * sisu_4.0.13.orig.tar.xz (2013-03-13:10/3)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.13
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.0.13
 
   - html_format, manifest red arrow, next (segment), (broken) link fix, to toc
 
@@ -481,7 +481,7 @@ Reverse Chronological:
   - hub, sql db, fix for actions not requiring files, create, drop, etc.
 
 * sisu_4.0.12.orig.tar.xz (2013-03-08:09/5)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.12
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.0.12
 
   - share_src, sisu source, permissions, make world readable when shared
 
@@ -493,7 +493,7 @@ Reverse Chronological:
    requested action
 
 * sisu_4.0.11.orig.tar.xz (2013-03-06:09/3)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.11
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.0.11
 
   - bin/sisu, expand given path for sisu executable
     (where system sisu not called directly)
@@ -507,7 +507,7 @@ Reverse Chronological:
   - html_format, html segment navigation to toc, fix
 
 * sisu_4.0.10.orig.tar.xz (2013-03-05:09/2)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.10
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.0.10
 
   - texpdf, report to STDERR when pdf not (successfully) generated, note:
     .tex file is almost certainly produced by sisu, this will be a sisu
@@ -520,7 +520,7 @@ Reverse Chronological:
   - html, epub, minor "cleaning" of output
 
 * sisu_4.0.9.orig.tar.xz (2013-02-22:07/5)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.9
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.0.9
 
   - dal, line across page divider -..- introduced, an alternative to page
       break -\\- & =\\=, affects pdf and odf most significantly
@@ -530,7 +530,7 @@ Reverse Chronological:
     - documentation, sisu_markup.sst, man page sisu.1, sisu.1.html
 
 * sisu_4.0.8.orig.tar.xz (2013-02-20:07/3)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.8
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.0.8
 
   - epub
     - tinkering with some headers
@@ -554,7 +554,7 @@ Reverse Chronological:
   - b_epub.png, epub icon (for manifest) updated to use official image
 
 * sisu_4.0.7.orig.tar.xz (2013-02-10:05/7)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.7
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.0.7
 
   - vim, minimal color schemes, minor edits
 
@@ -566,7 +566,7 @@ Reverse Chronological:
      <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=bin/sisu;hb=HEAD>
 
 * sisu_4.0.6.orig.tar.xz (2013-02-07:05/4)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.6
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.0.6
 
   - html, screen reporting for --html-scroll, correctly identify output file
 
@@ -602,7 +602,7 @@ Reverse Chronological:
     - manpage & html
 
 * sisu_4.0.5.orig.tar.xz (2013-02-03:04/7)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.5
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.0.5
 
   - html (options, hub, urls), scroll & seg optionally discrete, individually
       callable
@@ -624,7 +624,7 @@ Reverse Chronological:
     - manpage & html
 
 * sisu_4.0.4.orig.tar.xz (2013-01-31:04/4)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.4
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.0.4
 
   - param_make, :cover_image: regex, less finicky match of image & details
     - [bug reported by Mikael Böök]
@@ -639,7 +639,7 @@ Reverse Chronological:
     (markup specified v auto)
 
 * sisu_4.0.3.orig.tar.xz (2013-01-27:03/7)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.3
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.0.3
 
   - epub some fixing, more documents render in more readers/viewers
     - ncx fix, navpoint_close [bug reported by Mikael Böök, with sample fix toc]
@@ -652,7 +652,7 @@ Reverse Chronological:
     and associated images
 
 * sisu_4.0.2.orig.tar.xz (2013-01-23:03/3)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.2
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.0.2
 
   - epub
     - remove unnecessary conversion of some utf-8 characters to xhtml
@@ -677,7 +677,7 @@ Reverse Chronological:
   - sysenv, debug tag, triggered where output type not set
 
 * sisu_4.0.1.orig.tar.xz (2013-01-01:00/2)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.1
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.0.1
 
   - html_segments (by_filename by_filetype) internal document links do not
     work filenames need to include lang code, fixed
@@ -714,7 +714,7 @@ Reverse Chronological:
   - documentation minor updates and regenerated manpage
 
 * sisu_4.0.0.orig.tar.xz (2012-12-12:50/3)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.0
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_4.0.0
 
   - bin/sisu $0 make possible to run sisu command on/within project dir tree
     (previously sisu needed to be correctly installed with system paths honored)
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index e401eabc..71793c1b 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -27,12 +27,12 @@ Reverse Chronological:
 --- HEAD --- [closed]
 
 ** sisu_5.9.0.orig.tar.xz (2015-04-21:16/2)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.9.0
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.9.0
 
   - merge v6 into v5, and make v6 the default branch, so v5 is legacy
 
 ** sisu_5.8.0.orig.tar.xz (2015-04-20:16/1)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.8.0
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.8.0
 
   - year set 2015 (prepare for the new year)
 
@@ -100,7 +100,7 @@ Reverse Chronological:
   was not accepted)
 
 ** sisu_5.7.2.orig.tar.xz (2014-11-02:43/7)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.7.2
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.7.2
 
   - ao, composite documents, --verbose report to terminal on loading of *.sst,
     fix without fix sisu reports loading of .ssm & .ssi files but not .sst
@@ -115,7 +115,7 @@ Reverse Chronological:
 ** SiSU Frozen - Debian Freeze - ^^ pre Jessie ^^
 
 ** sisu_5.7.1.orig.tar.xz (2014-10-19:41/7)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.7.1
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.7.1
 
   - html
     - html_format, "id"s for objects & footnotes
@@ -132,7 +132,7 @@ Reverse Chronological:
     - cleaner search results
 
 ** sisu_5.7.0.orig.tar.xz (2014-10-12:40/7)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.7.0
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.7.0
 
   - '*_parts', remove defaults.rb & some relics related to sisu skins (long gone)
     - old code removed & substituted as required by *_parts
@@ -160,7 +160,7 @@ Reverse Chronological:
     - epub tune, --maintenance related
 
 ** sisu_5.6.9.orig.tar.xz (2014-10-03:39/5)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.6.9
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.6.9
 
   - --act provides info on current --act0 to --act9 settings (makes it easier to
     make use of acts 0 to 9)
@@ -168,20 +168,20 @@ Reverse Chronological:
   - html, tiny first nudge toward html5 (document headers and minor)
 
 ** sisu_5.6.8.orig.tar.xz (2014-09-28:38/7)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.6.8
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.6.8
 
   - sql, clean searchable text, update for (ao/dal) text representation,
     fix legacy action
 
 ** sisu_5.6.7.orig.tar.xz (2014-09-19:37/5)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.6.7
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.6.7
 
   - vim syntax, sisu.vim, update git url and email address
 
   - update urls to git repo
 
 ** sisu_5.6.6.orig.tar.xz (2014-09-12:36/5)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.6.6
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.6.6
 
   - ao, auto naming (segment & tag), exceptions, avoidance of name collisions
 
@@ -222,7 +222,7 @@ Reverse Chronological:
   - hub, /tmp processing directory checks
 
 ** sisu_5.6.5.orig.tar.xz (2014-09-05:35/5)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.6.5
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.6.5
 
   - ao_doc_str, if faulty document structure, stop; if --no-stop option, skip
     processing document
@@ -243,20 +243,20 @@ Reverse Chronological:
     - harvest_authors, by_filetype, manifest path
 
 ** sisu_5.6.4.orig.tar.xz (2014-09-01:35/1)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.6.4
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.6.4
 
   - cgi_sqlite, allow expansion of variable (default db name), double quotes,
     fix
 
 ** sisu_5.6.3.orig.tar.xz (2014-08-29:34/5)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.6.3
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.6.3
 
   - hub, sisu version info, when & what to report
 
   - dp, texpdf, copyright_and_license, minor fix, used by texpdf
 
 ** sisu_5.6.2.orig.tar.xz (2014-08-20:33/3)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.6.2
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.6.2
 
   - hub_options, introduce "error override" --no-stop or --errors-as-warnings flag
   - start making use of --no-stop command
@@ -272,7 +272,7 @@ Reverse Chronological:
     - emacs
 
 ** sisu_5.6.1.orig.tar.xz (2014-08-12:32/2)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.6.1
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.6.1
 
   - hub, organization & loose ends
     - tweak triggers
@@ -282,7 +282,7 @@ Reverse Chronological:
   - webrick, wb.cgi fixed and omitted (use discarded)
 
 ** sisu_5.6.0.orig.tar.xz (2014-08-08:31/5)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.6.0
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.6.0
 
   - merged v6 (6.2.0)
     - some file renames, fairly extensive
@@ -300,26 +300,26 @@ Reverse Chronological:
     - sql db table structure changed (needs to be rebuilt)
 
 ** sisu_5.5.6.orig.tar.xz (2014-08-08:31/5)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.5.6
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.5.6
 
   - remains as 5.5.5 changes for easier comparison with v6
     - file renames
     - dp, indentation changed
 
 ** sisu_5.5.5.orig.tar.xz (2014-07-29:30/2)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.5.5
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.5.5
 
   - ensure reset of parsed document directory path
     - needed in the case of html for some subsequent processing
 
 ** sisu_5.5.4.orig.tar.xz (2014-07-24:29/4)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.5.4
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.5.4
 
   - ao_numbering, auto name segment, tweak to make behave as intended
     (further testing required)
 
 ** sisu_5.5.3.orig.tar.xz (2014-07-23:29/3)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.5.3
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.5.3
 
   - db, rescue where no tables attempt to initialize db and retry
     (catch db message where no tables and attempt to initialize database)
@@ -328,7 +328,7 @@ Reverse Chronological:
     - make use of action triggers
 
 ** sisu_5.5.2.orig.tar.xz (2014-07-22:29/2)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.5.2
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.5.2
 
   - bin/sisu, hub, hub close (ensure), remove /tmp/ processing dir
 
@@ -349,7 +349,7 @@ Reverse Chronological:
     - processing shortcuts, options, adjust (refinement necessary)
 
 ** sisu_5.5.1.orig.tar.xz (2014-07-15:28/2)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.5.1
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.5.1
 
   - bin/sisu, hub, options, message pass sisu_called_from_directory
 
@@ -373,7 +373,7 @@ Reverse Chronological:
     - document images
 
 ** sisu_5.5.0.orig.tar.xz (2014-07-11:27/5)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.5.0
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.5.0
 
   - ao_numbering,
     - auto name segment, extract "number" from heading, fix
@@ -412,7 +412,7 @@ Reverse Chronological:
     follow rules for ao_composite (described above)
 
 ** sisu_5.4.5.orig.tar.xz (2014-07-07:27/1)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.4.5
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.4.5
 
   - bin/sisu,
     - processing dir related
@@ -430,14 +430,14 @@ Reverse Chronological:
     re: seg numbering, fixed width, leading zeros (introduced: 5.4.3 / 6.0.9)
 
 ** sisu_5.4.4.orig.tar.xz (2014-07-04:26/5)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.4.4
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.4.4
 
   - ao, fix, re seg numbering, fixed width, leading zeros
     (introduced: 5.4.3 / 6.0.9)
     provisional fix (check related issues against 5.4.2 / 6.0.8)
 
 ** sisu_5.4.3.orig.tar.xz (2014-07-01:26/2)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.4.3
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.4.3
 
   - ao,
     - code cosmetic rearrangement
@@ -472,13 +472,13 @@ Reverse Chronological:
   - epub, a fix, double check
 
 ** sisu_5.4.2.orig.tar.xz (2014-06-22:24/7)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.4.2
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.4.2
 
   - ao, fix bug in previous version (5.4.1) from sloppy cherry pick of v6
     ao_doc_str (codeblock)
 
 ** sisu_5.4.1.orig.tar.xz (2014-06-19:24/4)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.4.1
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.4.1
 
   - ao,
     - regex match for tics "```" followed by space tweaked
@@ -489,7 +489,7 @@ Reverse Chronological:
     - misc, minorish
 
 ** sisu_5.4.0.orig.tar.xz (2014-05-25:20/7)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.4.0
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.4.0
 
   - v5: merge v6 to v5, version bump to 5.4.*, reason adds structure check
     - ao, document structure check, stop processing on major error
@@ -543,7 +543,7 @@ Reverse Chronological:
     - xml object citation numbering (docbook fictionbook)
 
 ** sisu_5.3.6.orig.tar.xz (2014-05-18:19/7)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.3.6
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.3.6
 
   - db,
     - use symbols to identify sql engine
@@ -558,7 +558,7 @@ Reverse Chronological:
     - for sqlite: require 'sqlite3' (use ruby-sqlite3 directly)
 
 ** sisu_5.3.5.orig.tar.xz (2014-05-12:19/1)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.3.5
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.3.5
 
   - sisu, ensure return to start dir
 
@@ -584,14 +584,14 @@ Reverse Chronological:
   - added sisu.org emacs:evil:org mode notes related to sisu development
 
 ** sisu_5.3.4.orig.tar.xz (2014-02-14:06/5)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.3.4
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.3.4
 
   - ocn, object citation numbering
     - add perhaps less cryptic --numbering --no-numbering command-line options
     - plaintext & odt switch default to ocn==true for consistency
 
 ** sisu_5.3.3.orig.tar.xz (2014-02-08:05/6)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.3.3
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.3.3
 
   - cgi, search form (generator), using cgi ENV variables
 
@@ -602,7 +602,7 @@ Reverse Chronological:
   - documentation, minor update
 
 ** sisu_5.3.2.orig.tar.xz (2014-02-05:05/3)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.3.2
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.3.2
 
   - ao, html book index linking, follow --strict option
 
@@ -613,7 +613,7 @@ Reverse Chronological:
   - manual Rakefile, README & minor config adjustment
 
 ** sisu_5.3.1.orig.tar.xz (2014-02-05:05/3)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.3.1
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.3.1
 
   - ao, document tags
 
@@ -646,7 +646,7 @@ Reverse Chronological:
     - removed html man pages (man2html)
 
 ** sisu_5.3.0.orig.tar.xz (2014-01-26:03/7)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.3.0
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.3.0
 
   - v5 stable branch
     - v4 branch closed -(>4.2.20)-
@@ -654,13 +654,13 @@ Reverse Chronological:
     - v6 development branch opened (copy v5) (>=6.0.0)
 
 ** sisu_5.2.4.orig.tar.xz (2014-01-26:03/7)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.2.4
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.2.4
 
   - bin/sisu changes to simplify switching to new stable and development
     branches
 
 ** sisu_5.2.3.orig.tar.xz (2014-01-20:03/1)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.2.3
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.2.3
 
 [good time to consider rollover: closing v4 branch, replacing it with v5 &
 introducing v6 for development, proposed for this release + 1]
@@ -670,14 +670,14 @@ introducing v6 for development, proposed for this release + 1]
   - sysenv for texpdf, fix for when tex to pdf generator is absent
 
 ** sisu_5.2.2.orig.tar.xz (2014-01-17:02/5)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.2.2
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.2.2
 
   - bin/sisu experimentation
     - start preparing for ruby changes
     - work on fix for bug related to gem path & system installed sisu
 
 ** sisu_5.2.1.orig.tar.xz (2014-01-12:01/7)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.2.1
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.2.1
 
   - ao, add counter for various grouped / blocked texts & tables, of particular
     use for poems which are broken into verse
@@ -692,7 +692,7 @@ introducing v6 for development, proposed for this release + 1]
   - asciidoc, file extension (for now .ad), inline footnotes, minor
 
 ** sisu_5.2.0.orig.tar.xz (2014-01-06:01/1)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.2.0
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.2.0
 
   - single document root A~ (recalibrate headings); level D~ possible
     - :A~ document title, single document root (ln==0)
@@ -742,12 +742,12 @@ introducing v6 for development, proposed for this release + 1]
   - year updated, code headers
 
 ** sisu_5.1.3.orig.tar.xz (2013-12-15:49/7)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.1.3
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.1.3
 
   - Rakefile, (installer), reduce actions
 
 ** sisu_5.1.2.orig.tar.xz (2013-12-09:49/1)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.1.2
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.1.2
 
   - Rakefile, (installer) improve, re-arrange
 
@@ -757,7 +757,7 @@ introducing v6 for development, proposed for this release + 1]
 [NOTE disk crash (2013-12-05), fairly good but incomplete backup affecting work]
 
 ** sisu_5.1.1.orig.tar.xz (2013-12-03:48/2)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.1.1
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.1.1
 
   - rake create build & install sisu gemspec; (.gitignore), work on
     - gemspec adjusted to install only libraries related to a version (v4 or v5)
@@ -766,7 +766,7 @@ introducing v6 for development, proposed for this release + 1]
   - bin/sisu, simplify in relation to sisu gem
 
 ** sisu_5.1.0.orig.tar.xz (2013-12-02:48/1)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.1.0
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.1.0
 
   - ao_doc_str, changes related to headings provided for document structure
     without ocn, testing required
@@ -829,7 +829,7 @@ introducing v6 for development, proposed for this release + 1]
   - documentation related to commands for new outputs in development
 
 ** sisu_5.0.25.orig.tar.xz (2013-11-08:44/5)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.25
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.0.25
 
   - rake (& rant) sisu installer
     - do less by default
@@ -844,12 +844,12 @@ introducing v6 for development, proposed for this release + 1]
     - add sisu-html-scroll, sisu-html-seg, sisu-pdf-portrait, sisu-pdf-landscape
 
 ** sisu_5.0.24.orig.tar.xz (2013-11-05:44/2)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.24
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.0.24
 
   - xml, scaffold, re-activated, split into sisu structure & collapsed structure
 
 ** sisu_5.0.23.orig.tar.xz (2013-11-02:43/6)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.23
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.0.23
 
   - constants, ocn output delimiter (where used) changed to 「...」
     (from square brackets [...])
@@ -858,12 +858,12 @@ introducing v6 for development, proposed for this release + 1]
     - reorganize
 
 ** sisu_5.0.22.orig.tar.xz (2013-10-27:42/7)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.22
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.0.22
 
   - dal, document_structure_check_info
 
 ** sisu_5.0.21.orig.tar.xz (2013-10-23:42/3)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.21
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.0.21
 
   - options & downstream, more use of opt.act.*.set==:on instead of
     opt.cmd =~/\S/
@@ -877,14 +877,14 @@ introducing v6 for development, proposed for this release + 1]
     markup with straight linear structure
 
 ** sisu_5.0.20.orig.tar.xz (2013-10-17:41/4)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.20
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.0.20
 
   - constants, change a couple of internal processing delimiter characters, that
     might be used in ordinary marked up text (to characters even less likely to
     be of use in ordinary (marked up) text)
 
 ** sisu_5.0.19.orig.tar.xz (2013-10-16:41/3)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.19
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.0.19
 
   - constants, change a couple of internal processing delimiter characters, that
     might be used in ordinary marked up text
@@ -894,12 +894,12 @@ introducing v6 for development, proposed for this release + 1]
   - markup sample, update book index markup, appearance, minor
 
 ** sisu_5.0.18.orig.tar.xz (2013-09-22:37/7)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.18
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.0.18
 
   - bin/sisu update language list ja ko zh, fix
 
 ** sisu_5.0.17.orig.tar.xz (2013-09-21:37/6)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.17
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.0.17
 
   - i18n CJK: zh ja ko, add languages Chinese, Japanese, Korean
     - texpdf, has large texlive xetex dependencies (Korean untested)
@@ -925,14 +925,14 @@ introducing v6 for development, proposed for this release + 1]
   - minor cleaning
 
 ** sisu_5.0.16.orig.tar.xz (2013-09-07:35/6)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.16
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.0.16
 
   - dal, book index, hash key, strip whitespace, a (required) fix
 
   - db, book index, convert hash back to string
 
 ** sisu_5.0.15.orig.tar.xz (2013-09-05:35/4)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.15
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.0.15
 
   - dal, objects, store book index as hash (simplify downstream processing)
 
@@ -943,7 +943,7 @@ introducing v6 for development, proposed for this release + 1]
   - vim syntax, book index markup, hilight delimeters
 
 ** sisu_5.0.14.orig.tar.xz (2013-08-28:34/3)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.14
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.0.14
 
   - config files (by filetype & filename) touched
 
@@ -961,7 +961,7 @@ introducing v6 for development, proposed for this release + 1]
   - odf:odt, footnotes, fix
 
 ** sisu_5.0.13.orig.tar.xz (2013-08-25:33/7)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.13
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.0.13
 
   - dal, refine grouped text open and close using tics "```"
     [note use of "~~" considered but more problematic, (tics not used
@@ -976,7 +976,7 @@ introducing v6 for development, proposed for this release + 1]
     review further)
 
 ** sisu_5.0.12.orig.tar.xz (2013-08-21:33/3)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.12
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.0.12
 
   - syntax add
     - switch ocn off and on for a block of content, line containing only
@@ -998,24 +998,24 @@ introducing v6 for development, proposed for this release + 1]
     - fuchsia (sp.)
 
 ** sisu_5.0.11.orig.tar.xz (2013-08-08:31/4)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.11
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.0.11
 
   - dal_expand_insertions, refinement for monolingual output
 
 ** sisu_5.0.10.orig.tar.xz (2013-08-08:31/4)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.10
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.0.10
 
   - output structure by, multilingual, monolingual filenames tweak
 
 ** sisu_5.0.9.orig.tar.xz (2013-08-01:30/4)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.9
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.0.9
 
   - output structure by :filename or :filetype, multilingual default, fix
 
   - concordance, fix
 
 ** sisu_5.0.8.orig.tar.xz (2013-07-30:30/2)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.8
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.0.8
 
   - output structure by, add monolingual alternative for :filetype or :filename
     - filename without language code, if document is in default language
@@ -1039,17 +1039,17 @@ introducing v6 for development, proposed for this release + 1]
     - monolingual output search form option
 
 ** sisu_5.0.7.orig.tar.xz (2013-06-25:25/2)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.7
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.0.7
 
   - "general code cleaning" fix
 
 ** sisu_5.0.6.orig.tar.xz (2013-06-25:25/2)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.6
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.0.6
 
   - "general code cleaning" fix
 
 ** sisu_5.0.5.orig.tar.xz (2013-06-22:24/6)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.5
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.0.5
 
   - vim
     - colorscheme def, mark current line
@@ -1058,7 +1058,7 @@ introducing v6 for development, proposed for this release + 1]
   - general code cleaning, propagate back to v4 after testing
 
 ** sisu_5.0.4.orig.tar.xz (2013-06-06:22/4)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.4
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.0.4
 
   - db, population of database (--update), import of master files (.ssm), fix
     (Note: for .ssm: @md.fns (is set during runtime & is) != @opt.fns
@@ -1071,14 +1071,14 @@ introducing v6 for development, proposed for this release + 1]
   - sysenv, requested load warning removed, less screen clutter, consider
 
 ** sisu_5.0.3.orig.tar.xz (2013-05-30:21/4)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.3
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.0.3
 
   - sysenv, pgsql db connect fix
 
   - cgi_pgsql, cgi helper script, sample search form generator, detail
 
 ** sisu_5.0.2.orig.tar.xz (2013-05-29:21/3)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.2
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.0.2
 
   - help update, concentrate on man pages
     - documentation, manpage update
@@ -1099,7 +1099,7 @@ introducing v6 for development, proposed for this release + 1]
       db user (pg)                    --db-user=''
 
 ** sisu_5.0.1.orig.tar.xz (2013-05-18:19/7)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.1
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.0.1
 
   - vim, ftplugin, sisu.vim, statusline
 
@@ -1107,7 +1107,7 @@ introducing v6 for development, proposed for this release + 1]
     'sisu -F')
 
 ** sisu_5.0.0.orig.tar.xz (2013-05-08:18/3)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.0
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_5.0.0
 
   - v5: opened
     - v3 closed
diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6
index f6ab1d1e..1f114ea5 100644
--- a/data/doc/sisu/CHANGELOG_v6
+++ b/data/doc/sisu/CHANGELOG_v6
@@ -21,12 +21,12 @@ Reverse Chronological:
 --- HEAD --- [closed]
 
 * sisu_6.5.0.orig.tar.xz (2015-04-21:16/2)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.4.1
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_6.4.1
 
   - v6 made the default branch (prior to restructuring for v7)
 
 * sisu_6.4.0.orig.tar.xz (2015-04-20:16/1)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.4.0
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_6.4.0
 
   - year set 2015 (prepare for the new year)
 
@@ -142,7 +142,7 @@ Reverse Chronological:
   5.7.1-2) was not accepted)
 
 * sisu_6.3.2.orig.tar.xz (2014-11-02:43/7)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.3.2
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_6.3.2
 
   - ao, composite documents, --verbose report to terminal on loading of *.sst,
     fix without fix sisu reports loading of .ssm & .ssi files but not .sst
@@ -157,7 +157,7 @@ Reverse Chronological:
 * SiSU Frozen - Debian Freeze - ^^ pre Jessie ^^
 
 * sisu_6.3.1.orig.tar.xz (2014-10-19:41/7)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.3.1
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_6.3.1
 
   - html
     - html_format, "id"s for objects & footnotes
@@ -174,7 +174,7 @@ Reverse Chronological:
     - cleaner search results
 
 * sisu_6.3.0.orig.tar.xz (2014-10-12:40/7)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.3.0
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_6.3.0
 
   - '*_parts', remove defaults.rb & some relics related to sisu skins (long
     gone)
@@ -199,7 +199,7 @@ Reverse Chronological:
     - epub tune, --maintenance related
 
 * sisu_6.2.10.orig.tar.xz (2014-10-03:39/5)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.2.10
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_6.2.10
 
   - --act provides info on current --act0 to --act9 settings (makes it easier to
     make use of acts 0 to 9)
@@ -207,20 +207,20 @@ Reverse Chronological:
   - html, tiny first nudge toward html5 (document headers and minor)
 
 * sisu_6.2.9.orig.tar.xz (2014-09-28:38/7)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.2.9
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_6.2.9
 
   - sql, clean searchable text, update for (ao/dal) text representation,
     fix legacy action
 
 * sisu_6.2.8.orig.tar.xz (2014-09-19:37/5)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.2.8
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_6.2.8
 
   - vim syntax, sisu.vim, update git url and email address
 
   - update urls to git repo
 
 * sisu_6.2.7.orig.tar.xz (2014-09-12:36/5)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.2.7
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_6.2.7
 
   - ao, auto naming (segment & tag), exceptions, avoidance of name collisions
 
@@ -261,7 +261,7 @@ Reverse Chronological:
   - hub, /tmp processing directory checks
 
 * sisu_6.2.6.orig.tar.xz (2014-09-05:35/5)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.2.6
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_6.2.6
 
   - ao_doc_str, if faulty document structure, stop; if --no-stop option, skip
     processing document
@@ -282,20 +282,20 @@ Reverse Chronological:
     - harvest_authors, by_filetype, manifest path
 
 * sisu_6.2.5.orig.tar.xz (2014-09-01:35/1)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.2.5
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_6.2.5
 
   - cgi_sqlite, allow expansion of variable (default db name), double quotes,
     fix
 
 * sisu_6.2.4.orig.tar.xz (2014-08-29:34/5)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.2.4
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_6.2.4
 
   - hub, sisu version info, when & what to report
 
   - dp, texpdf, copyright_and_license, minor fix, used by texpdf
 
 * sisu_6.2.3.orig.tar.xz (2014-08-20:33/3)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.2.3
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_6.2.3
 
   - hub_options, introduce "error override" --no-stop or --errors-as-warnings
     flag
@@ -312,7 +312,7 @@ Reverse Chronological:
     - emacs
 
 * sisu_6.2.2.orig.tar.xz (2014-08-12:32/2)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.2.2
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_6.2.2
 
   - hub, organization & loose ends
     - tweak triggers
@@ -322,13 +322,13 @@ Reverse Chronological:
   - webrick, wb.cgi fixed and omitted (use discarded)
 
 * sisu_6.2.1.orig.tar.xz (2014-08-08:31/5)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.2.1
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_6.2.1
 
   - extend document structure, headings A - D, 1 - 4
     - sql db table structure changed (needs to be rebuilt)
 
 * sisu_6.2.0.orig.tar.xz (2014-08-08:31/5)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.2.0
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_6.2.0
 
   - some file renames, fairly extensive
 
@@ -343,19 +343,19 @@ Reverse Chronological:
     removed)
 
 * sisu_6.1.5.orig.tar.xz (2014-07-29:30/2)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.1.5
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_6.1.5
 
   - ensure reset of parsed document directory path
     - needed in the case of html for some subsequent processing
 
 * sisu_6.1.4.orig.tar.xz (2014-07-24:29/4)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.1.4
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_6.1.4
 
   - ao_numbering, auto name segment, tweak to make behave as intended
     (further testing required)
 
 * sisu_6.1.3.orig.tar.xz (2014-07-23:29/3)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.1.3
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_6.1.3
 
   - db, rescue where no tables attempt to initialize db and retry
     (catch db message where no tables and attempt to initialize database)
@@ -364,7 +364,7 @@ Reverse Chronological:
     - make use of action triggers
 
 * sisu_6.1.2.orig.tar.xz (2014-07-22:29/2)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.1.2
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_6.1.2
 
   - bin/sisu, hub, hub close (ensure), remove /tmp/ processing dir
 
@@ -385,7 +385,7 @@ Reverse Chronological:
     - processing shortcuts, options, adjust (refinement necessary)
 
 * sisu_6.1.1.orig.tar.xz (2014-07-15:28/2)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.1.1
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_6.1.1
 
   - bin/sisu, hub, options, message pass sisu_called_from_directory
 
@@ -409,7 +409,7 @@ Reverse Chronological:
     - document images
 
 * sisu_6.1.0.orig.tar.xz (2014-07-11:27/5)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.1.0
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_6.1.0
 
   - ao_numbering,
     - auto name segment, extract "number" from heading, fix
@@ -448,7 +448,7 @@ Reverse Chronological:
     follow rules for ao_composite (described above)
 
 * sisu_6.0.11.orig.tar.xz (2014-07-07:27/1)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.0.11
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_6.0.11
 
   - bin/sisu,
     - processing dir related
@@ -466,14 +466,14 @@ Reverse Chronological:
     re: seg numbering, fixed width, leading zeros (introduced: 5.4.3 / 6.0.9)
 
 * sisu_6.0.10.orig.tar.xz (2014-07-04:26/5)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.0.10
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_6.0.10
 
   - ao, fix, re seg numbering, fixed width, leading zeros
     (introduced: 5.4.3 / 6.0.9)
     provisional fix (check related issues against 5.4.2 / 6.0.8)
 
 * sisu_6.0.9.orig.tar.xz (2014-07-01:26/2)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.0.9
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_6.0.9
 
   - ao,
     - code cosmetic rearrangement
@@ -491,7 +491,7 @@ Reverse Chronological:
   - epub, a fix, double check
 
 * sisu_6.0.8.orig.tar.xz (2014-06-19:24/4)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.0.8
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_6.0.8
 
   - ao,
     - regex match for tics "```" followed by space tweaked
@@ -518,10 +518,10 @@ Reverse Chronological:
     - quote block
 
 * sisu_6.0.7.orig.tar.xz (2014-05-25:20/7)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.0.7
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_6.0.7
 
 * sisu_6.0.6.orig.tar.xz (2014-05-18:19/7)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.0.6
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_6.0.6
 
   - db,
     - use symbols to identify sql engine
@@ -536,7 +536,7 @@ Reverse Chronological:
     - for sqlite: require 'sqlite3' (use ruby-sqlite3 directly)
 
 * sisu_6.0.5.orig.tar.xz (2014-05-12:19/1)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.0.5
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_6.0.5
 
   - sisu, ensure return to start dir
 
@@ -608,14 +608,14 @@ Reverse Chronological:
   - added sisu.org emacs:evil:org mode notes related to sisu development
 
 * sisu_6.0.4.orig.tar.xz (2014-02-14:06/5)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.0.4
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_6.0.4
 
   - ocn, object citation numbering
     - add perhaps less cryptic --numbering --no-numbering command-line options
     - plaintext & odt switch default to ocn==true for consistency
 
 * sisu_6.0.3.orig.tar.xz (2014-02-08:05/6)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.0.3
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_6.0.3
 
   - cgi, search form (generator), using cgi ENV variables
 
@@ -626,7 +626,7 @@ Reverse Chronological:
   - documentation, minor update
 
 * sisu_6.0.2.orig.tar.xz (2014-02-05:05/3)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.0.2
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_6.0.2
 
   - ao, html book index linking, follow --strict option
 
@@ -637,7 +637,7 @@ Reverse Chronological:
   - manual Rakefile, README & minor config adjustment
 
 * sisu_6.0.1.orig.tar.xz (2014-02-05:05/3)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.0.1
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_6.0.1
 
   - ao, document tags
 
@@ -670,7 +670,7 @@ Reverse Chronological:
     - removed html man pages (man2html)
 
 * sisu_6.0.0.orig.tar.xz (2014-01-26:03/7)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.0.0
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_6.0.0
 
 * v6 development branch opened
   - v4 branch closed -(>4.2.20)-
diff --git a/data/doc/sisu/CHANGELOG_v7 b/data/doc/sisu/CHANGELOG_v7
index 8bc7224f..a1088f7c 100644
--- a/data/doc/sisu/CHANGELOG_v7
+++ b/data/doc/sisu/CHANGELOG_v7
@@ -16,17 +16,29 @@ v4 branch removed; available in sisu < 4.2.20
 v3 branch removed; available in sisu < 4.1.0
 v2 branch removed; available in sisu =< 3.3.2
 
-  - homepage: <http://sisudoc.org>
+  - homepage: <https://sisudoc.org>
 
 Reverse Chronological:
 
 --- HEAD ---
 
-* sisu_7.2.1.orig.tar.xz (Open commit window: 2019-09-05; Pre-Release)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_7.2.1
+- sisu_7.3.0.orig.tar.xz (Open commit window: 2023-01-30; Pre-Release)
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_7.3.0
+
+- sisu_7.2.2.orig.tar.xz (Open commit window: 2023-01-30; Pre-Release)
+  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_7.2.2
+
+  - bugfix, typo, a duplicated variable
+
+* sisu_7.2.1.orig.tar.xz (2022-04-19:16/3) [subsequently added manually]
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_7.2.1
+
+  - started using nix nix-shell
+
+  - started using emacs org mode
 
 * sisu_7.2.0.orig.tar.xz (2019-09-03:35/2)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_7.2.0
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_7.2.0
 
   - markup modification
     - (markup blocks) distinguish block from group
@@ -36,13 +48,13 @@ Reverse Chronological:
     - code blocks attributes, numberlines
 
 * sisu_7.1.12.orig.tar.xz (2019-07-16:28/2)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_7.1.12
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_7.1.12
 
   - texpdf, indent values, use formula (to replace table)
     values changed to work better with portrait a4 & letter
 
 * sisu_7.1.11.orig.tar.xz (2017-07-14:28/5)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_7.1.11
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_7.1.11
 
   - html, minitoc, set default off
     (requested, as minitoc is sub-optimal for viewing with smaller devices
@@ -53,7 +65,7 @@ Reverse Chronological:
     (Closes: #746742)
 
 * sisu_7.1.10.orig.tar.xz (2017-07-02:26/7)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_7.1.10
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_7.1.10
 
   - sisu.vim (syntax highlighting) back reference related fix,
     (provided by Bram Moolenaar)
@@ -62,12 +74,12 @@ Reverse Chronological:
     (notes update)
 
 * sisu_7.1.9.orig.tar.xz (2016-07-31:30/7)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_7.1.9
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_7.1.9
 
   - html css, (root) heading size
 
 * sisu_7.1.8.orig.tar.xz (2016-02-26:08/5)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_7.1.8
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_7.1.8
 
   - headers
     - rollover year, 2016
@@ -83,14 +95,14 @@ Reverse Chronological:
   - json, an output representation, first pass
 
 * sisu_7.1.7.orig.tar.xz (2016-01-05:01/1)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_7.1.7
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_7.1.7
 
   - emacs sisu-mode.el
     - apply patch from Kevin Ryde of 2015-12-18
     - tic block markup, and minor arrangement
 
 * sisu_7.1.6.orig.tar.xz (2015-12-15:50/2)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_7.1.6
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_7.1.6
 
   - emacs sisu-mode.el & sisu-mode-autoloads.el:
     -  sisu-mode.el, minor update and modify format to reduce diff with FSF
@@ -105,17 +117,17 @@ Reverse Chronological:
   - ao_images, require 'rmagick' (instead of 'RMagick' depreciated)
 
 * sisu_7.1.5.orig.tar.xz (2015-06-02:22/2)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_7.1.5
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_7.1.5
 
   - minor clean
 
 * sisu_7.1.4.orig.tar.xz (2015-05-21:20/4)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_7.1.4
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_7.1.4
 
   - workflow error, 7.1.3 released as pre_release :-p
 
 * sisu_7.1.3.orig.tar.xz (2015-05-21:20/4)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_7.1.3
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_7.1.3
 
   - constants, search, db name, period before and after db version
     - aesthetic change, the current db name base becomes SiSU.7a.
@@ -123,17 +135,17 @@ Reverse Chronological:
     - (database structure is unchanged)
 
 * sisu_7.1.2.orig.tar.xz (2015-05-18:20/1)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_7.1.2
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_7.1.2
 
 * sisu_7.1.1.orig.tar.xz (2015-05-17:19/7)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_7.1.1
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_7.1.1
 
   - qi (quick install) gem install git version option
 
   - bin/sisu, install name check (stable & git versions)
 
 * sisu_7.1.0.orig.tar.xz (2015-05-15:19/5)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_7.1.0
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_7.1.0
 
   - bibliography 1~!bibliography
 
@@ -175,7 +187,7 @@ Reverse Chronological:
   - clean cruft in changelogs
 
 * sisu_7.0.0.orig.tar.xz (2015-05-01:17/5)
-  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_7.0.0
+  https://git.sisudoc.org/projects/sisu/tag/?h=sisu_7.0.0
 
   - v7 opened
     - v5 branch closed (available <= 5.8.0)
diff --git a/data/sisu/version.yml b/data/sisu/version.yml
index ee8f6044..04ac65a4 100644
--- a/data/sisu/version.yml
+++ b/data/sisu/version.yml
@@ -1,5 +1,5 @@
 ---
 :project: SiSU
-:version: 7.2.1_pre_rel
-:date_stamp: 2019w35/4
-:date: "2019-09-05"
+:version: 7.3.0
+:date_stamp: 2023w44/1
+:date: "2023-10-30"
diff --git a/flake.lock b/flake.lock
new file mode 100644
index 00000000..fdf2e45b
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,61 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1694529238,
+        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1697379843,
+        "narHash": "sha256-RcnGuJgC2K/UpTy+d32piEoBXq2M+nVFzM3ah/ZdJzg=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "12bdeb01ff9e2d3917e6a44037ed7df6e6c3df9d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/flake.nix b/flake.nix
new file mode 100644
index 00000000..5e207308
--- /dev/null
+++ b/flake.nix
@@ -0,0 +1,204 @@
+{
+  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 = "0.7.3";
+    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_3_3
+            rubyPackages_3_3.rake
+            rubyPackages_3_3.sqlite3
+            rubyPackages_3_3.thor
+            sqlite
+            jq
+            git
+          ];
+          inherit shellHook;
+        };
+        dsh-epub = mkShell {
+          name = "sisu dev shell for epub output";
+          inherit shell;
+          inherit devEnv;
+          packages = [
+            ruby_3_3
+            rubyPackages_3_3.rake
+            rubyPackages_3_3.sqlite3
+            rubyPackages_3_3.thor
+            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_3_3
+            rubyPackages_3_3.rake
+            rubyPackages_3_3.sqlite3
+            rubyPackages_3_3.thor
+            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_3_3
+            rubyPackages_3_3.rake
+            rubyPackages_3_3.sqlite3
+            rubyPackages_3_3.thor
+            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_3_3
+            rubyPackages_3_3.rake
+            rubyPackages_3_3.sqlite3
+            rubyPackages_3_3.thor
+            sqlite
+            graphicsmagick
+            zip
+            unzip
+            xz
+            jq
+            #git
+          ];
+          inherit shellHook;
+        };
+        dsh-i18n = mkShell {
+          name = "sisu dev shell internationalization, po4a";
+          inherit shell;
+          inherit devEnv;
+          packages = [
+            ruby_3_3
+            rubyPackages_3_3.rake
+            rubyPackages_3_3.sqlite3
+            rubyPackages_3_3.thor
+            sqlite
+            graphicsmagick
+            perl538Packages.Po4a
+            jq
+            #git
+          ];
+          inherit shellHook;
+        };
+        #default = import ./shell.nix {inherit pkgs;};
+      });
+  };
+}
diff --git a/lib/sisu.rb b/lib/sisu.rb
index cf56590d..16b9d701 100644
--- a/lib/sisu.rb
+++ b/lib/sisu.rb
@@ -48,8 +48,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>
 module SiSU_libs
   require_relative 'sisu/hub'                               # sisu/hub.rb
   require_relative 'sisu/se'                                # sisu/se.rb
diff --git a/lib/sisu/air.rb b/lib/sisu/air.rb
index c8c48dc2..239b733f 100644
--- a/lib/sisu/air.rb
+++ b/lib/sisu/air.rb
@@ -48,8 +48,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>
 module SiSU_Air
   require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
   class Source
diff --git a/lib/sisu/ao.rb b/lib/sisu/ao.rb
index 46e43a34..575ea66e 100644
--- a/lib/sisu/ao.rb
+++ b/lib/sisu/ao.rb
@@ -48,8 +48,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>
 module SiSU_AO
   require_relative 'se'                                 # se.rb
     include SiSU_Env
diff --git a/lib/sisu/ao_appendices.rb b/lib/sisu/ao_appendices.rb
index 8c3047fb..94060f16 100644
--- a/lib/sisu/ao_appendices.rb
+++ b/lib/sisu/ao_appendices.rb
@@ -48,8 +48,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>
 module SiSU_AO_Appendices
   class Glossary
     def initialize(md,data)
diff --git a/lib/sisu/ao_character_check.rb b/lib/sisu/ao_character_check.rb
index 56754abe..1c4c1779 100644
--- a/lib/sisu/ao_character_check.rb
+++ b/lib/sisu/ao_character_check.rb
@@ -48,8 +48,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>
 module SiSU_AO_CharacterCheck
   class Check
     def initialize(data)
diff --git a/lib/sisu/ao_composite.rb b/lib/sisu/ao_composite.rb
index 51f561ea..5ec9e093 100644
--- a/lib/sisu/ao_composite.rb
+++ b/lib/sisu/ao_composite.rb
@@ -48,8 +48,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>
 module SiSU_Assemble
   require_relative 'se'                                 # se.rb
   require_relative 'utils_composite'                    # utils_composite.rb
diff --git a/lib/sisu/ao_doc_objects.rb b/lib/sisu/ao_doc_objects.rb
index 0cf52df9..ef9e8211 100644
--- a/lib/sisu/ao_doc_objects.rb
+++ b/lib/sisu/ao_doc_objects.rb
@@ -48,8 +48,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>
 module SiSU_AO_DocumentStructure
   class Extract
     def extract(h,o)
diff --git a/lib/sisu/ao_doc_str.rb b/lib/sisu/ao_doc_str.rb
index 9a46cebf..e87a383c 100644
--- a/lib/sisu/ao_doc_str.rb
+++ b/lib/sisu/ao_doc_str.rb
@@ -48,8 +48,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>
 module SiSU_AO_DocumentStructureExtract
   require_relative 'ao_persist'                     # ao_persist.rb
   class Instantiate < SiSU_Param::Parameters::Instructions
diff --git a/lib/sisu/ao_endnotes.rb b/lib/sisu/ao_endnotes.rb
index ad5532da..04e941bd 100644
--- a/lib/sisu/ao_endnotes.rb
+++ b/lib/sisu/ao_endnotes.rb
@@ -48,8 +48,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>
 module SiSU_AO_Endnotes
   class Endnotes
     def initialize(md,data,endnote_array=nil)
diff --git a/lib/sisu/ao_expand_insertions.rb b/lib/sisu/ao_expand_insertions.rb
index 2269fea0..e9d511c9 100644
--- a/lib/sisu/ao_expand_insertions.rb
+++ b/lib/sisu/ao_expand_insertions.rb
@@ -48,8 +48,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>
 module SiSU_AO_Insertions
   class Insertions
     def initialize(md,data)
diff --git a/lib/sisu/ao_hash_digest.rb b/lib/sisu/ao_hash_digest.rb
index fa883da7..aa09c03e 100644
--- a/lib/sisu/ao_hash_digest.rb
+++ b/lib/sisu/ao_hash_digest.rb
@@ -48,8 +48,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>
 module SiSU_AO_Hash
   require_relative 'shared_markup_alt.rb'               #shared_markup_alt.rb
   class ObjectDigest
diff --git a/lib/sisu/ao_idx.rb b/lib/sisu/ao_idx.rb
index a8a36961..fcf20cee 100644
--- a/lib/sisu/ao_idx.rb
+++ b/lib/sisu/ao_idx.rb
@@ -48,8 +48,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>
 module SiSU_AO_BookIndex
   class BookIndex
     def initialize(md,data,env=nil)
diff --git a/lib/sisu/ao_images.rb b/lib/sisu/ao_images.rb
index 66448e16..e79fb678 100644
--- a/lib/sisu/ao_images.rb
+++ b/lib/sisu/ao_images.rb
@@ -48,8 +48,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>
 module SiSU_AO_Images
   class Images
     begin
diff --git a/lib/sisu/ao_metadata.rb b/lib/sisu/ao_metadata.rb
index b88054c5..9143a96d 100644
--- a/lib/sisu/ao_metadata.rb
+++ b/lib/sisu/ao_metadata.rb
@@ -48,8 +48,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>
 module SiSU_AO_Metadata
   class Metadata
     def initialize(md,metad)
diff --git a/lib/sisu/ao_misc_arrange.rb b/lib/sisu/ao_misc_arrange.rb
index 0501d13a..95ddf6a9 100644
--- a/lib/sisu/ao_misc_arrange.rb
+++ b/lib/sisu/ao_misc_arrange.rb
@@ -48,8 +48,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>
 module SiSU_AO_MiscArrangeText
   class SI
     def initialize(md,data)
diff --git a/lib/sisu/ao_numbering.rb b/lib/sisu/ao_numbering.rb
index 224ee986..4b48bc39 100644
--- a/lib/sisu/ao_numbering.rb
+++ b/lib/sisu/ao_numbering.rb
@@ -48,8 +48,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>
 module SiSU_AO_Numbering
   class Numbering
     attr_accessor :obj,:osp,:ocn,:lv,:name,:index,:comment
diff --git a/lib/sisu/ao_persist.rb b/lib/sisu/ao_persist.rb
index aef0faf4..14d75ff2 100644
--- a/lib/sisu/ao_persist.rb
+++ b/lib/sisu/ao_persist.rb
@@ -48,8 +48,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>
 module SiSU_AO_Persist
   class Persist
     @@persistance=nil
diff --git a/lib/sisu/ao_syntax.rb b/lib/sisu/ao_syntax.rb
index b7b6df87..aadf3890 100644
--- a/lib/sisu/ao_syntax.rb
+++ b/lib/sisu/ao_syntax.rb
@@ -48,8 +48,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>
 module SiSU_AO_Syntax
   class Words
     def initialize(line,md,mkp)
@@ -354,7 +354,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>
diff --git a/lib/sisu/cgi.rb b/lib/sisu/cgi.rb
index 32b2e2d6..8ae7bd55 100644
--- a/lib/sisu/cgi.rb
+++ b/lib/sisu/cgi.rb
@@ -48,8 +48,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>
 module  SiSU_CGI                                        #% database building documents
   require_relative 'se'                                 # se.rb
   require_relative 'cgi_pgsql'                          # cgi_pgsql.rb
diff --git a/lib/sisu/cgi_pgsql.rb b/lib/sisu/cgi_pgsql.rb
index 1028540f..abd9fa60 100644
--- a/lib/sisu/cgi_pgsql.rb
+++ b/lib/sisu/cgi_pgsql.rb
@@ -48,8 +48,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>
 module  SiSU_CGI_PgSQL                                  #% database building documents
   require_relative 'se'                                 # se.rb
   require_relative 'cgi_sql_common'                     # cgi_sql_common.rb
diff --git a/lib/sisu/cgi_sql_common.rb b/lib/sisu/cgi_sql_common.rb
index 688e627c..4b3a14d5 100644
--- a/lib/sisu/cgi_sql_common.rb
+++ b/lib/sisu/cgi_sql_common.rb
@@ -48,8 +48,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>
 module SiSU_CGI_SQL
   class CGI_Common
     def initialize(webserv,opt,image_src,dir)
@@ -59,8 +59,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
@@ -97,7 +97,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,
@@ -105,8 +104,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]
@@ -145,7 +144,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>
@@ -542,8 +541,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" >
diff --git a/lib/sisu/cgi_sqlite.rb b/lib/sisu/cgi_sqlite.rb
index 139ff2d8..79df7076 100644
--- a/lib/sisu/cgi_sqlite.rb
+++ b/lib/sisu/cgi_sqlite.rb
@@ -48,8 +48,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>
 module  SiSU_CGI_SQLite                                 #% database building documents
   require_relative 'se'                                 # se.rb
   require_relative 'cgi_sql_common'                     # cgi_sql_common.rb
diff --git a/lib/sisu/conf.rb b/lib/sisu/conf.rb
index eb6345f6..04c22e13 100644
--- a/lib/sisu/conf.rb
+++ b/lib/sisu/conf.rb
@@ -47,8 +47,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>
 module SiSU_Initialize
   require_relative 'se'                                 # se.rb
     include SiSU_Env
diff --git a/lib/sisu/constants.rb b/lib/sisu/constants.rb
index 8af3ad28..42182d35 100644
--- a/lib/sisu/constants.rb
+++ b/lib/sisu/constants.rb
@@ -48,8 +48,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>
 YEAR='2021'
 Sfx={
   txt:                       '.txt',
@@ -221,7 +221,6 @@ Dx={
 }
 Tex={
   backslash:                 "\\\\",
-  backslash:                 "\\\\",
   tilde:                     '\\\\\\~',
 }
 Px={
diff --git a/lib/sisu/css.rb b/lib/sisu/css.rb
index ad5433ea..20a7dc21 100644
--- a/lib/sisu/css.rb
+++ b/lib/sisu/css.rb
@@ -48,8 +48,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>
 module SiSU_Style
   require_relative 'se'                                 # se.rb
   require_relative 'html_parts'                         # html_parts.rb
diff --git a/lib/sisu/db_columns.rb b/lib/sisu/db_columns.rb
index 517a723c..2fd479e3 100644
--- a/lib/sisu/db_columns.rb
+++ b/lib/sisu/db_columns.rb
@@ -48,8 +48,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>
 module SiSU_DbColumns
   require_relative 'se'                                # se.rb
   require_relative 'db_sqltxt'                         # db_sqltxt.rb
diff --git a/lib/sisu/db_create.rb b/lib/sisu/db_create.rb
index cf04e8e6..2265f0e0 100644
--- a/lib/sisu/db_create.rb
+++ b/lib/sisu/db_create.rb
@@ -48,8 +48,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>
 module SiSU_DbCreate
   require_relative 'db_columns'                         # db_columns.rb
   class Create < SiSU_DbColumns::Columns
diff --git a/lib/sisu/db_dbi.rb b/lib/sisu/db_dbi.rb
index d944cff7..e76e7790 100644
--- a/lib/sisu/db_dbi.rb
+++ b/lib/sisu/db_dbi.rb
@@ -48,8 +48,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>
 module  SiSU_DbDBI
   require_relative 'db_columns'                                             # db_columns.rb
   require_relative 'db_tests'                                               # db_tests.rb
diff --git a/lib/sisu/db_drop.rb b/lib/sisu/db_drop.rb
index d760e181..b0476952 100644
--- a/lib/sisu/db_drop.rb
+++ b/lib/sisu/db_drop.rb
@@ -48,8 +48,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>
 module SiSU_DbDrop
   require_relative 'utils_response'                   # utils_response.rb
   class Drop
diff --git a/lib/sisu/db_import.rb b/lib/sisu/db_import.rb
index d93558eb..4df73f96 100644
--- a/lib/sisu/db_import.rb
+++ b/lib/sisu/db_import.rb
@@ -48,8 +48,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>
 module SiSU_DbImport
   require_relative 'db_columns'                         # db_columns.rb
   require_relative 'db_load_tuple'                      # db_load_tuple.rb
diff --git a/lib/sisu/db_indexes.rb b/lib/sisu/db_indexes.rb
index df98859c..c92cea15 100644
--- a/lib/sisu/db_indexes.rb
+++ b/lib/sisu/db_indexes.rb
@@ -48,8 +48,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>
 module SiSU_DbIndex
   class Index                                           # create documents Indexes def initialize(opt,conn='',sql_type)
     def initialize(opt,conn,file,sql_type)
diff --git a/lib/sisu/db_load_tuple.rb b/lib/sisu/db_load_tuple.rb
index 628fa4d0..d189906d 100644
--- a/lib/sisu/db_load_tuple.rb
+++ b/lib/sisu/db_load_tuple.rb
@@ -48,8 +48,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>
 module SiSU_DbTuple
   require_relative 'db_columns'                         # db_columns.rb
   class LoadDocuments
diff --git a/lib/sisu/db_remove.rb b/lib/sisu/db_remove.rb
index 21573a50..6e6540d2 100644
--- a/lib/sisu/db_remove.rb
+++ b/lib/sisu/db_remove.rb
@@ -48,8 +48,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>
 module SiSU_DbRemove
   class Remove
     include SiSU_DbAction
diff --git a/lib/sisu/db_select.rb b/lib/sisu/db_select.rb
index 5c550320..e0aeca3a 100644
--- a/lib/sisu/db_select.rb
+++ b/lib/sisu/db_select.rb
@@ -48,8 +48,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>
 module SiSU_DbAction
   def db_action(sdb)
     @sdb=sdb
diff --git a/lib/sisu/db_sqltxt.rb b/lib/sisu/db_sqltxt.rb
index f5405cb6..c50c6461 100644
--- a/lib/sisu/db_sqltxt.rb
+++ b/lib/sisu/db_sqltxt.rb
@@ -48,8 +48,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>
 module SiSU_DbText
   class Prepare
     def special_character_escape(str)
diff --git a/lib/sisu/db_tests.rb b/lib/sisu/db_tests.rb
index 8ca93a50..e6594dc2 100644
--- a/lib/sisu/db_tests.rb
+++ b/lib/sisu/db_tests.rb
@@ -48,8 +48,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>
 module SiSU_DbTests
   class Test
     def initialize(info,opt)
diff --git a/lib/sisu/dbi.rb b/lib/sisu/dbi.rb
index 90bddfdc..4d450744 100644
--- a/lib/sisu/dbi.rb
+++ b/lib/sisu/dbi.rb
@@ -48,8 +48,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>
 module  SiSU_DBI                                                                 #% database building
   require_relative 'se'                                 # se.rb
     include SiSU_Env; include SiSU_Screen
diff --git a/lib/sisu/dbi_discrete.rb b/lib/sisu/dbi_discrete.rb
index 1c55824d..2c561a7a 100644
--- a/lib/sisu/dbi_discrete.rb
+++ b/lib/sisu/dbi_discrete.rb
@@ -48,8 +48,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>
 module  SiSU_DBI_Discrete                               #% database building
   require_relative 'se'                                 # se.rb
     include SiSU_Env; include SiSU_Screen
diff --git a/lib/sisu/digests.rb b/lib/sisu/digests.rb
index e3b34d74..6bbe2203 100644
--- a/lib/sisu/digests.rb
+++ b/lib/sisu/digests.rb
@@ -48,8 +48,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>
 module SiSU_DigestView
   require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
   require_relative 'prog_text_translation'              # prog_text_translation.rb
diff --git a/lib/sisu/dp.rb b/lib/sisu/dp.rb
index 68d93001..1e3f04af 100644
--- a/lib/sisu/dp.rb
+++ b/lib/sisu/dp.rb
@@ -48,8 +48,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>
 module SiSU_Param
   begin
     require 'uri'
@@ -1006,7 +1006,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]
diff --git a/lib/sisu/dp_identify_markup.rb b/lib/sisu/dp_identify_markup.rb
index 9216b6bb..9259db0a 100644
--- a/lib/sisu/dp_identify_markup.rb
+++ b/lib/sisu/dp_identify_markup.rb
@@ -48,8 +48,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>
 module SiSU_MarkupType
   class MarkupIdentify
     @@version={}
diff --git a/lib/sisu/dp_make.rb b/lib/sisu/dp_make.rb
index bf26863b..663d73b3 100644
--- a/lib/sisu/dp_make.rb
+++ b/lib/sisu/dp_make.rb
@@ -48,8 +48,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>
 module SiSU_Param_Make
   class MdMake
     def initialize(str,opt,env)
diff --git a/lib/sisu/embedded.rb b/lib/sisu/embedded.rb
index 46530486..efe013aa 100644
--- a/lib/sisu/embedded.rb
+++ b/lib/sisu/embedded.rb
@@ -48,8 +48,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>
 module SiSU_Embedded
   require_relative 'dp'                                 # dp.rb
     include SiSU_Param
diff --git a/lib/sisu/errors.rb b/lib/sisu/errors.rb
index 42e40a2d..ab4f6396 100644
--- a/lib/sisu/errors.rb
+++ b/lib/sisu/errors.rb
@@ -48,8 +48,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>
 module SiSU_Errors
   require_relative 'se'                                 # se.rb
     include SiSU_Env; include SiSU_Screen
diff --git a/lib/sisu/generic_parts.rb b/lib/sisu/generic_parts.rb
index 7d53f34d..fc8a1cfd 100644
--- a/lib/sisu/generic_parts.rb
+++ b/lib/sisu/generic_parts.rb
@@ -48,8 +48,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>
 module SiSU_Parts_Generic
   def the_url
     def urify(uri)
diff --git a/lib/sisu/git.rb b/lib/sisu/git.rb
index abd4e326..f9225506 100644
--- a/lib/sisu/git.rb
+++ b/lib/sisu/git.rb
@@ -48,8 +48,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>
 module SiSU_Git
   require_relative 'dp'                                 # dp.rb
   require_relative 'se'                                 # se.rb
diff --git a/lib/sisu/html.rb b/lib/sisu/html.rb
index 4e95ab7c..11b1e87b 100644
--- a/lib/sisu/html.rb
+++ b/lib/sisu/html.rb
@@ -48,8 +48,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>
 module SiSU_HTML
   begin
     require 'pstore'
diff --git a/lib/sisu/html_concordance.rb b/lib/sisu/html_concordance.rb
index 36c3db88..07629b6e 100644
--- a/lib/sisu/html_concordance.rb
+++ b/lib/sisu/html_concordance.rb
@@ -48,8 +48,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>
 module SiSU_Concordance
   require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
@@ -123,7 +123,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
@@ -156,7 +156,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>
diff --git a/lib/sisu/html_format.rb b/lib/sisu/html_format.rb
index 1e084fd3..3ae5a10e 100644
--- a/lib/sisu/html_format.rb
+++ b/lib/sisu/html_format.rb
@@ -48,8 +48,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>
 module SiSU_HTML_Format
   require_relative 'html_parts'                         # html_parts.rb
   class ParagraphNumber
diff --git a/lib/sisu/html_harvest.rb b/lib/sisu/html_harvest.rb
index 1f679318..fcece884 100644
--- a/lib/sisu/html_harvest.rb
+++ b/lib/sisu/html_harvest.rb
@@ -48,8 +48,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>
 module SiSU_Harvest
   @@the_idx_topics,@@the_idx_authors={},{}
   class Source
diff --git a/lib/sisu/html_harvest_author_format.rb b/lib/sisu/html_harvest_author_format.rb
index 2a20cc58..2b797e0f 100644
--- a/lib/sisu/html_harvest_author_format.rb
+++ b/lib/sisu/html_harvest_author_format.rb
@@ -48,8 +48,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>
 module SiSU_FormatAuthor
   class Author
     def initialize(author_param)
diff --git a/lib/sisu/html_harvest_authors.rb b/lib/sisu/html_harvest_authors.rb
index ebfa4435..7a2aed6a 100644
--- a/lib/sisu/html_harvest_authors.rb
+++ b/lib/sisu/html_harvest_authors.rb
@@ -48,8 +48,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>
 module SiSU_HarvestAuthors
   require_relative 'html_harvest_author_format'          # html_harvest_author_format.rb
   require_relative 'html_parts'                          # html_parts.rb
@@ -319,7 +319,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>
diff --git a/lib/sisu/html_harvest_topics.rb b/lib/sisu/html_harvest_topics.rb
index 7c38086c..04246ea8 100644
--- a/lib/sisu/html_harvest_topics.rb
+++ b/lib/sisu/html_harvest_topics.rb
@@ -48,8 +48,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>
 module SiSU_HarvestTopics
   require_relative 'html_harvest_author_format'          # html_harvest_author_format.rb
   require_relative 'html_parts'                          # html_parts.rb
@@ -685,7 +685,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>
diff --git a/lib/sisu/html_lite_shared.rb b/lib/sisu/html_lite_shared.rb
index 42fef151..0d722d97 100644
--- a/lib/sisu/html_lite_shared.rb
+++ b/lib/sisu/html_lite_shared.rb
@@ -48,8 +48,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>
 module SiSU_FormatShared
   require_relative 'html_parts'                         # html_parts.rb
   class CSS_Format
diff --git a/lib/sisu/html_manifest.rb b/lib/sisu/html_manifest.rb
index 1f0a0fb9..e26cfaf1 100644
--- a/lib/sisu/html_manifest.rb
+++ b/lib/sisu/html_manifest.rb
@@ -48,8 +48,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>
 module SiSU_Manifest
   require_relative 'se'                                 # se.rb
     include SiSU_Env
@@ -896,7 +896,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>
diff --git a/lib/sisu/html_minitoc.rb b/lib/sisu/html_minitoc.rb
index bd3ab758..4bddd34c 100644
--- a/lib/sisu/html_minitoc.rb
+++ b/lib/sisu/html_minitoc.rb
@@ -48,8 +48,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>
 module SiSU_HTML_MiniToc
   require_relative 'html_tune'                        # html_tune.rb
     include SiSU_HTML_Tune
diff --git a/lib/sisu/html_parts.rb b/lib/sisu/html_parts.rb
index 53bbbf08..987b12c6 100644
--- a/lib/sisu/html_parts.rb
+++ b/lib/sisu/html_parts.rb
@@ -48,8 +48,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>
 module SiSU_Parts_HTML
   require_relative 'generic_parts'                       # generic_parts.rb
   include SiSU_Parts_Generic
@@ -374,14 +374,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 />
@@ -393,8 +391,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).
diff --git a/lib/sisu/html_persist.rb b/lib/sisu/html_persist.rb
index d2f0cb82..b59650f7 100644
--- a/lib/sisu/html_persist.rb
+++ b/lib/sisu/html_persist.rb
@@ -48,8 +48,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>
 module SiSU_HTML_Persist
   class Persist
     @@persist=nil
diff --git a/lib/sisu/html_promo.rb b/lib/sisu/html_promo.rb
index 73d45824..4fea0971 100644
--- a/lib/sisu/html_promo.rb
+++ b/lib/sisu/html_promo.rb
@@ -48,8 +48,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>
 module SiSU_HTML_Promo
   require_relative 'se'                                 # se.rb
     include SiSU_Env
diff --git a/lib/sisu/html_scroll.rb b/lib/sisu/html_scroll.rb
index c1b59750..f549a733 100644
--- a/lib/sisu/html_scroll.rb
+++ b/lib/sisu/html_scroll.rb
@@ -48,8 +48,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>
 module SiSU_HTML_Scroll
   require_relative 'html_shared'                        # html_shared.rb
   require_relative 'html'                               # html.rb
diff --git a/lib/sisu/html_segments.rb b/lib/sisu/html_segments.rb
index 4f3953dc..5581f6a8 100644
--- a/lib/sisu/html_segments.rb
+++ b/lib/sisu/html_segments.rb
@@ -48,8 +48,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>
 module SiSU_HTML_Seg
   require_relative 'html_shared'                        # html_shared.rb
   require_relative 'html'                               # html.rb
diff --git a/lib/sisu/html_shared.rb b/lib/sisu/html_shared.rb
index 1cadb563..3023c663 100644
--- a/lib/sisu/html_shared.rb
+++ b/lib/sisu/html_shared.rb
@@ -48,8 +48,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>
 module SiSU_HTML_Shared
   require_relative 'html_table'                         # html_table.rb
   class TableHTML < SiSU_HTML_Table::TableHTML
diff --git a/lib/sisu/html_table.rb b/lib/sisu/html_table.rb
index f59055c1..ea2f0441 100644
--- a/lib/sisu/html_table.rb
+++ b/lib/sisu/html_table.rb
@@ -48,8 +48,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>
 module SiSU_HTML_Table
   require_relative 'xhtml_table'                         # xhtml_table.rb
   require_relative 'html_parts'                          # html_parts.rb
diff --git a/lib/sisu/html_tune.rb b/lib/sisu/html_tune.rb
index b4b5d9f5..89ff0f0f 100644
--- a/lib/sisu/html_tune.rb
+++ b/lib/sisu/html_tune.rb
@@ -48,8 +48,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>
 require_relative 'dp'                                   # dp.rb
 module SiSU_HTML_Tune
   require_relative 'se'                                 # se.rb
diff --git a/lib/sisu/hub.rb b/lib/sisu/hub.rb
index 2a9d4a01..7350d469 100644
--- a/lib/sisu/hub.rb
+++ b/lib/sisu/hub.rb
@@ -48,8 +48,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>
 module SiSU
   require_relative 'constants'                         # constants.rb
   require_relative 'se'                                # se.rb
diff --git a/lib/sisu/hub_actions.rb b/lib/sisu/hub_actions.rb
index 307446ca..a943f43e 100644
--- a/lib/sisu/hub_actions.rb
+++ b/lib/sisu/hub_actions.rb
@@ -48,8 +48,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>
 module SiSU_Hub_Actions
   class HubActions
     require_relative 'utils_composite'                    # utils_composite.rb
diff --git a/lib/sisu/hub_loop_markup_files.rb b/lib/sisu/hub_loop_markup_files.rb
index 4bf5e04d..2a4f5e20 100644
--- a/lib/sisu/hub_loop_markup_files.rb
+++ b/lib/sisu/hub_loop_markup_files.rb
@@ -48,8 +48,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>
 module SiSU_Hub_Loops
   require_relative 'constants'                         # constants.rb
   require_relative 'se'                                # se.rb
diff --git a/lib/sisu/hub_options.rb b/lib/sisu/hub_options.rb
index a3b70837..6bfa5eef 100644
--- a/lib/sisu/hub_options.rb
+++ b/lib/sisu/hub_options.rb
@@ -48,8 +48,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>
 module SiSU_Commandline
   begin
     require 'pathname'
diff --git a/lib/sisu/i18n.rb b/lib/sisu/i18n.rb
index 3b497718..43ff22e1 100644
--- a/lib/sisu/i18n.rb
+++ b/lib/sisu/i18n.rb
@@ -48,8 +48,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>
 module SiSU_i18n
   @@language_table,@@language_list=nil,nil
   class Languages
diff --git a/lib/sisu/json.rb b/lib/sisu/json.rb
index 1edef6a3..a1e922d6 100644
--- a/lib/sisu/json.rb
+++ b/lib/sisu/json.rb
@@ -48,8 +48,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>
 module SiSU_JSON
   require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
diff --git a/lib/sisu/json_format.rb b/lib/sisu/json_format.rb
index da8e90ab..d55f6eb5 100644
--- a/lib/sisu/json_format.rb
+++ b/lib/sisu/json_format.rb
@@ -48,8 +48,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>
 module SiSU_JSON_Format
   require_relative 'dp'                                 # dp.rb
   require_relative 'json_parts'                         # json_parts.rb
diff --git a/lib/sisu/json_parts.rb b/lib/sisu/json_parts.rb
index b169aad7..d7f9c904 100644
--- a/lib/sisu/json_parts.rb
+++ b/lib/sisu/json_parts.rb
@@ -48,8 +48,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>
 module SiSU_Parts_JSON
   require_relative 'generic_parts'                       # generic_parts.rb
   include SiSU_Parts_Generic
diff --git a/lib/sisu/json_persist.rb b/lib/sisu/json_persist.rb
index e65cdf46..acf3def7 100644
--- a/lib/sisu/json_persist.rb
+++ b/lib/sisu/json_persist.rb
@@ -48,8 +48,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>
 module SiSU_JSON_Persist
   class Persist
     @@persist=nil
diff --git a/lib/sisu/json_shared.rb b/lib/sisu/json_shared.rb
index ca4c59da..673a107d 100644
--- a/lib/sisu/json_shared.rb
+++ b/lib/sisu/json_shared.rb
@@ -48,8 +48,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>
 module SiSU_JSONutils
   require_relative 'generic_parts'                      # generic_parts.rb
   class Clean
@@ -634,7 +634,7 @@ module SiSU_XML_Tags #Format
      * #{rubyv}
      * #{sc}
      * #{lastdone}
-     * SiSU http://www.jus.uio.no/sisu
+     * SiSU https://git.sisudoc.org/
 -->
 WOK
      else
@@ -645,7 +645,7 @@ WOK
      * #{rubyv}
      * #{sc}
      * #{lastdone}
-     * SiSU http://www.jus.uio.no/sisu
+     * SiSU https://git.sisudoc.org/
 -->
 WOK
       end
diff --git a/lib/sisu/manpage.rb b/lib/sisu/manpage.rb
index 7ab45f66..4f8a0dc3 100644
--- a/lib/sisu/manpage.rb
+++ b/lib/sisu/manpage.rb
@@ -48,8 +48,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>
 module SiSU_Manpage
   require_relative 'ao'                                 # ao.rb
   require_relative 'se'                                 # se.rb
@@ -173,7 +173,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/>
diff --git a/lib/sisu/manpage_format.rb b/lib/sisu/manpage_format.rb
index 8a033a52..99559511 100644
--- a/lib/sisu/manpage_format.rb
+++ b/lib/sisu/manpage_format.rb
@@ -48,8 +48,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>
 module SiSU_ManpageFormat
   require_relative 'dp'                                 # dp.rb
     include SiSU_Param
diff --git a/lib/sisu/object_munge.rb b/lib/sisu/object_munge.rb
index 1e5cffce..575fda36 100644
--- a/lib/sisu/object_munge.rb
+++ b/lib/sisu/object_munge.rb
@@ -48,8 +48,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>
 module SiSU_Object_Munge
   def i_src_o_strip_markup(txtobj)
     txtobj=txtobj.
diff --git a/lib/sisu/prog_text_translation.rb b/lib/sisu/prog_text_translation.rb
index bfa96b8a..bc425b4f 100644
--- a/lib/sisu/prog_text_translation.rb
+++ b/lib/sisu/prog_text_translation.rb
@@ -48,8 +48,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>
 module SiSU_Translate
   require_relative 'se'                                 # se.rb
     include SiSU_Env; include SiSU_Param
diff --git a/lib/sisu/qrcode.rb b/lib/sisu/qrcode.rb
index f038f602..98452f52 100644
--- a/lib/sisu/qrcode.rb
+++ b/lib/sisu/qrcode.rb
@@ -48,8 +48,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>
 module SiSU_QRcode
   require_relative 'se'                                 # se.rb
     include SiSU_Env
diff --git a/lib/sisu/relaxng.rb b/lib/sisu/relaxng.rb
index 3283b753..5b3d6c5d 100644
--- a/lib/sisu/relaxng.rb
+++ b/lib/sisu/relaxng.rb
@@ -48,8 +48,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>
 module SiSU_Relaxng
   require_relative 'se'                                 # se.rb
   class RelaxNG
@@ -89,7 +89,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,
@@ -97,8 +96,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]
diff --git a/lib/sisu/remote.rb b/lib/sisu/remote.rb
index 7f72cea6..8a8452bf 100644
--- a/lib/sisu/remote.rb
+++ b/lib/sisu/remote.rb
@@ -48,8 +48,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>
 module SiSU_Remote
   require_relative 'se'                                 # se.rb
     include SiSU_Env
diff --git a/lib/sisu/rexml.rb b/lib/sisu/rexml.rb
index 9f152e1b..835551a7 100644
--- a/lib/sisu/rexml.rb
+++ b/lib/sisu/rexml.rb
@@ -48,8 +48,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>
 module SiSU_Rexml
   # load XML file for REXML parsing
   begin
diff --git a/lib/sisu/se.rb b/lib/sisu/se.rb
index 7c396854..240c0486 100644
--- a/lib/sisu/se.rb
+++ b/lib/sisu/se.rb
@@ -48,8 +48,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>
 module SiSU_Env
   #@@cX=nil
   require_relative 'constants'                         # constants.rb
diff --git a/lib/sisu/se_cleanoutput.rb b/lib/sisu/se_cleanoutput.rb
index 2ee29834..289c983b 100644
--- a/lib/sisu/se_cleanoutput.rb
+++ b/lib/sisu/se_cleanoutput.rb
@@ -48,8 +48,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>
 module SiSU_Clean_Output
   require_relative 'constants'                             # constants.rb
   require_relative 'utils'                                 # utils.rb
diff --git a/lib/sisu/se_clear.rb b/lib/sisu/se_clear.rb
index 0bf8a0b8..aabe7412 100644
--- a/lib/sisu/se_clear.rb
+++ b/lib/sisu/se_clear.rb
@@ -48,8 +48,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>
 module SiSU_Clear
   require_relative 'constants'                             # constants.rb
   require_relative 'utils'                                 # utils.rb
@@ -80,7 +80,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
diff --git a/lib/sisu/se_createsite.rb b/lib/sisu/se_createsite.rb
index f998f43d..f7733ac9 100644
--- a/lib/sisu/se_createsite.rb
+++ b/lib/sisu/se_createsite.rb
@@ -48,8 +48,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>
 module SiSU_Create_Site
   require_relative 'constants'                             # constants.rb
   require_relative 'html_parts'                            # html_parts.rb
diff --git a/lib/sisu/se_css.rb b/lib/sisu/se_css.rb
index 4ea54274..8bade336 100644
--- a/lib/sisu/se_css.rb
+++ b/lib/sisu/se_css.rb
@@ -48,8 +48,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>
 module SiSU_CSS
   require_relative 'constants'                             # constants.rb
   require_relative 'utils'                                 # utils.rb
diff --git a/lib/sisu/se_date.rb b/lib/sisu/se_date.rb
index 83a527d6..d53fb89d 100644
--- a/lib/sisu/se_date.rb
+++ b/lib/sisu/se_date.rb
@@ -48,8 +48,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>
 module SiSU_Info_Date
   require_relative 'constants'                             # constants.rb
   require_relative 'utils'                                 # utils.rb
diff --git a/lib/sisu/se_db.rb b/lib/sisu/se_db.rb
index 16161d6a..a78461b8 100644
--- a/lib/sisu/se_db.rb
+++ b/lib/sisu/se_db.rb
@@ -48,8 +48,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>
 module SiSU_Info_Db
   require_relative 'constants'                             # constants.rb
   require_relative 'utils'                                 # utils.rb
diff --git a/lib/sisu/se_envcall.rb b/lib/sisu/se_envcall.rb
index b93396e5..59685832 100644
--- a/lib/sisu/se_envcall.rb
+++ b/lib/sisu/se_envcall.rb
@@ -48,8 +48,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>
 module SiSU_Env_Call
   begin
     require 'singleton'
diff --git a/lib/sisu/se_file_op.rb b/lib/sisu/se_file_op.rb
index 671da8cc..c70297be 100644
--- a/lib/sisu/se_file_op.rb
+++ b/lib/sisu/se_file_op.rb
@@ -48,8 +48,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>
 module SiSU_Info_File
   require_relative 'utils'                                 # utils.rb
   require_relative 'se_info_env'                           # se_info_env.rb
diff --git a/lib/sisu/se_filemap.rb b/lib/sisu/se_filemap.rb
index f1ec5200..02ee51f6 100644
--- a/lib/sisu/se_filemap.rb
+++ b/lib/sisu/se_filemap.rb
@@ -48,8 +48,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>
 module SiSU_File_Map
   require_relative 'constants'                             # constants.rb
   require_relative 'utils'                                 # utils.rb
diff --git a/lib/sisu/se_get_init.rb b/lib/sisu/se_get_init.rb
index 871aa740..52bbf18c 100644
--- a/lib/sisu/se_get_init.rb
+++ b/lib/sisu/se_get_init.rb
@@ -48,8 +48,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>
 module SiSU_Get_Init
   require_relative 'constants'                             # constants.rb
   require_relative 'utils'                                 # utils.rb
diff --git a/lib/sisu/se_hub_particulars.rb b/lib/sisu/se_hub_particulars.rb
index d32d9215..569f63c4 100644
--- a/lib/sisu/se_hub_particulars.rb
+++ b/lib/sisu/se_hub_particulars.rb
@@ -48,8 +48,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>
 module SiSU_Particulars
   begin
     require 'singleton'
diff --git a/lib/sisu/se_info_env.rb b/lib/sisu/se_info_env.rb
index df0b9c95..737c495d 100644
--- a/lib/sisu/se_info_env.rb
+++ b/lib/sisu/se_info_env.rb
@@ -48,8 +48,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>
 module SiSU_Info_Env
   @@current_document=Dir.pwd #nil #''
   require_relative 'se_envcall'                            # se_envcall.rb
diff --git a/lib/sisu/se_info_port.rb b/lib/sisu/se_info_port.rb
index 860d5bf5..ffdac166 100644
--- a/lib/sisu/se_info_port.rb
+++ b/lib/sisu/se_info_port.rb
@@ -48,8 +48,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>
 module SiSU_Info_Port
   require_relative 'constants'                             # constants.rb
   require_relative 'utils'                                 # utils.rb
diff --git a/lib/sisu/se_info_system.rb b/lib/sisu/se_info_system.rb
index 4ebacb83..6d770c6f 100644
--- a/lib/sisu/se_info_system.rb
+++ b/lib/sisu/se_info_system.rb
@@ -48,8 +48,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>
 module SiSU_Info_Sys_Gen
   require_relative 'constants'                             # constants.rb
   require_relative 'utils'                                 # utils.rb
diff --git a/lib/sisu/se_load.rb b/lib/sisu/se_load.rb
index a81ca29a..e9b3e084 100644
--- a/lib/sisu/se_load.rb
+++ b/lib/sisu/se_load.rb
@@ -48,8 +48,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>
 module SiSU_Load
   require_relative 'constants'                             # constants.rb
   require_relative 'utils'                                 # utils.rb
diff --git a/lib/sisu/se_processing.rb b/lib/sisu/se_processing.rb
index 9b96a9da..550f6d17 100644
--- a/lib/sisu/se_processing.rb
+++ b/lib/sisu/se_processing.rb
@@ -48,8 +48,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>
 module SiSU_Processing_Settings
   require_relative 'constants'                             # constants.rb
   require_relative 'utils'                                 # utils.rb
diff --git a/lib/sisu/se_programs.rb b/lib/sisu/se_programs.rb
index ea696107..4730a10e 100644
--- a/lib/sisu/se_programs.rb
+++ b/lib/sisu/se_programs.rb
@@ -48,8 +48,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>
 module SiSU_Sys_Call
   begin
     require 'singleton'
@@ -304,6 +304,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
diff --git a/lib/sisu/se_remotes.rb b/lib/sisu/se_remotes.rb
index d12ebd8d..0b3eb69d 100644
--- a/lib/sisu/se_remotes.rb
+++ b/lib/sisu/se_remotes.rb
@@ -48,8 +48,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>
 module SiSU_Info_Remote_Host
   require_relative 'constants'                             # constants.rb
   require_relative 'utils'                                 # utils.rb
diff --git a/lib/sisu/se_standardise_lang.rb b/lib/sisu/se_standardise_lang.rb
index c8128262..06ab1fa6 100644
--- a/lib/sisu/se_standardise_lang.rb
+++ b/lib/sisu/se_standardise_lang.rb
@@ -48,8 +48,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>
 module SiSU_Standardise_Lang
   @@lang_info=nil
   class StandardiseLanguage
diff --git a/lib/sisu/se_version.rb b/lib/sisu/se_version.rb
index d06120f2..6370fcaa 100644
--- a/lib/sisu/se_version.rb
+++ b/lib/sisu/se_version.rb
@@ -48,8 +48,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>
 module SiSU_Info_Version
   require_relative 'constants'                             # constants.rb
   require_relative 'utils'                                 # utils.rb
@@ -165,7 +165,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
diff --git a/lib/sisu/shared_images.rb b/lib/sisu/shared_images.rb
index e2eecdda..bc57c4b0 100644
--- a/lib/sisu/shared_images.rb
+++ b/lib/sisu/shared_images.rb
@@ -48,8 +48,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>
 module SiSU_Images
   require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
   class Source
diff --git a/lib/sisu/shared_markup_alt.rb b/lib/sisu/shared_markup_alt.rb
index 1cbc7dd9..4f900801 100644
--- a/lib/sisu/shared_markup_alt.rb
+++ b/lib/sisu/shared_markup_alt.rb
@@ -48,8 +48,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>
 module SiSU_TextRepresentation
   class Alter
     def initialize(x)
diff --git a/lib/sisu/shared_metadata.rb b/lib/sisu/shared_metadata.rb
index b5c01982..6d5597bf 100644
--- a/lib/sisu/shared_metadata.rb
+++ b/lib/sisu/shared_metadata.rb
@@ -48,8 +48,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>
 module SiSU_Metadata
   require_relative 'xml_parts'                          # xml_parts.rb
   require_relative 'xml_shared'                         # xml_shared.rb
@@ -881,7 +881,7 @@ WOK
 #{Ax[:tab]*2}#{inf_xml}
 #{Ax[:tab]}</#{@attrib}>
 #{Ax[:tab]}</metadata>
-	<br />
+  <br />
 WOK
       end
       def metadata
diff --git a/lib/sisu/shared_sem.rb b/lib/sisu/shared_sem.rb
index d33252af..2b9c79d0 100644
--- a/lib/sisu/shared_sem.rb
+++ b/lib/sisu/shared_sem.rb
@@ -48,8 +48,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>
 module SiSU_Sem
   require_relative 'dp'                                 # dp.rb
   class Tags
diff --git a/lib/sisu/sisu_thor_lib.rb b/lib/sisu/sisu_thor_lib.rb
index a674eba4..b27601a0 100644
--- a/lib/sisu/sisu_thor_lib.rb
+++ b/lib/sisu/sisu_thor_lib.rb
@@ -29,14 +29,14 @@
 #    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,
@@ -44,12 +44,12 @@
 #    - 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>
 module SiSU_Po4a_Actions
   require_relative 'utils_response'                   # utils_response.rb
   include SiSU_Response
diff --git a/lib/sisu/sitemaps.rb b/lib/sisu/sitemaps.rb
index 8bb20bf6..5f2dc422 100644
--- a/lib/sisu/sitemaps.rb
+++ b/lib/sisu/sitemaps.rb
@@ -48,8 +48,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>
 module SiSU_Sitemaps
   require_relative 'dp'                                 # dp.rb
     include SiSU_Param
@@ -216,5 +216,5 @@ __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
 -->
diff --git a/lib/sisu/src_kdissert_share.rb b/lib/sisu/src_kdissert_share.rb
index 144ca483..c447bd9a 100644
--- a/lib/sisu/src_kdissert_share.rb
+++ b/lib/sisu/src_kdissert_share.rb
@@ -48,8 +48,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>
 module SiSU_KdiSource
   require_relative 'se'                                 # se.rb
     include SiSU_Env
diff --git a/lib/sisu/src_po4a_share.rb b/lib/sisu/src_po4a_share.rb
index 5adb94f0..ea000af0 100644
--- a/lib/sisu/src_po4a_share.rb
+++ b/lib/sisu/src_po4a_share.rb
@@ -48,8 +48,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>
 module SiSU_Languages_Selected
   require_relative 'utils_response'                   # utils_response.rb
   def language
diff --git a/lib/sisu/src_po4a_shelf.rb b/lib/sisu/src_po4a_shelf.rb
index a3136dff..b0aac05e 100644
--- a/lib/sisu/src_po4a_shelf.rb
+++ b/lib/sisu/src_po4a_shelf.rb
@@ -48,8 +48,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>
 module SiSU_Po4a
   require_relative 'ao'                                 # ao.rb
   require_relative 'se'                                 # se.rb
diff --git a/lib/sisu/src_po4a_shelf_set.rb b/lib/sisu/src_po4a_shelf_set.rb
index 90cc280b..14727d5e 100644
--- a/lib/sisu/src_po4a_shelf_set.rb
+++ b/lib/sisu/src_po4a_shelf_set.rb
@@ -48,8 +48,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>
 module SiSU_Po4aUtils
   class Wrap
     def initialize(md,orig='',trans='',is_desc='',n_char_max=76,n_indent=0,n_hang=nil)
diff --git a/lib/sisu/src_po4a_sst_ao_sst.rb b/lib/sisu/src_po4a_sst_ao_sst.rb
index 0079ef5a..d8dde18e 100644
--- a/lib/sisu/src_po4a_sst_ao_sst.rb
+++ b/lib/sisu/src_po4a_sst_ao_sst.rb
@@ -48,8 +48,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>
 module SiSU_SStm_AO_SStm
   require_relative 'ao'                                 # ao.rb
   require_relative 'se'                                 # se.rb
diff --git a/lib/sisu/src_po4a_sst_ao_sst_set.rb b/lib/sisu/src_po4a_sst_ao_sst_set.rb
index 7a59ad3f..f89c77c3 100644
--- a/lib/sisu/src_po4a_sst_ao_sst_set.rb
+++ b/lib/sisu/src_po4a_sst_ao_sst_set.rb
@@ -48,8 +48,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>
 module SiSU_Po4aUtils
   class Wrap
     def initialize(md,orig='',trans='',n_char_max=76,n_indent=0,n_hang=nil)
diff --git a/lib/sisu/src_po4a_sstm.rb b/lib/sisu/src_po4a_sstm.rb
index 063283ef..bef8102f 100644
--- a/lib/sisu/src_po4a_sstm.rb
+++ b/lib/sisu/src_po4a_sstm.rb
@@ -48,8 +48,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>
 module SiSU_Markup
   require_relative 'src_shared'                         # src_shared.rb
     include SiSU_Source
diff --git a/lib/sisu/src_shared.rb b/lib/sisu/src_shared.rb
index b1b4e37f..2c17352b 100644
--- a/lib/sisu/src_shared.rb
+++ b/lib/sisu/src_shared.rb
@@ -48,8 +48,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>
 module SiSU_Source
   include SiSU_Env
   class SiSUpodSource
diff --git a/lib/sisu/src_sisupod_make.rb b/lib/sisu/src_sisupod_make.rb
index c558a3b8..fc5e208c 100644
--- a/lib/sisu/src_sisupod_make.rb
+++ b/lib/sisu/src_sisupod_make.rb
@@ -48,8 +48,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>
 module SiSU_Doc
   require_relative 'src_shared'                         # scr_shared.rb
     include SiSU_Source
diff --git a/lib/sisu/src_sisupod_sstm.rb b/lib/sisu/src_sisupod_sstm.rb
index a3cacbd9..52de1e7d 100644
--- a/lib/sisu/src_sisupod_sstm.rb
+++ b/lib/sisu/src_sisupod_sstm.rb
@@ -48,8 +48,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>
 module SiSU_Markup
   require_relative 'src_shared'                         # src_shared.rb
     include SiSU_Source
diff --git a/lib/sisu/sst_convert_markup.rb b/lib/sisu/sst_convert_markup.rb
index b839bf26..14a67b0e 100644
--- a/lib/sisu/sst_convert_markup.rb
+++ b/lib/sisu/sst_convert_markup.rb
@@ -48,8 +48,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>
 module SiSU_Modify
   require_relative 'sst_identify_markup'                # sst_identify_markup.rb
   require_relative 'sst_from_xml'                       # sst_from_xml.rb
diff --git a/lib/sisu/sst_do_inline_footnotes.rb b/lib/sisu/sst_do_inline_footnotes.rb
index b5610375..64d11d11 100644
--- a/lib/sisu/sst_do_inline_footnotes.rb
+++ b/lib/sisu/sst_do_inline_footnotes.rb
@@ -48,8 +48,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>
 module SiSU_ConvertFootnotes
   require_relative 'se'                                 # se.rb
     include SiSU_Env
diff --git a/lib/sisu/sst_from_xml.rb b/lib/sisu/sst_from_xml.rb
index d699b2fa..25da9406 100644
--- a/lib/sisu/sst_from_xml.rb
+++ b/lib/sisu/sst_from_xml.rb
@@ -48,8 +48,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>
 module SiSU_sstFromXML
   require_relative 'se'                                 # se.rb
   class Convert
diff --git a/lib/sisu/sst_identify_markup.rb b/lib/sisu/sst_identify_markup.rb
index 77b0daad..59f078fa 100644
--- a/lib/sisu/sst_identify_markup.rb
+++ b/lib/sisu/sst_identify_markup.rb
@@ -48,8 +48,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>
 module SiSU_Markup
   class MarkupInform
     attr_accessor :version
diff --git a/lib/sisu/sst_to_s_xml_sax.rb b/lib/sisu/sst_to_s_xml_sax.rb
index 796d5f4b..5405ff60 100644
--- a/lib/sisu/sst_to_s_xml_sax.rb
+++ b/lib/sisu/sst_to_s_xml_sax.rb
@@ -48,8 +48,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>
 module SiSU_SimpleXML_ModelSax
   require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
diff --git a/lib/sisu/termsheet.rb b/lib/sisu/termsheet.rb
index 80a182e6..c8fa1405 100644
--- a/lib/sisu/termsheet.rb
+++ b/lib/sisu/termsheet.rb
@@ -48,8 +48,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>
 require_relative 'se'                                   # se.rb
 require_relative 'dp'                                   # dp.rb
   include SiSU_Param
diff --git a/lib/sisu/texinfo.rb b/lib/sisu/texinfo.rb
index e99fb84f..bc1357ad 100644
--- a/lib/sisu/texinfo.rb
+++ b/lib/sisu/texinfo.rb
@@ -48,8 +48,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>
 module SiSU_TexInfo
   require_relative 'html'                               # html.rb
   require_relative 'dp'                                 # dp.rb
diff --git a/lib/sisu/texinfo_format.rb b/lib/sisu/texinfo_format.rb
index e33086fc..fc5f0673 100644
--- a/lib/sisu/texinfo_format.rb
+++ b/lib/sisu/texinfo_format.rb
@@ -48,8 +48,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>
 module SiSU_TexInfoFormat
   @@table_pg_break_counter=1
   require_relative 'dp'                                 # dp.rb
diff --git a/lib/sisu/texpdf.rb b/lib/sisu/texpdf.rb
index b8d58523..9850aeef 100644
--- a/lib/sisu/texpdf.rb
+++ b/lib/sisu/texpdf.rb
@@ -48,8 +48,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>
 module SiSU_TeX
   begin
     require 'pstore'
@@ -68,7 +68,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
@@ -739,65 +739,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
@@ -816,31 +757,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}
@@ -898,8 +814,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
@@ -912,6 +832,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
@@ -923,6 +846,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
@@ -988,7 +914,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
diff --git a/lib/sisu/texpdf_format.rb b/lib/sisu/texpdf_format.rb
index 569f4187..7c238b71 100644
--- a/lib/sisu/texpdf_format.rb
+++ b/lib/sisu/texpdf_format.rb
@@ -48,8 +48,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>
 module SiSU_TeX_Pdf
   require_relative 'texpdf_parts'                        # texpdf_parts.rb
   @@table_pg_break_counter=1
@@ -77,7 +77,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 },
@@ -103,7 +103,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,'&').
@@ -275,7 +275,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
@@ -349,9 +349,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
@@ -720,52 +720,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
@@ -778,36 +798,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)
@@ -833,6 +1153,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'
@@ -852,12 +1174,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'
@@ -870,6 +1196,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'
@@ -889,10 +1217,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')
@@ -955,53 +1287,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}"
@@ -1010,22 +1303,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]
@@ -1033,79 +1310,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
@@ -1397,9 +1603,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" +
@@ -1441,7 +1645,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}.
@@ -1451,11 +1655,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
@@ -1464,7 +1668,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
@@ -1476,7 +1680,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}}&
@@ -1493,10 +1697,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
@@ -1598,6 +1802,7 @@ xunicode.sty
 
 texlive-base:
   amssymb.sty
+
 texlive-latex-base:
   alltt.sty
   babel.sty
@@ -1610,6 +1815,7 @@ texlive-latex-base:
   multicol.sty
   textcomp.sty
   url.sty
+
 texlive-latex-extra:
   boites.sty
   breakurl.sty
@@ -1619,6 +1825,7 @@ texlive-latex-extra:
   soul.sty
   titlepic.sty
   ucs.sty
+
 texlive-latex-recommended:
   fontspec.sty
   listings.sty
@@ -1627,8 +1834,10 @@ texlive-latex-recommended:
   thumbpdf.sty
   xltxtra.sty
   xunicode.sty
+
 texlive-plain-generic:
   ulem.sty
+
 texlive-xetex:
   xeCJK.sty
 
diff --git a/lib/sisu/texpdf_parts.rb b/lib/sisu/texpdf_parts.rb
index 96df1bfb..7854bdc6 100644
--- a/lib/sisu/texpdf_parts.rb
+++ b/lib/sisu/texpdf_parts.rb
@@ -48,8 +48,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>
 module SiSU_Parts_TeXpdf
   require_relative 'generic_parts'                       # generic_parts.rb
   include SiSU_Parts_Generic
diff --git a/lib/sisu/txt_asciidoc.rb b/lib/sisu/txt_asciidoc.rb
index 5fbf6746..e9ef0a8f 100644
--- a/lib/sisu/txt_asciidoc.rb
+++ b/lib/sisu/txt_asciidoc.rb
@@ -48,8 +48,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>
 module SiSU_Txt_AsciiDoc
   require_relative 'ao'                                 # ao.rb
   require_relative 'se'                                 # se.rb
diff --git a/lib/sisu/txt_asciidoc_decorate.rb b/lib/sisu/txt_asciidoc_decorate.rb
index 82403fba..2d4eb503 100644
--- a/lib/sisu/txt_asciidoc_decorate.rb
+++ b/lib/sisu/txt_asciidoc_decorate.rb
@@ -48,8 +48,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>
 module SiSU_Decorate_Txt_AsciiDoc
   def decorate
     def heading
diff --git a/lib/sisu/txt_markdown.rb b/lib/sisu/txt_markdown.rb
index 1f6a876c..e48edb62 100644
--- a/lib/sisu/txt_markdown.rb
+++ b/lib/sisu/txt_markdown.rb
@@ -48,8 +48,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>
 module SiSU_Txt_Markdown
   require_relative 'ao'                                 # ao.rb
   require_relative 'se'                                 # se.rb
diff --git a/lib/sisu/txt_markdown_decorate.rb b/lib/sisu/txt_markdown_decorate.rb
index e5aa9b02..d2a15540 100644
--- a/lib/sisu/txt_markdown_decorate.rb
+++ b/lib/sisu/txt_markdown_decorate.rb
@@ -48,8 +48,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>
 module SiSU_Decorate_Txt_Markdown
   def decorate
     def heading
diff --git a/lib/sisu/txt_orgmode.rb b/lib/sisu/txt_orgmode.rb
index 01941ce4..fd424765 100644
--- a/lib/sisu/txt_orgmode.rb
+++ b/lib/sisu/txt_orgmode.rb
@@ -48,8 +48,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>
 module SiSU_Txt_OrgMode
   require_relative 'ao'                                 # ao.rb
   require_relative 'se'                                 # se.rb
diff --git a/lib/sisu/txt_orgmode_decorate.rb b/lib/sisu/txt_orgmode_decorate.rb
index 1a0a458b..cf08cc6f 100644
--- a/lib/sisu/txt_orgmode_decorate.rb
+++ b/lib/sisu/txt_orgmode_decorate.rb
@@ -48,8 +48,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>
 module SiSU_Decorate_Txt_OrgMode
   def decorate
     def heading
diff --git a/lib/sisu/txt_output.rb b/lib/sisu/txt_output.rb
index 4b2a791a..1e0bcc42 100644
--- a/lib/sisu/txt_output.rb
+++ b/lib/sisu/txt_output.rb
@@ -48,8 +48,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>
 module Txt_Output
   class Output
     include SiSU_Param
diff --git a/lib/sisu/txt_plain.rb b/lib/sisu/txt_plain.rb
index e8c68e0b..e65a2699 100644
--- a/lib/sisu/txt_plain.rb
+++ b/lib/sisu/txt_plain.rb
@@ -48,8 +48,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>
 module SiSU_Txt_Plain
   require_relative 'ao'                                 # ao.rb
   require_relative 'se'                                 # se.rb
diff --git a/lib/sisu/txt_plain_decorate.rb b/lib/sisu/txt_plain_decorate.rb
index 4174308b..ddaf4990 100644
--- a/lib/sisu/txt_plain_decorate.rb
+++ b/lib/sisu/txt_plain_decorate.rb
@@ -48,8 +48,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>
 module SiSU_Decorate_Txt_Plain
   def decorate
     def heading_underscore
diff --git a/lib/sisu/txt_read.rb b/lib/sisu/txt_read.rb
index d15581f1..eb97e670 100644
--- a/lib/sisu/txt_read.rb
+++ b/lib/sisu/txt_read.rb
@@ -48,8 +48,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>
 module SiSU_Txt_Read
   require_relative 'se'                                 # se.rb
     include SiSU_Env
diff --git a/lib/sisu/txt_rst.rb b/lib/sisu/txt_rst.rb
index 5af15613..b7c4be68 100644
--- a/lib/sisu/txt_rst.rb
+++ b/lib/sisu/txt_rst.rb
@@ -48,8 +48,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>
 module SiSU_Txt_rST
   require_relative 'ao'                                 # ao.rb
   require_relative 'se'                                 # se.rb
diff --git a/lib/sisu/txt_rst_decorate.rb b/lib/sisu/txt_rst_decorate.rb
index fe33aa41..d8c28878 100644
--- a/lib/sisu/txt_rst_decorate.rb
+++ b/lib/sisu/txt_rst_decorate.rb
@@ -48,8 +48,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>
 module SiSU_Decorate_Txt_rST
   def decorate
     def heading
diff --git a/lib/sisu/txt_shared.rb b/lib/sisu/txt_shared.rb
index 7236726d..9fb954cf 100644
--- a/lib/sisu/txt_shared.rb
+++ b/lib/sisu/txt_shared.rb
@@ -48,8 +48,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>
 module SiSU_TextUtils
   require_relative 'generic_parts'                      # generic_parts.rb
   class Wrap
diff --git a/lib/sisu/txt_textile.rb b/lib/sisu/txt_textile.rb
index 03e7bdff..d9ec8b3d 100644
--- a/lib/sisu/txt_textile.rb
+++ b/lib/sisu/txt_textile.rb
@@ -48,8 +48,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>
 module SiSU_Txt_Textile
   require_relative 'ao'                                 # ao.rb
   require_relative 'se'                                 # se.rb
diff --git a/lib/sisu/txt_textile_decorate.rb b/lib/sisu/txt_textile_decorate.rb
index 54a7d7e0..ea0d6a42 100644
--- a/lib/sisu/txt_textile_decorate.rb
+++ b/lib/sisu/txt_textile_decorate.rb
@@ -48,8 +48,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>
 module SiSU_Decorate_Txt_Textile
   def decorate
     def heading
diff --git a/lib/sisu/update.rb b/lib/sisu/update.rb
index 7a26b34f..b5104465 100644
--- a/lib/sisu/update.rb
+++ b/lib/sisu/update.rb
@@ -48,8 +48,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>
 module SiSU_UpdateControlFlag
   require_relative 'se'                                 # se.rb
     include SiSU_Env
diff --git a/lib/sisu/urls.rb b/lib/sisu/urls.rb
index 16e0f77d..fe594e69 100644
--- a/lib/sisu/urls.rb
+++ b/lib/sisu/urls.rb
@@ -48,8 +48,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>
 module SiSU_Urls
   require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
diff --git a/lib/sisu/utils.rb b/lib/sisu/utils.rb
index d291bde0..fe30b34f 100644
--- a/lib/sisu/utils.rb
+++ b/lib/sisu/utils.rb
@@ -48,8 +48,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>
 module SiSU_Utils
   class CodeMarker
     def initialize(line,file,color=:red)
diff --git a/lib/sisu/utils_composite.rb b/lib/sisu/utils_composite.rb
index dedd09e2..e5eb09e7 100644
--- a/lib/sisu/utils_composite.rb
+++ b/lib/sisu/utils_composite.rb
@@ -48,8 +48,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>
 module SiSU_Composite_Doc_Utils
   def inserts_array(loadfilename)
     IO.readlines(loadfilename,'')
diff --git a/lib/sisu/utils_response.rb b/lib/sisu/utils_response.rb
index 3e6cd1e4..38ecabed 100644
--- a/lib/sisu/utils_response.rb
+++ b/lib/sisu/utils_response.rb
@@ -48,8 +48,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>
 module SiSU_Response
   def available_selections_
     %{'yes', 'no', 'quit' or 'exit'; [ynqx]}
diff --git a/lib/sisu/utils_screen_text_color.rb b/lib/sisu/utils_screen_text_color.rb
index d814a407..8a8976d4 100644
--- a/lib/sisu/utils_screen_text_color.rb
+++ b/lib/sisu/utils_screen_text_color.rb
@@ -48,8 +48,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>
 module SiSU_Screen
   class Color
     attr_accessor :off,:marker,:bold,:underline,:invert,:darkgrey_hi,:grey_hi,:pink_hi,:fuchsia_hi,:red_hi,:orange_hi,:yellow_hi,:brown_hi,:lightgreen_hi,:green_hi,:cyan_hi,:blue_hi,:navy_hi,:white,:white_bold,:grey,:pink,:fuchsia,:ruby,:red,:orange,:yellow,:brown,:green,:darkgreen,:cyan,:blue,:navy,:black
diff --git a/lib/sisu/utils_spell.rb b/lib/sisu/utils_spell.rb
index 6440a7f7..548ab83f 100644
--- a/lib/sisu/utils_spell.rb
+++ b/lib/sisu/utils_spell.rb
@@ -48,8 +48,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>
 module SiSU_SpellUtility
   class Spell
     def initialize(input,filesrc,flg)
diff --git a/lib/sisu/webrick.rb b/lib/sisu/webrick.rb
index d5e04b97..68e9f6a7 100644
--- a/lib/sisu/webrick.rb
+++ b/lib/sisu/webrick.rb
@@ -48,8 +48,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>
 module SiSU_Webserv
   class WebrickStart
     begin
diff --git a/lib/sisu/wikispeak.rb b/lib/sisu/wikispeak.rb
index d2854a3f..9927b52d 100644
--- a/lib/sisu/wikispeak.rb
+++ b/lib/sisu/wikispeak.rb
@@ -48,8 +48,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>
 module SiSU_Wikispeak
   require_relative 'ao'                                 # ao.rb
   require_relative 'se'                                 # se.rb
diff --git a/lib/sisu/xhtml.rb b/lib/sisu/xhtml.rb
index 4f0b62bb..ef487250 100644
--- a/lib/sisu/xhtml.rb
+++ b/lib/sisu/xhtml.rb
@@ -48,8 +48,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>
 module SiSU_XHTML
   require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
diff --git a/lib/sisu/xhtml_epub2.rb b/lib/sisu/xhtml_epub2.rb
index 8f6ef05a..832d6073 100644
--- a/lib/sisu/xhtml_epub2.rb
+++ b/lib/sisu/xhtml_epub2.rb
@@ -48,8 +48,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>
 module SiSU_XHTML_EPUB2
   begin
     require 'pstore'
diff --git a/lib/sisu/xhtml_epub2_concordance.rb b/lib/sisu/xhtml_epub2_concordance.rb
index e482830c..8e6195e0 100644
--- a/lib/sisu/xhtml_epub2_concordance.rb
+++ b/lib/sisu/xhtml_epub2_concordance.rb
@@ -48,8 +48,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>
 module SiSU_XHTML_EPUB2_Concordance
   require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
@@ -98,7 +98,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
diff --git a/lib/sisu/xhtml_epub2_format.rb b/lib/sisu/xhtml_epub2_format.rb
index 8c8330ac..999acd15 100644
--- a/lib/sisu/xhtml_epub2_format.rb
+++ b/lib/sisu/xhtml_epub2_format.rb
@@ -48,8 +48,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>
 module SiSU_XHTML_EPUB2_Format
   class ParagraphNumber
     def initialize(md,ocn)
diff --git a/lib/sisu/xhtml_epub2_persist.rb b/lib/sisu/xhtml_epub2_persist.rb
index 6e5a4fe9..dda704ea 100644
--- a/lib/sisu/xhtml_epub2_persist.rb
+++ b/lib/sisu/xhtml_epub2_persist.rb
@@ -48,8 +48,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>
 module SiSU_XHTML_EPUB2_Persist
   class Persist
     @@persist=nil
diff --git a/lib/sisu/xhtml_epub2_segments.rb b/lib/sisu/xhtml_epub2_segments.rb
index 477559b4..c5aac01d 100644
--- a/lib/sisu/xhtml_epub2_segments.rb
+++ b/lib/sisu/xhtml_epub2_segments.rb
@@ -48,8 +48,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>
 module SiSU_XHTML_EPUB2_Seg
   require_relative 'xhtml_shared'                       # xhtml_shared.rb
   require_relative 'xhtml_epub2'                        # xhtml_epub2.rb
diff --git a/lib/sisu/xhtml_epub2_tune.rb b/lib/sisu/xhtml_epub2_tune.rb
index bad65ae7..a3f8d984 100644
--- a/lib/sisu/xhtml_epub2_tune.rb
+++ b/lib/sisu/xhtml_epub2_tune.rb
@@ -48,8 +48,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>
 require_relative 'dp'                                   # dp.rb
 module SiSU_XHTML_EPUB2_Tune
   require_relative 'se'                                 # se.rb
diff --git a/lib/sisu/xhtml_parts.rb b/lib/sisu/xhtml_parts.rb
index 5a6d0194..3ac023a9 100644
--- a/lib/sisu/xhtml_parts.rb
+++ b/lib/sisu/xhtml_parts.rb
@@ -48,8 +48,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>
 module SiSU_Parts_XHTML
   require_relative 'generic_parts'                       # generic_parts.rb
   include SiSU_Parts_Generic
diff --git a/lib/sisu/xhtml_shared.rb b/lib/sisu/xhtml_shared.rb
index f2bd8a40..321532ca 100644
--- a/lib/sisu/xhtml_shared.rb
+++ b/lib/sisu/xhtml_shared.rb
@@ -48,8 +48,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>
 module SiSU_XHTML_Shared
   require_relative 'xhtml_table'                        # xhtml_table.rb
   class TableXHTML < SiSU_XHTML_Table::TableXHTML
diff --git a/lib/sisu/xhtml_table.rb b/lib/sisu/xhtml_table.rb
index d21223d3..697353e5 100644
--- a/lib/sisu/xhtml_table.rb
+++ b/lib/sisu/xhtml_table.rb
@@ -48,8 +48,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>
 module SiSU_XHTML_Table
   require_relative 'xhtml_parts'                         # xhtml_parts.rb
   class TableXHTML
diff --git a/lib/sisu/xml_docbook5.rb b/lib/sisu/xml_docbook5.rb
index f0ccd3fd..6e661065 100644
--- a/lib/sisu/xml_docbook5.rb
+++ b/lib/sisu/xml_docbook5.rb
@@ -48,8 +48,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>
 module SiSU_XML_Docbook_Book
   require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
diff --git a/lib/sisu/xml_dom.rb b/lib/sisu/xml_dom.rb
index a47e58fb..053ae01e 100644
--- a/lib/sisu/xml_dom.rb
+++ b/lib/sisu/xml_dom.rb
@@ -48,8 +48,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>
 module SiSU_XML_DOM
   require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
diff --git a/lib/sisu/xml_fictionbook2.rb b/lib/sisu/xml_fictionbook2.rb
index 5ede1258..1ecd9637 100644
--- a/lib/sisu/xml_fictionbook2.rb
+++ b/lib/sisu/xml_fictionbook2.rb
@@ -48,8 +48,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>
 module SiSU_XML_Fictionbook
   require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
diff --git a/lib/sisu/xml_format.rb b/lib/sisu/xml_format.rb
index 4a461ed3..796471ee 100644
--- a/lib/sisu/xml_format.rb
+++ b/lib/sisu/xml_format.rb
@@ -48,8 +48,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>
 module SiSU_XML_Format
   require_relative 'dp'                                 # dp.rb
   require_relative 'xml_parts'                          # xml_parts.rb
@@ -83,7 +83,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}
diff --git a/lib/sisu/xml_md_oai_pmh_dc.rb b/lib/sisu/xml_md_oai_pmh_dc.rb
index 6205ba68..5eb8695f 100644
--- a/lib/sisu/xml_md_oai_pmh_dc.rb
+++ b/lib/sisu/xml_md_oai_pmh_dc.rb
@@ -48,8 +48,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>
 module SiSU_XML_Metadata
   require_relative 'se'                                 # se.rb
     include SiSU_Env
diff --git a/lib/sisu/xml_odf_odt.rb b/lib/sisu/xml_odf_odt.rb
index fb9c9cde..4f83662b 100644
--- a/lib/sisu/xml_odf_odt.rb
+++ b/lib/sisu/xml_odf_odt.rb
@@ -48,8 +48,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>
 module SiSU_XML_ODF_ODT
   require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
diff --git a/lib/sisu/xml_odf_odt_format.rb b/lib/sisu/xml_odf_odt_format.rb
index 524b6408..c26979b9 100644
--- a/lib/sisu/xml_odf_odt_format.rb
+++ b/lib/sisu/xml_odf_odt_format.rb
@@ -48,8 +48,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>
 module SiSU_XML_ODF_ODT_Format
   require_relative 'dp'                                 # dp.rb
     include SiSU_Param
diff --git a/lib/sisu/xml_parts.rb b/lib/sisu/xml_parts.rb
index 1c9b86da..9cd559fc 100644
--- a/lib/sisu/xml_parts.rb
+++ b/lib/sisu/xml_parts.rb
@@ -48,8 +48,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>
 module SiSU_Parts_XML
   require_relative 'generic_parts'                       # generic_parts.rb
   include SiSU_Parts_Generic
diff --git a/lib/sisu/xml_persist.rb b/lib/sisu/xml_persist.rb
index d8a277b4..284f02b9 100644
--- a/lib/sisu/xml_persist.rb
+++ b/lib/sisu/xml_persist.rb
@@ -48,8 +48,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>
 module SiSU_XML_Persist
   class Persist
     @@persist=nil
diff --git a/lib/sisu/xml_sax.rb b/lib/sisu/xml_sax.rb
index 0bcedfc0..e6045413 100644
--- a/lib/sisu/xml_sax.rb
+++ b/lib/sisu/xml_sax.rb
@@ -48,8 +48,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>
 module SiSU_XML_SAX
   require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
diff --git a/lib/sisu/xml_scaffold_structure_collapsed.rb b/lib/sisu/xml_scaffold_structure_collapsed.rb
index 33ce3b2e..21de4772 100644
--- a/lib/sisu/xml_scaffold_structure_collapsed.rb
+++ b/lib/sisu/xml_scaffold_structure_collapsed.rb
@@ -48,8 +48,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>
 module SiSU_XML_Scaffold_Structure_Collapse
   require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
diff --git a/lib/sisu/xml_scaffold_structure_sisu.rb b/lib/sisu/xml_scaffold_structure_sisu.rb
index d2559fa9..3486bc07 100644
--- a/lib/sisu/xml_scaffold_structure_sisu.rb
+++ b/lib/sisu/xml_scaffold_structure_sisu.rb
@@ -48,8 +48,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>
 module SiSU_XML_Scaffold_Structure_Sisu
   require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
diff --git a/lib/sisu/xml_shared.rb b/lib/sisu/xml_shared.rb
index 85a960d9..5386db96 100644
--- a/lib/sisu/xml_shared.rb
+++ b/lib/sisu/xml_shared.rb
@@ -48,8 +48,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>
 module SiSU_XML_Munge
   require_relative 'xml_parts'                          # xml_parts.rb
   class Trans
@@ -468,7 +468,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}
@@ -614,7 +614,7 @@ module SiSU_XML_Tags #Format
      * #{rubyv}
      * #{sc}
      * #{lastdone}
-     * SiSU http://www.jus.uio.no/sisu
+     * SiSU https://sisudoc.org
 -->
 WOK
      else
@@ -625,7 +625,7 @@ WOK
      * #{rubyv}
      * #{sc}
      * #{lastdone}
-     * SiSU http://www.jus.uio.no/sisu
+     * SiSU https://sisudoc.org
 -->
 WOK
       end
diff --git a/lib/sisu/xml_tables.rb b/lib/sisu/xml_tables.rb
index 33f45f6b..08c08bc6 100644
--- a/lib/sisu/xml_tables.rb
+++ b/lib/sisu/xml_tables.rb
@@ -48,8 +48,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>
 module SiSU_Tables
   class Table #_xml
     @@tablehead=0
diff --git a/lib/sisu/zap.rb b/lib/sisu/zap.rb
index 104c69d6..74c7f47b 100644
--- a/lib/sisu/zap.rb
+++ b/lib/sisu/zap.rb
@@ -48,8 +48,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>
 module SiSU_Zap
   require_relative 'se'                                 # se.rb
     include SiSU_Env
diff --git a/nix/pkglst/packages_ruby_2_6.nix b/nix/pkglst/packages_ruby_2_6.nix
deleted file mode 100644
index f8f27323..00000000
--- a/nix/pkglst/packages_ruby_2_6.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ pkgs ? import <nixpkgs> {} }:
-with pkgs; [
-  ruby_2_6
-  rubyPackages_2_6.rake
-  rubyPackages_2_6.sqlite3
-  rubyPackages_2_6.thor
-  sqlite
-  unzip
-  xz
-  zip
-  openssl
-  #texlive-combined-full
-  nixFlakes
-  validatePkgConfig
-  jq
-  git
-]
diff --git a/nix/pkglst/packages_ruby_3_0.nix b/nix/pkglst/packages_ruby_3_0.nix
deleted file mode 100644
index 66c9e0ba..00000000
--- a/nix/pkglst/packages_ruby_3_0.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ pkgs ? import <nixpkgs> {} }:
-with pkgs; [
-  ruby_3_0
-  rubyPackages_3_0.rake
-  rubyPackages_3_0.sqlite3
-  rubyPackages_3_0.thor
-  sqlite
-  unzip
-  xz
-  zip
-  openssl
-  #texlive-combined-full
-  nixFlakes
-  validatePkgConfig
-  jq
-  git
-]
diff --git a/nix/pkglst/packages_ruby_3_1.nix b/nix/pkglst/packages_ruby_3_1.nix
deleted file mode 100644
index ca9ced14..00000000
--- a/nix/pkglst/packages_ruby_3_1.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ pkgs ? import <nixpkgs> {} }:
-with pkgs; [
-  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
-]
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
diff --git a/qi b/qi
index 7b6d64d9..92ad0005 100755
--- a/qi
+++ b/qi
@@ -3,11 +3,9 @@
 
 -  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:
 
diff --git a/setup/qi_libs.rb b/setup/qi_libs.rb
index 0de6cf0f..b441cdd9 100644
--- a/setup/qi_libs.rb
+++ b/setup/qi_libs.rb
@@ -11,7 +11,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}"
@@ -390,7 +390,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)
@@ -438,7 +438,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)
@@ -577,7 +577,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
@@ -599,7 +598,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
diff --git a/setup/rbuild b/setup/rbuild
index ddba6999..ccc752cb 100755
--- a/setup/rbuild
+++ b/setup/rbuild
@@ -3,8 +3,7 @@
  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
 
@@ -15,11 +14,11 @@
 
  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]
@@ -508,13 +507,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
diff --git a/setup/rbuild_libs.rb b/setup/rbuild_libs.rb
index 8ff53052..132a6fd5 100644
--- a/setup/rbuild_libs.rb
+++ b/setup/rbuild_libs.rb
@@ -292,9 +292,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
diff --git a/setup/sisu_version.rb b/setup/sisu_version.rb
index e88d8576..79a30406 100644
--- a/setup/sisu_version.rb
+++ b/setup/sisu_version.rb
@@ -1,6 +1,6 @@
 #% constants
 module SiSUversion
-  SiSU_version                       = '7.2.1'
+  SiSU_version                       = '7.3.0'
 end
 module Dev
   GPGpubKey                          = '1BB4B289'
diff --git a/shell.nix b/shell.nix
index 9f689127..ec794cda 100755
--- a/shell.nix
+++ b/shell.nix
@@ -1,28 +1,28 @@
-#!/usr/bin/env -S nix-shell --pure
-{ pkgs ? import <nixpkgs> {} }:
+#!/usr/bin/env -S nix-shell --impure
+#!nix-shell -i bash
+{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
-    starship
-  ];
-  shellHook = ''
-    if [[ -e ".envrc" ]]; then
-      source .envrc
-    fi
-    eval "$(starship init bash)"
-  '';
-}
+  mkShell {
+    buildInputs = [
+      ruby_3_3
+      rubyPackages_3_3.rake
+      rubyPackages_3_3.sqlite3
+      rubyPackages_3_3.thor
+      sqlite
+      graphicsmagick
+      unzip
+      xz
+      zip
+      openssl
+      #texlive-combined-full
+      nixFlakes
+      validatePkgConfig
+      nix-output-monitor
+      nix-tree
+      jq
+      git
+      #starship
+    ];
+    shellHook = ''
+    '';
+  }
diff --git a/sisu.gemspec b/sisu.gemspec
index 696525cc..70a35f4a 100644
--- a/sisu.gemspec
+++ b/sisu.gemspec
@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name           = 'sisu'
-  s.version        = '7.2.1'
-  s.date           = '2019-09-05'
+  s.version        = '7.3.0'
+  s.date           = '2023-10-30'
   s.summary        = 'documents - structuring, publishing in multiple formats & search (linux calls)'
-  s.description    = 'documents - structuring, publishing in multiple formats & search [7.2.1 from git 7.2.1_pre_rel] (linux calls & without external dependencies)'
-  s.homepage       = 'http://www.sisudoc.org'
+  s.description    = 'documents - structuring, publishing in multiple formats & search [7.3.0 from git 7.3.0] (linux calls & without external dependencies)'
+  s.homepage       = 'https://www.sisudoc.org'
   s.authors        = ["Ralph Amissah"]
   s.email          = 'ralph.amissah@gmail.com'
   s.license        = 'GPL-3.0-or-later'
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
parent	debian/changelog (7.2.1-2) (diff)
parent	version & changelog, tag for release (diff)