track markup modifications (from March)

1 files changed, 41 insertions, 40 deletions

diff --git a/markup/pod/sisu-manual/media/text/en/sisu_markup.sst b/markup/pod/sisu-manual/media/text/en/sisu_markup.sst
index 24f9729..ae87b76 100644
--- a/markup/pod/sisu-manual/media/text/en/sisu_markup.sst
+++ b/markup/pod/sisu-manual/media/text/en/sisu_markup.sst
@@ -23,6 +23,8 @@ classify:
   subject: "ebook, epublishing, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, search"
 
 make:
+  doc_type: "book"
+  breaks: "new=:B; break=1"
   auto_num_top_at_level: "1"
   substitute: [
       [ "[$]{2}\\{sisudoc\\}", "www.sisudoc.org" ]
@@ -30,22 +32,21 @@ make:
 #substitute: [ "[$]{2}\\{sisudoc\\}", "www.sisudoc.org" ]
   bold: "Debian|SiSU"
   italics: "Linux|GPL|LaTeX|SQL"
-  breaks: "new=:B; break=1"
   home_button_text: [
       "{doc-reform}https://doc-reform.org",
-      "{sources / git}https://git.sisudoc.org/",
+      "{sources / git}https://git.sisudoc.org/projects/",
       "{SiSU}https://sisudoc.org"
     ]
   footer: [
       "{SiSU}https://sisudoc.org",
-      "{git}https://git.sisudoc.org"
+      "{git}https://git.sisudoc.org/projects"
     ]
 
 # home_button_text: "{SiSU}https://sisudoc.org; {sources / git}https://git.sisudoc.org/projects/"
-# footer: "{SiSU}https://sisudoc.org; {git}https://git.sisudoc.org"
+# footer: "{SiSU}https://sisudoc.org; {git}https://git.sisudoc.org/projects"
 # substitute: "/[$]{2}[{]sisudoc[}]/,'www.sisudoc.org'"
 #  substitute: "/${sisudoc}/,'www.sisudoc.org'"
-# home_button_image: "{won_benkler.png }http://cyber.law.harvard.edu/wealth_of_networks/Main_Page"
+# home_button_image: "{won_benkler.png }https://cyber.law.harvard.edu/wealth_of_networks/Main_Page"
 
 :A~ @title-author-date
 
@@ -284,8 +285,8 @@ make:
   bold: "Debian|SiSU"
   italics: "Linux|GPL|LaTeX|SQL"
   breaks: "new=:B; break=1"
-  home_button_text: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/gitweb/"
-  footer: "{SiSU}http://sisudoc.org; {git}http://git.sisudoc.org"
+  home_button_text: "{SiSU}https://sisudoc.org; {sources / git}https://git.sisudoc.org/projects/"
+  footer: "{SiSU}https://sisudoc.org; {git}https://git.sisudoc.org/projects"
 
 }code
 
@@ -387,8 +388,8 @@ identifier:
 code{
 
 links: [
-  "{SiSU }http://www.sisudoc.org",
-  "{ FSF }http://www.fsf.org",
+  "{SiSU }https://www.sisudoc.org",
+  "{ FSF }https://www.fsf.org",
 ]
 
 }code
@@ -403,8 +404,8 @@ make:
   bold: "Debian|SiSU" # [regular expression of words/phrases to be made bold]
   italics: "Linux|GPL|LaTeX|SQL" # [regular expression of words/phrases to italicise]
   breaks: "new=:B; break=1"
-  home_button_text: "{SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/gitweb/"
-  footer: "{SiSU}http://sisudoc.org; {git}http://git.sisudoc.org"
+  home_button_text: "{SiSU}https://sisudoc.org; {sources / git}https://git.sisudoc.org/gitweb/"
+  footer: "{SiSU}https://sisudoc.org; {git}https://git.sisudoc.org"
   headings: text to match for each level
     (e.g. PART; Chapter; Section; Article; or another: none; BOOK|FIRST|SECOND; none; CHAPTER;)
 
@@ -740,13 +741,13 @@ is omitted).
 
 code{
 
-normal text http://www.sisudoc.org/ continues
+normal text https://www.sisudoc.org/ continues
 
 }code
 
 !_ resulting output:
 
-normal text http://www.sisudoc.org/ continues
+normal text https://www.sisudoc.org/ continues
 
 An escaped url without decoration
 
@@ -754,17 +755,17 @@ An escaped url without decoration
 
 code{
 
-normal text _http://www.sisudoc.org/ continues
+normal text _https://www.sisudoc.org/ continues
 
-deb _http://www.jus.uio.no/sisu/archive unstable main non-free
+deb _https://www.jus.uio.no/sisu/archive unstable main non-free
 
 }code
 
 !_ resulting output:
 
-normal text _http://www.sisudoc.org/ continues
+normal text _https://www.sisudoc.org/ continues
 
-deb _http://www.jus.uio.no/sisu/archive unstable main non-free
+deb _https://www.jus.uio.no/sisu/archive unstable main non-free
 
 where a code block is used there is neither decoration nor hyperlinking, code
 blocks are discussed later in this document
@@ -773,8 +774,8 @@ blocks are discussed later in this document
 
 code{
 
-deb http://www.jus.uio.no/sisu/archive unstable main non-free
-deb-src http://www.jus.uio.no/sisu/archive unstable main non-free
+deb https://www.jus.uio.no/sisu/archive unstable main non-free
+deb-src https://www.jus.uio.no/sisu/archive unstable main non-free
 
 }code
 
@@ -787,17 +788,17 @@ To link text or an image to a url the markup is as follows
 
 code{
 
-about { SiSU }http://url.org markup
+about { SiSU }https://url.org markup
 
 }code
 
 !_ resulting output:
 
-about { SiSU }http://www.sisudoc.org/ markup
+about { SiSU }https://www.sisudoc.org/ markup
 
 a couple of test urls
 
-http://example.com/Alice&Bob
+https://example.com/Alice&Bob
 
 { programs I use }https://qa.debian.org/developer.php?packages=zsh+tilix+sakura+tmux+screen+i3-wm+vim+emacs+mosh+ldc
 
@@ -808,13 +809,13 @@ automatically as a footnote
 
 code{
 
-about {~^ SiSU }http://url.org markup
+about {~^ SiSU }https://url.org markup
 
 }code
 
 !_ resulting output:
 
-about {~^ SiSU }http://www.sisudoc.org/ markup
+about {~^ SiSU }https://www.sisudoc.org/ markup
 
 Internal document links to a named (anchor) tagged location, including named
 headings named inline anchor tags *~an-inline-anchor-tag or an ocn the heading:
@@ -891,11 +892,11 @@ code{
 
 % various url linked images
 
-{sm_tux.png 64x80 "a better way" }http://www.sisudoc.org/
+{sm_tux.png 64x80 "a better way" }https://www.sisudoc.org/
 
-{sm_GnuDebianLinuxRubyBetterWay.png 100x101 "Way Better - with Gnu/Linux, Debian and Ruby" }http://www.sisudoc.org/
+{sm_GnuDebianLinuxRubyBetterWay.png 100x101 "Way Better - with Gnu/Linux, Debian and Ruby" }https://www.sisudoc.org/
 
-{~^ sm_ruby_logo.png "Ruby" }http://www.ruby-lang.org/en/
+{~^ sm_ruby_logo.png "Ruby" }https://www.ruby-lang.org/en/
 
 }code
 
@@ -907,15 +908,15 @@ code{
 
 { sm_tux.png 64x80 "test" }image
 
-{ sm_tux.png }http://www.sisudoc.org/
+{ sm_tux.png }https://www.sisudoc.org/
 
-{ sm_tux.png 64x80 }http://www.sisudoc.org/
+{ sm_tux.png 64x80 }https://www.sisudoc.org/
 
-{ sm_tux.png 64x80 "Gnu/Linux - a better way" }http://www.sisudoc.org/
+{ sm_tux.png 64x80 "Gnu/Linux - a better way" }https://www.sisudoc.org/
 
-{ sm_GnuDebianLinuxRubyBetterWay.png 100x101 "Way Better - with Gnu/Linux, Debian and Ruby" }http://www.sisudoc.org/
+{ sm_GnuDebianLinuxRubyBetterWay.png 100x101 "Way Better - with Gnu/Linux, Debian and Ruby" }https://www.sisudoc.org/
 
-{~^ sm_ruby_logo.png "Ruby" }http://www.ruby-lang.org/en/
+{~^ sm_ruby_logo.png "Ruby" }https://www.ruby-lang.org/en/
 
 { sm_d_image.jpg 82x128 "D for me" }https://github.com/dlang-community/d-mans
 
@@ -925,9 +926,9 @@ code{
 
 code{
 
-{~^ [text to link] }http://url.org
+{~^ [text to link] }https://url.org
 
-% maps to: { [text to link] }http://url.org ~{ http://url.org }~
+% maps to: { [text to link] }https://url.org ~{ https://url.org }~
 
 % which produces hyper-linked text within a document/paragraph, with an endnote providing the url for the text location used in the hyperlink
 
@@ -1549,7 +1550,7 @@ column three of row two, and so on
 a second form may be easier to work with in cases where there is not much
 information in each column
 
-*{markup example:}*~{ Table from the Wealth of Networks by Yochai Benkler \\ http://www.jus.uio.no/sisu/the_wealth_of_networks.yochai_benkler }~
+*{markup example:}*~{ Table from the Wealth of Networks by Yochai Benkler \\ https://www.jus.uio.no/sisu/the_wealth_of_networks.yochai_benkler }~
 
 code{
 
@@ -1728,7 +1729,7 @@ pb: Harvard University Press
 edn: (edition)
 yr: 2006
 pl: U.S.
-url: http://cyber.law.harvard.edu/wealth_of_networks/Main_Page
+url: https://cyber.law.harvard.edu/wealth_of_networks/Main_Page
 note:
 sn: Benkler, /{Wealth of Networks}/ (2006)
 id: Benkler2006
@@ -1789,7 +1790,7 @@ pb: publisher
 edn: edition
 yr: year (yyyy or yyyy-mm or yyyy-mm-dd) (required)
 pg: pages
-url: http://url
+url: https://url
 note: note
 id: create_short_identifier e.g. authorSurnameYear
     (used in substitutions: when found within text will be
@@ -1976,7 +1977,7 @@ Globalisation is to be observed as a trend intrinsic to the world economy.~{ As
 Maria Cattaui Livanos suggests in /{The global economy - an opportunity to be
 seized}/ in /{Business World}/ the Electronic magazine of the International
 Chamber of Commerce (Paris, July 1997) at
-http://www.iccwbo.org/html/globalec.htm \\ "Globalization is unstoppable. Even
+https://www.iccwbo.org/html/globalec.htm \\ "Globalization is unstoppable. Even
 though it may be only in its early stages, it is already intrinsic to the world
 economy. We have to live with it, recognize its advantages and learn to manage
 it. \\ That imperative applies to governments, who would be unwise to attempt to
@@ -2010,8 +2011,8 @@ possibilities for the promulgation of texts, the sharing of ideas and
 collaborative ventures. There are however, likely to be tensions within the
 legal community protecting entrenched practices against that which is new, (both
 in law and technology) and the business community's goal to reduce transaction
-costs. This here http://sisudoc.org/now is a test and repeat { does this work?
-}http://www.sisudoc.com/ok.html
+costs. This here https://sisudoc.org/now is a test and repeat { does this work?
+}https://www.sisudoc.com/ok.html
 
 Within commercial law an analysis of law and economics may assist in
 developing a better understanding of the relationship between commercial