From e1082e5c5592d1253f21cbbd25280467d63cd170 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Mon, 30 Jan 2023 14:09:43 -0500
Subject: changelog & urls housekeeping, more required

- keep manual changelog?
  could rely on git changelogs

- qi modified to match current urls

- lots of url related stuff needs checking
---
 lib/sisu/sisu_thor_lib.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'lib')

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
-- 
cgit v1.2.3


From 2767c049c1976e69064f03eac5af4ae20415eaa8 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Mon, 30 Jan 2023 15:38:48 -0500
Subject: bugfix, typo, variable duplicated

---
 lib/sisu/constants.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'lib')

diff --git a/lib/sisu/constants.rb b/lib/sisu/constants.rb
index 8af3ad28..57cec119 100644
--- a/lib/sisu/constants.rb
+++ b/lib/sisu/constants.rb
@@ -220,7 +220,6 @@ Dx={
   lt_xml:                    '&lt;',       gt_xml:                  '&gt;',
 }
 Tex={
-  backslash:                 "\\\\",
   backslash:                 "\\\\",
   tilde:                     '\\\\\\~',
 }
-- 
cgit v1.2.3


From 95628d2cb75fe0749c8c02dfdc2de7911a2d2e6e Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Thu, 19 Oct 2023 11:03:20 -0400
Subject: sisu, update sisu links, (continue ...)

---
 lib/sisu.rb                                  |  4 ++--
 lib/sisu/air.rb                              |  4 ++--
 lib/sisu/ao.rb                               |  4 ++--
 lib/sisu/ao_appendices.rb                    |  4 ++--
 lib/sisu/ao_character_check.rb               |  4 ++--
 lib/sisu/ao_composite.rb                     |  4 ++--
 lib/sisu/ao_doc_objects.rb                   |  4 ++--
 lib/sisu/ao_doc_str.rb                       |  4 ++--
 lib/sisu/ao_endnotes.rb                      |  4 ++--
 lib/sisu/ao_expand_insertions.rb             |  4 ++--
 lib/sisu/ao_hash_digest.rb                   |  4 ++--
 lib/sisu/ao_idx.rb                           |  4 ++--
 lib/sisu/ao_images.rb                        |  4 ++--
 lib/sisu/ao_metadata.rb                      |  4 ++--
 lib/sisu/ao_misc_arrange.rb                  |  4 ++--
 lib/sisu/ao_numbering.rb                     |  4 ++--
 lib/sisu/ao_persist.rb                       |  4 ++--
 lib/sisu/ao_syntax.rb                        |  6 +++---
 lib/sisu/cgi.rb                              |  4 ++--
 lib/sisu/cgi_pgsql.rb                        |  4 ++--
 lib/sisu/cgi_sql_common.rb                   | 19 +++++++++----------
 lib/sisu/cgi_sqlite.rb                       |  4 ++--
 lib/sisu/conf.rb                             |  4 ++--
 lib/sisu/constants.rb                        |  4 ++--
 lib/sisu/css.rb                              |  4 ++--
 lib/sisu/db_columns.rb                       |  4 ++--
 lib/sisu/db_create.rb                        |  4 ++--
 lib/sisu/db_dbi.rb                           |  4 ++--
 lib/sisu/db_drop.rb                          |  4 ++--
 lib/sisu/db_import.rb                        |  4 ++--
 lib/sisu/db_indexes.rb                       |  4 ++--
 lib/sisu/db_load_tuple.rb                    |  4 ++--
 lib/sisu/db_remove.rb                        |  4 ++--
 lib/sisu/db_select.rb                        |  4 ++--
 lib/sisu/db_sqltxt.rb                        |  4 ++--
 lib/sisu/db_tests.rb                         |  4 ++--
 lib/sisu/dbi.rb                              |  4 ++--
 lib/sisu/dbi_discrete.rb                     |  4 ++--
 lib/sisu/digests.rb                          |  4 ++--
 lib/sisu/dp.rb                               |  5 ++---
 lib/sisu/dp_identify_markup.rb               |  4 ++--
 lib/sisu/dp_make.rb                          |  4 ++--
 lib/sisu/embedded.rb                         |  4 ++--
 lib/sisu/errors.rb                           |  4 ++--
 lib/sisu/generic_parts.rb                    |  4 ++--
 lib/sisu/git.rb                              |  4 ++--
 lib/sisu/html.rb                             |  4 ++--
 lib/sisu/html_concordance.rb                 |  8 ++++----
 lib/sisu/html_format.rb                      |  4 ++--
 lib/sisu/html_harvest.rb                     |  4 ++--
 lib/sisu/html_harvest_author_format.rb       |  4 ++--
 lib/sisu/html_harvest_authors.rb             |  6 +++---
 lib/sisu/html_harvest_topics.rb              |  6 +++---
 lib/sisu/html_lite_shared.rb                 |  4 ++--
 lib/sisu/html_manifest.rb                    |  6 +++---
 lib/sisu/html_minitoc.rb                     |  4 ++--
 lib/sisu/html_parts.rb                       | 14 ++++++--------
 lib/sisu/html_persist.rb                     |  4 ++--
 lib/sisu/html_promo.rb                       |  4 ++--
 lib/sisu/html_scroll.rb                      |  4 ++--
 lib/sisu/html_segments.rb                    |  4 ++--
 lib/sisu/html_shared.rb                      |  4 ++--
 lib/sisu/html_table.rb                       |  4 ++--
 lib/sisu/html_tune.rb                        |  4 ++--
 lib/sisu/hub.rb                              |  4 ++--
 lib/sisu/hub_actions.rb                      |  4 ++--
 lib/sisu/hub_loop_markup_files.rb            |  4 ++--
 lib/sisu/hub_options.rb                      |  4 ++--
 lib/sisu/i18n.rb                             |  4 ++--
 lib/sisu/json.rb                             |  4 ++--
 lib/sisu/json_format.rb                      |  4 ++--
 lib/sisu/json_parts.rb                       |  4 ++--
 lib/sisu/json_persist.rb                     |  4 ++--
 lib/sisu/json_shared.rb                      |  8 ++++----
 lib/sisu/manpage.rb                          |  6 +++---
 lib/sisu/manpage_format.rb                   |  4 ++--
 lib/sisu/object_munge.rb                     |  4 ++--
 lib/sisu/prog_text_translation.rb            |  4 ++--
 lib/sisu/qrcode.rb                           |  4 ++--
 lib/sisu/relaxng.rb                          |  9 ++++-----
 lib/sisu/remote.rb                           |  4 ++--
 lib/sisu/rexml.rb                            |  4 ++--
 lib/sisu/se.rb                               |  4 ++--
 lib/sisu/se_cleanoutput.rb                   |  4 ++--
 lib/sisu/se_clear.rb                         |  5 ++---
 lib/sisu/se_createsite.rb                    |  4 ++--
 lib/sisu/se_css.rb                           |  4 ++--
 lib/sisu/se_date.rb                          |  4 ++--
 lib/sisu/se_db.rb                            |  4 ++--
 lib/sisu/se_envcall.rb                       |  4 ++--
 lib/sisu/se_file_op.rb                       |  4 ++--
 lib/sisu/se_filemap.rb                       |  4 ++--
 lib/sisu/se_get_init.rb                      |  4 ++--
 lib/sisu/se_hub_particulars.rb               |  4 ++--
 lib/sisu/se_info_env.rb                      |  4 ++--
 lib/sisu/se_info_port.rb                     |  4 ++--
 lib/sisu/se_info_system.rb                   |  4 ++--
 lib/sisu/se_load.rb                          |  4 ++--
 lib/sisu/se_processing.rb                    |  4 ++--
 lib/sisu/se_programs.rb                      |  4 ++--
 lib/sisu/se_remotes.rb                       |  4 ++--
 lib/sisu/se_standardise_lang.rb              |  4 ++--
 lib/sisu/se_version.rb                       |  6 +++---
 lib/sisu/shared_images.rb                    |  4 ++--
 lib/sisu/shared_markup_alt.rb                |  4 ++--
 lib/sisu/shared_metadata.rb                  |  4 ++--
 lib/sisu/shared_sem.rb                       |  4 ++--
 lib/sisu/sitemaps.rb                         |  6 +++---
 lib/sisu/src_kdissert_share.rb               |  4 ++--
 lib/sisu/src_po4a_share.rb                   |  4 ++--
 lib/sisu/src_po4a_shelf.rb                   |  4 ++--
 lib/sisu/src_po4a_shelf_set.rb               |  4 ++--
 lib/sisu/src_po4a_sst_ao_sst.rb              |  4 ++--
 lib/sisu/src_po4a_sst_ao_sst_set.rb          |  4 ++--
 lib/sisu/src_po4a_sstm.rb                    |  4 ++--
 lib/sisu/src_shared.rb                       |  4 ++--
 lib/sisu/src_sisupod_make.rb                 |  4 ++--
 lib/sisu/src_sisupod_sstm.rb                 |  4 ++--
 lib/sisu/sst_convert_markup.rb               |  4 ++--
 lib/sisu/sst_do_inline_footnotes.rb          |  4 ++--
 lib/sisu/sst_from_xml.rb                     |  4 ++--
 lib/sisu/sst_identify_markup.rb              |  4 ++--
 lib/sisu/sst_to_s_xml_sax.rb                 |  4 ++--
 lib/sisu/termsheet.rb                        |  4 ++--
 lib/sisu/texinfo.rb                          |  4 ++--
 lib/sisu/texinfo_format.rb                   |  4 ++--
 lib/sisu/texpdf.rb                           |  4 ++--
 lib/sisu/texpdf_format.rb                    | 16 ++++++++--------
 lib/sisu/texpdf_parts.rb                     |  4 ++--
 lib/sisu/txt_asciidoc.rb                     |  4 ++--
 lib/sisu/txt_asciidoc_decorate.rb            |  4 ++--
 lib/sisu/txt_markdown.rb                     |  4 ++--
 lib/sisu/txt_markdown_decorate.rb            |  4 ++--
 lib/sisu/txt_orgmode.rb                      |  4 ++--
 lib/sisu/txt_orgmode_decorate.rb             |  4 ++--
 lib/sisu/txt_output.rb                       |  4 ++--
 lib/sisu/txt_plain.rb                        |  4 ++--
 lib/sisu/txt_plain_decorate.rb               |  4 ++--
 lib/sisu/txt_read.rb                         |  4 ++--
 lib/sisu/txt_rst.rb                          |  4 ++--
 lib/sisu/txt_rst_decorate.rb                 |  4 ++--
 lib/sisu/txt_shared.rb                       |  4 ++--
 lib/sisu/txt_textile.rb                      |  4 ++--
 lib/sisu/txt_textile_decorate.rb             |  4 ++--
 lib/sisu/update.rb                           |  4 ++--
 lib/sisu/urls.rb                             |  4 ++--
 lib/sisu/utils.rb                            |  4 ++--
 lib/sisu/utils_composite.rb                  |  4 ++--
 lib/sisu/utils_response.rb                   |  4 ++--
 lib/sisu/utils_screen_text_color.rb          |  4 ++--
 lib/sisu/utils_spell.rb                      |  4 ++--
 lib/sisu/webrick.rb                          |  4 ++--
 lib/sisu/wikispeak.rb                        |  4 ++--
 lib/sisu/xhtml.rb                            |  4 ++--
 lib/sisu/xhtml_epub2.rb                      |  4 ++--
 lib/sisu/xhtml_epub2_concordance.rb          |  6 +++---
 lib/sisu/xhtml_epub2_format.rb               |  4 ++--
 lib/sisu/xhtml_epub2_persist.rb              |  4 ++--
 lib/sisu/xhtml_epub2_segments.rb             |  4 ++--
 lib/sisu/xhtml_epub2_tune.rb                 |  4 ++--
 lib/sisu/xhtml_parts.rb                      |  4 ++--
 lib/sisu/xhtml_shared.rb                     |  4 ++--
 lib/sisu/xhtml_table.rb                      |  4 ++--
 lib/sisu/xml_docbook5.rb                     |  4 ++--
 lib/sisu/xml_dom.rb                          |  4 ++--
 lib/sisu/xml_fictionbook2.rb                 |  4 ++--
 lib/sisu/xml_format.rb                       |  6 +++---
 lib/sisu/xml_md_oai_pmh_dc.rb                |  4 ++--
 lib/sisu/xml_odf_odt.rb                      |  4 ++--
 lib/sisu/xml_odf_odt_format.rb               |  4 ++--
 lib/sisu/xml_parts.rb                        |  4 ++--
 lib/sisu/xml_persist.rb                      |  4 ++--
 lib/sisu/xml_sax.rb                          |  4 ++--
 lib/sisu/xml_scaffold_structure_collapsed.rb |  4 ++--
 lib/sisu/xml_scaffold_structure_sisu.rb      |  4 ++--
 lib/sisu/xml_shared.rb                       | 10 +++++-----
 lib/sisu/xml_tables.rb                       |  4 ++--
 lib/sisu/zap.rb                              |  4 ++--
 178 files changed, 391 insertions(+), 397 deletions(-)

(limited to 'lib')

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 57cec119..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',
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..990f6eac 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'
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..69a3e099 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
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/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..a8bbd568 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'
diff --git a/lib/sisu/texpdf_format.rb b/lib/sisu/texpdf_format.rb
index 569f4187..f88ac164 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
@@ -778,7 +778,7 @@ 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_portrait(d)
@@ -1441,7 +1441,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 +1451,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 +1464,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 +1476,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}}&
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
-- 
cgit v1.2.3


From 1b7e9c73beee89ebc82d281314c9e34d8d829ff6 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Thu, 12 Oct 2023 23:19:50 -0400
Subject: texpdf address issue with texlive-2023

- reported on debian in relation to live-manual
- make use of latex output for sisu.spine.d
  - was developed more recently, a comprehensive
    output update with focus on utf-8 improvements
    available in more recent version of texlive
  - tested forward does not appear to be
    similarly affected
  - other issues likely to appear as no attempt is
    made to fully backport the output for spine.d
    to sisu.rb
---
 lib/sisu/se_programs.rb   |   1 +
 lib/sisu/texpdf.rb        |  46 ++---
 lib/sisu/texpdf_format.rb | 449 ++++++++++++++++++++++++++++++----------------
 3 files changed, 312 insertions(+), 184 deletions(-)

(limited to 'lib')

diff --git a/lib/sisu/se_programs.rb b/lib/sisu/se_programs.rb
index 990f6eac..4730a10e 100644
--- a/lib/sisu/se_programs.rb
+++ b/lib/sisu/se_programs.rb
@@ -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/texpdf.rb b/lib/sisu/texpdf.rb
index a8bbd568..be139ff4 100644
--- a/lib/sisu/texpdf.rb
+++ b/lib/sisu/texpdf.rb
@@ -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
@@ -744,10 +744,10 @@ module SiSU_TeX
 \\definecolor{listinggray}{gray}{0.9}
 \\definecolor{lbcolor}{rgb}{0.9,0.9,0.9}
 \\lstset{
-	backgroundcolor=\\color{lbcolor},
-	tabsize=4,
-	rulecolor=,
-	language=,
+  backgroundcolor=\\color{lbcolor},
+  tabsize=4,
+  rulecolor=,
+  language=,
   basicstyle=\\scriptsize,
   upquote=true,
   aboveskip={1.5\\baselineskip},
@@ -816,30 +816,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
@@ -898,8 +874,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 +892,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 +906,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 +974,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 f88ac164..e5a323ad 100644
--- a/lib/sisu/texpdf_format.rb
+++ b/lib/sisu/texpdf_format.rb
@@ -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
@@ -735,22 +735,16 @@ module SiSU_TeX_Pdf
           || 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}}
           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}}
           WOK
         end
       when /pdf/
@@ -781,33 +775,303 @@ module SiSU_TeX_Pdf
 %% SiSU https://git.sisudoc.org/
       WOK
     end
+    def tex_head_paper_part
+      <<-WOK
+% \\usepackage[scaled]{dejavu}
+\\renewcommand*\\familydefault{\\sfdefault}
+%\\usepackage{inconsolata}
+\\usepackage[T1]{fontenc}
+\\usepackage{newunicodechar}
+% \\usepackage[utf8]{inputenc}
+\\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}
+      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_part_specific
+      <<-WOK
+\\usepackage[english,english]{babel}
+\\usepackage[autostyle, english = american]{csquotes}
+% \\MakeOuterQuote{"} % not required, using '' as quote delimiter
+\\selectlanguage{english}
+\\hypersetup{
+  pdftitle={#{@md.title.short}},
+  pdfauthor={#{@md.creator.author}},
+  pdfsubject={},
+}
+\\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{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{
+  a4paper,
+  portrait,
+  left=30mm,
+  right=20mm,
+  top=30mm,
+  bottom=30mm,
+}
+% \\ProvidesPackage{./sty/spineShared}
+\\usepackage{multicol}
 \\setlength{\\marginparsep}{#{d[:marginparsep]}}
 \\setlength{\\marginparwidth}{#{d[:marginparwidth]}}
+#{tex_head_paper_part}
+#{tex_head_paper_newenv_newcmd}
+#{tex_head_paper_part_specific}
 #{multicol}
       WOK
     end
     def tex_head_paper_landscape(d)
       <<-WOK
 #{tex_head_info}
+\\documentclass[11pt,a4paper,titlepage,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{
+  a4paper,
+  landscape,
+  left=30mm,
+  right=20mm,
+  top=30mm,
+  bottom=30mm,
+}
+\\usepackage{multicol}
 \\setlength{\\marginparsep}{#{d[:marginparsep]}}
 \\setlength{\\marginparwidth}{#{d[:marginparwidth]}}
+#{tex_head_paper_part}
+#{tex_head_paper_newenv_newcmd}
+#{tex_head_paper_part_specific}
       WOK
     end
     def tex_head_paper_portrait_dvi(d)
@@ -955,45 +1219,6 @@ 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)
@@ -1010,22 +1235,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,78 +1242,7 @@ 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]}}
       WOK
     end
@@ -1397,9 +1535,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" +
@@ -1493,10 +1629,10 @@ Generated by \\href{https://git.sisudoc.org/}{SiSU https://git.sisudoc.org/ } \\
   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 +1734,7 @@ xunicode.sty
 
 texlive-base:
   amssymb.sty
+
 texlive-latex-base:
   alltt.sty
   babel.sty
@@ -1610,6 +1747,7 @@ texlive-latex-base:
   multicol.sty
   textcomp.sty
   url.sty
+
 texlive-latex-extra:
   boites.sty
   breakurl.sty
@@ -1619,6 +1757,7 @@ texlive-latex-extra:
   soul.sty
   titlepic.sty
   ucs.sty
+
 texlive-latex-recommended:
   fontspec.sty
   listings.sty
@@ -1627,8 +1766,10 @@ texlive-latex-recommended:
   thumbpdf.sty
   xltxtra.sty
   xunicode.sty
+
 texlive-plain-generic:
   ulem.sty
+
 texlive-xetex:
   xeCJK.sty
 
-- 
cgit v1.2.3


From 089b9b28b9d828bb9bf35741703967831cd1b792 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Wed, 18 Oct 2023 20:59:14 -0400
Subject: texpdf ...

---
 lib/sisu/texpdf_format.rb | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

(limited to 'lib')

diff --git a/lib/sisu/texpdf_format.rb b/lib/sisu/texpdf_format.rb
index e5a323ad..80f2652c 100644
--- a/lib/sisu/texpdf_format.rb
+++ b/lib/sisu/texpdf_format.rb
@@ -719,18 +719,7 @@ module SiSU_TeX_Pdf
       # fc-list :lang=ja
       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
-        elsif (tex_head_lang[:mainlang] == "english" \
+        if (tex_head_lang[:mainlang] == "english" \
         && (tex_head_lang[:otherlang] == "english" \
           || tex_head_lang[:otherlang] == "" \
           || tex_head_lang[:otherlang].length == 0))
@@ -998,16 +987,24 @@ module SiSU_TeX_Pdf
 }
       WOK
     end
-    def tex_head_paper_part_specific
+    def tex_head_paper_part_specific(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[english,english]{babel}
+\\usepackage[#{tex_head_lang[:mainlang]},#{tex_head_lang[:otherlang]}]{babel}
 \\usepackage[autostyle, english = american]{csquotes}
 % \\MakeOuterQuote{"} % not required, using '' as quote delimiter
-\\selectlanguage{english}
+\\selectlanguage{#{tex_head_lang[:mainlang]}}
 \\hypersetup{
   pdftitle={#{@md.title.short}},
   pdfauthor={#{@md.creator.author}},
   pdfsubject={},
+#{colorlinks}
 }
 \\usepackage{fancyhdr}
 \\lhead[ ]{ }
@@ -1049,14 +1046,14 @@ module SiSU_TeX_Pdf
 \\setlength{\\marginparwidth}{#{d[:marginparwidth]}}
 #{tex_head_paper_part}
 #{tex_head_paper_newenv_newcmd}
-#{tex_head_paper_part_specific}
+#{tex_head_paper_part_specific("portrait")}
 #{multicol}
       WOK
     end
     def tex_head_paper_landscape(d)
       <<-WOK
 #{tex_head_info}
-\\documentclass[11pt,a4paper,titlepage,makeidx]{scrartcl}
+\\documentclass[11pt,a4paper,landscape,titlepage,twocolumn,makeidx]{scrartcl}
 \\usepackage{geometry}
 \\geometry{
   a4paper,
@@ -1071,7 +1068,7 @@ module SiSU_TeX_Pdf
 \\setlength{\\marginparwidth}{#{d[:marginparwidth]}}
 #{tex_head_paper_part}
 #{tex_head_paper_newenv_newcmd}
-#{tex_head_paper_part_specific}
+#{tex_head_paper_part_specific("landscape")}
       WOK
     end
     def tex_head_paper_portrait_dvi(d)
@@ -1243,7 +1240,7 @@ module SiSU_TeX_Pdf
 #{tex_head_encode}
 #{tex_head_pdftex}
 #{tex_head_codeblock(codeblock_box_type)}
-\\selectlanguage{#{@lang.list[@md.i18n[0]][:xlp]}}
+\\selectlanguage{#{tex_head_lang[:mainlang]}}
       WOK
     end
     def a4generic
-- 
cgit v1.2.3


From 14ddc81aa7323d9b8c6a131e2148d88c56533912 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Tue, 24 Oct 2023 11:37:45 -0400
Subject: texpdf papersize & papermargins

---
 lib/sisu/shared_metadata.rb |  2 +-
 lib/sisu/texpdf_format.rb   | 44 ++++++++++++++++++++++++++++++++------------
 2 files changed, 33 insertions(+), 13 deletions(-)

(limited to 'lib')

diff --git a/lib/sisu/shared_metadata.rb b/lib/sisu/shared_metadata.rb
index 69a3e099..6d5597bf 100644
--- a/lib/sisu/shared_metadata.rb
+++ b/lib/sisu/shared_metadata.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/texpdf_format.rb b/lib/sisu/texpdf_format.rb
index 80f2652c..80fe301e 100644
--- a/lib/sisu/texpdf_format.rb
+++ b/lib/sisu/texpdf_format.rb
@@ -719,7 +719,15 @@ module SiSU_TeX_Pdf
       # fc-list :lang=ja
       case @tex2pdf
       when /xe/
-        if (tex_head_lang[:mainlang] == "english" \
+        if @md.opt.lng =~/(?:zh|ja|ko)/
+          <<-WOK
+\\setmainlanguage{#{tex_head_lang[:mainlang]}}
+\\setotherlanguage{english}
+\\setmainfont{#{texpdf_fontface_cjk}}
+\\setotherfont{#{texpdf_fontface}}
+\\setmonofont[Scale=0.85]{#{texpdf_fontface_mono}}
+          WOK
+        elsif (tex_head_lang[:mainlang] == "english" \
         && (tex_head_lang[:otherlang] == "english" \
           || tex_head_lang[:otherlang] == "" \
           || tex_head_lang[:otherlang].length == 0))
@@ -775,7 +783,7 @@ module SiSU_TeX_Pdf
 \\usepackage{alltt}
 \\usepackage[
   unicode=true,
-	pdfusetitle,
+  pdfusetitle,
   pdfsubject={},
   pdfkeywords={},         % keywords list {} {} {},
   pdftoolbar=true,
@@ -1033,12 +1041,12 @@ module SiSU_TeX_Pdf
 \\documentclass[11pt,a4paper,titlepage,makeidx]{scrartcl}
 \\usepackage{geometry}
 \\geometry{
-  a4paper,
+  #{d[:papertype]},
   portrait,
-  left=30mm,
-  right=20mm,
-  top=30mm,
-  bottom=30mm,
+  left=#{d[:left]},
+  right=#{d[:right]},
+  top=#{d[:top]},
+  bottom=#{d[:bottom]},
 }
 % \\ProvidesPackage{./sty/spineShared}
 \\usepackage{multicol}
@@ -1056,12 +1064,12 @@ module SiSU_TeX_Pdf
 \\documentclass[11pt,a4paper,landscape,titlepage,twocolumn,makeidx]{scrartcl}
 \\usepackage{geometry}
 \\geometry{
-  a4paper,
+  #{d[:papertype]},
   landscape,
-  left=30mm,
-  right=20mm,
-  top=30mm,
-  bottom=30mm,
+  left=#{d[:left]},
+  right=#{d[:right]},
+  top=#{d[:top]},
+  bottom=#{d[:bottom]},
 }
 \\usepackage{multicol}
 \\setlength{\\marginparsep}{#{d[:marginparsep]}}
@@ -1094,6 +1102,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'
@@ -1113,12 +1123,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'
@@ -1131,6 +1145,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'
@@ -1150,10 +1166,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')
-- 
cgit v1.2.3


From 3a0bb67b63884e39075b2655dab7169ee93c1e54 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Thu, 26 Oct 2023 18:26:06 -0400
Subject: texpdf, cjk issues not resolved

- font rendition bugs where tested
---
 lib/sisu/texpdf.rb        | 60 -------------------------------------
 lib/sisu/texpdf_format.rb | 75 ++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 58 insertions(+), 77 deletions(-)

(limited to 'lib')

diff --git a/lib/sisu/texpdf.rb b/lib/sisu/texpdf.rb
index be139ff4..9850aeef 100644
--- a/lib/sisu/texpdf.rb
+++ b/lib/sisu/texpdf.rb
@@ -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,7 +757,6 @@ module SiSU_TeX
         end
         @tex_file << <<-WOK
 #{@tex_ml.header}#{@tex_ml.footer}
-#{tex_codeblock}
 % (tilde hash amp affected by http)
 % \\sloppy
 \\begin{document}
diff --git a/lib/sisu/texpdf_format.rb b/lib/sisu/texpdf_format.rb
index 80fe301e..9b250944 100644
--- a/lib/sisu/texpdf_format.rb
+++ b/lib/sisu/texpdf_format.rb
@@ -720,28 +720,65 @@ module SiSU_TeX_Pdf
       case @tex2pdf
       when /xe/
         if @md.opt.lng =~/(?:zh|ja|ko)/
-          <<-WOK
+          if @md.opt.lng =~/zh/
+            <<-WOK
+\\usepackage{xeCJK}
+\\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}}
-\\setmonofont[Scale=0.85]{#{texpdf_fontface_mono}}
-          WOK
+% \\setmainfont{#{texpdf_fontface_cjk}}
+% \\setotherfont{#{texpdf_fontface}}
+\\setotherfont{Noto Sans}
+% \\setmonofont[Scale=0.85]{#{texpdf_fontface_mono}}
+            WOK
+          elsif @md.opt.lng =~/ja/
+            <<-WOK
+\\usepackage{xeCJK}
+\\setCJKmainfont{Noto}
+\\setCJKmainfont{Noto Sans 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
+\\usepackage{xeCJK}
+\\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
-\\setmainlanguage{#{tex_head_lang[:mainlang]}}
-\\setmainfont{#{texpdf_fontface}}
-\\setmonofont[Scale=0.85]{#{texpdf_fontface_mono}}
+% \\setmainlanguage{#{tex_head_lang[:mainlang]}}
+% \\setmainfont{#{texpdf_fontface}}
+% \\setmonofont[Scale=0.85]{#{texpdf_fontface_mono}}
           WOK
         else
           <<-WOK
-\\setmainlanguage{#{tex_head_lang[:mainlang]}}
-\\setotherlanguage{english}
-\\setmainfont{#{texpdf_fontface}}
-\\setmonofont[Scale=0.85]{#{texpdf_fontface_mono}}
+% \\setmainlanguage{#{tex_head_lang[:mainlang]}}
+% \\setotherlanguage{english}
+% \\setmainfont{#{texpdf_fontface}}
+% \\setmonofont[Scale=0.85]{#{texpdf_fontface_mono}}
           WOK
         end
       when /pdf/
@@ -779,7 +816,9 @@ module SiSU_TeX_Pdf
 %\\usepackage{inconsolata}
 \\usepackage[T1]{fontenc}
 \\usepackage{newunicodechar}
-% \\usepackage[utf8]{inputenc}
+\\usepackage[utf8]{inputenc}
+\\usepackage{xeCJK}
+\\usepackage{noto}
 \\usepackage{alltt}
 \\usepackage[
   unicode=true,
@@ -1039,6 +1078,8 @@ module SiSU_TeX_Pdf
       <<-WOK
 #{tex_head_info}
 \\documentclass[11pt,a4paper,titlepage,makeidx]{scrartcl}
+\\usepackage{fontspec}
+\\usepackage{lmodern}
 \\usepackage{geometry}
 \\geometry{
   #{d[:papertype]},
@@ -1241,9 +1282,9 @@ module SiSU_TeX_Pdf
     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}"
@@ -1260,7 +1301,7 @@ module SiSU_TeX_Pdf
 #{tex_head_encode}
 #{tex_head_pdftex}
 #{tex_head_codeblock(codeblock_box_type)}
-\\selectlanguage{#{tex_head_lang[:mainlang]}}
+% \\selectlanguage{#{tex_head_lang[:mainlang]}}
       WOK
     end
     def a4generic
-- 
cgit v1.2.3


From c93c52d5574c2b0f48bb005e5c972e66a5d5dba4 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Mon, 30 Oct 2023 13:31:43 -0400
Subject: texpdf, cjk issues not resolved

- ctex preferable to xeCJK? (if/when it works)
- note: the current round of texpdf changes relate
  to a bug report on the old live-manual
  for debian-live to wit:
  https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1052693
- apparently sisu-pdf does not produce latex
  suitable for the latest texlive (texlive-2023)
- some of the latex output changes here are from
  sisu:spine, the dlang version of sisu
---
 lib/sisu/texpdf_format.rb | 70 +++++++++++++++++++++++++++--------------------
 1 file changed, 40 insertions(+), 30 deletions(-)

(limited to 'lib')

diff --git a/lib/sisu/texpdf_format.rb b/lib/sisu/texpdf_format.rb
index 9b250944..7c238b71 100644
--- a/lib/sisu/texpdf_format.rb
+++ b/lib/sisu/texpdf_format.rb
@@ -722,7 +722,6 @@ module SiSU_TeX_Pdf
         if @md.opt.lng =~/(?:zh|ja|ko)/
           if @md.opt.lng =~/zh/
             <<-WOK
-\\usepackage{xeCJK}
 \\setCJKmainfont{Noto}
 \\setCJKmainfont{Noto Sans CJK TC}
 \\setCJKsansfont{Noto Sans CJK TC}
@@ -736,11 +735,12 @@ module SiSU_TeX_Pdf
             WOK
           elsif @md.opt.lng =~/ja/
             <<-WOK
-\\usepackage{xeCJK}
-\\setCJKmainfont{Noto}
-\\setCJKmainfont{Noto Sans CJK JP}
-\\setCJKsansfont{Noto Sans CJK JP}
-\\setCJKmonofont{Noto Sans Mono CJK JP}
+\\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}}
@@ -750,7 +750,6 @@ module SiSU_TeX_Pdf
             WOK
           elsif @md.opt.lng =~/ko/
             <<-WOK
-\\usepackage{xeCJK}
 \\setCJKmainfont{Noto}
 \\setCJKmainfont{Noto Sans CJK KR}
 \\setCJKsansfont{Noto Sans CJK KR}
@@ -782,18 +781,11 @@ module SiSU_TeX_Pdf
           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
@@ -809,16 +801,31 @@ module SiSU_TeX_Pdf
 %% SiSU https://git.sisudoc.org/
       WOK
     end
-    def tex_head_paper_part
-      <<-WOK
+    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}
-\\usepackage{xeCJK}
-\\usepackage{noto}
+         WOK
+       end
+    end
+    def tex_head_paper_shared
+      <<-WOK
 \\usepackage{alltt}
 \\usepackage[
   unicode=true,
@@ -879,7 +886,7 @@ module SiSU_TeX_Pdf
 \\definecolor{Light}{gray}{.92}
 \\definecolor{listinggray}{gray}{0.9}
 \\definecolor{lbcolor}{rgb}{0.9,0.9,0.9}
-\\lstset{
+\\lstset{%
   backgroundcolor=\\color{lbcolor},
   tabsize=4,
   rulecolor=,
@@ -907,6 +914,7 @@ module SiSU_TeX_Pdf
 \\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
@@ -1034,7 +1042,7 @@ module SiSU_TeX_Pdf
 }
       WOK
     end
-    def tex_head_paper_part_specific(orientation)
+    def tex_head_paper_orient(orientation)
       colorlinks = <<-WOK
   colorlinks=true,    % myblack
   urlcolor=myblue,    % \\href{...}{...}   external url
@@ -1079,9 +1087,9 @@ module SiSU_TeX_Pdf
 #{tex_head_info}
 \\documentclass[11pt,a4paper,titlepage,makeidx]{scrartcl}
 \\usepackage{fontspec}
-\\usepackage{lmodern}
+% \\usepackage{lmodern} %%issue remove for now (consider later)
 \\usepackage{geometry}
-\\geometry{
+\\geometry{%
   #{d[:papertype]},
   portrait,
   left=#{d[:left]},
@@ -1093,9 +1101,10 @@ module SiSU_TeX_Pdf
 \\usepackage{multicol}
 \\setlength{\\marginparsep}{#{d[:marginparsep]}}
 \\setlength{\\marginparwidth}{#{d[:marginparwidth]}}
-#{tex_head_paper_part}
+#{tex_head_paper_characters}
+#{tex_head_paper_shared}
 #{tex_head_paper_newenv_newcmd}
-#{tex_head_paper_part_specific("portrait")}
+#{tex_head_paper_orient("portrait")}
 #{multicol}
       WOK
     end
@@ -1104,7 +1113,7 @@ module SiSU_TeX_Pdf
 #{tex_head_info}
 \\documentclass[11pt,a4paper,landscape,titlepage,twocolumn,makeidx]{scrartcl}
 \\usepackage{geometry}
-\\geometry{
+\\geometry{%
   #{d[:papertype]},
   landscape,
   left=#{d[:left]},
@@ -1115,9 +1124,10 @@ module SiSU_TeX_Pdf
 \\usepackage{multicol}
 \\setlength{\\marginparsep}{#{d[:marginparsep]}}
 \\setlength{\\marginparwidth}{#{d[:marginparwidth]}}
-#{tex_head_paper_part}
+#{tex_head_paper_characters}
+#{tex_head_paper_shared}
 #{tex_head_paper_newenv_newcmd}
-#{tex_head_paper_part_specific("landscape")}
+#{tex_head_paper_orient("landscape")}
       WOK
     end
     def tex_head_paper_portrait_dvi(d)
-- 
cgit v1.2.3