track markup modifications (from March)

27 files changed, 173 insertions, 114 deletions

diff --git a/markup/.gitignore b/markup/.gitignore
new file mode 100644
index 0000000..c42c00f
--- /dev/null
+++ b/markup/.gitignore
@@ -0,0 +1,89 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+*
+!.gitignore
+!COPYRIGHT
+!README
+!shell.nix
+!packages.nix
+!version.txt
+!pod/
+!pod/.dr/config_local_site
+# pod.manifest
+!pod/*/
+!pod/*/pod.manifest
+# conf/sisu_document_make
+!pod/*/conf/
+!pod/*/conf/sisu_document_make
+# media/text
+!pod/*/media/
+!pod/*/media/text/
+!pod/*/media/text/*/
+!pod/*/media/text/*/*.sst
+!pod/*/media/text/*/*.ssm
+!pod/*/media/text/*/*.ssi
+!pod/*/media/text/*/index.html.in
+# media/image
+!pod/*/media/image/
+!pod/*/media/image/*.png
+!pod/*/media/image/*.jpg
+!pod/*/media/image/*.PNG
+!pod/*/media/image/*.JPG
+# tools/po4a
+!pod/*/tools/
+!pod/*/tools/Makefile
+!pod/*/tools/bin/
+!pod/*/tools/bin/*.sh
+!pod/*/tools/po4a/
+!pod/*/tools/po4a/pot/
+!pod/*/tools/po4a/pot/*.sst.pot
+!pod/*/tools/po4a/pot/*.ssm.pot
+!pod/*/tools/po4a/pot/*.ssi.pot
+!pod/*/tools/po4a/pot/index.html.in.pot
+!pod/*/tools/po4a/po/
+!pod/*/tools/po4a/po/*/
+!pod/*/tools/po4a/po/*/*.sst.po
+!pod/*/tools/po4a/po/*/*.ssm.po
+!pod/*/tools/po4a/po/*/*.ssi.po
+!pod/*/tools/po4a/po/*/index.html.in.po
+# separate from media/text use tools
+!pod/*/media/text/Makefile
+!pod/*/media/text/bin/
+!pod/*/media/text/bin/*.sh
+!pod/*/media/text/pot/
+!pod/*/media/text/pot/*.sst.pot
+!pod/*/media/text/pot/*.ssm.pot
+!pod/*/media/text/pot/*.ssi.pot
+!pod/*/media/text/pot/index.html.in.pot
+!pod/*/media/text/po/
+!pod/*/media/text/po/*/
+!pod/*/media/text/po/*/*.sst.po
+!pod/*/media/text/po/*/*.ssm.po
+!pod/*/media/text/po/*/*.ssi.po
+!pod/*/media/text/po/*/index.html.in.po
+# skip
+.dub/**
+tmp/**
+*_.org
+*_.d
+*_.txt
+*_
+*~
+\#*
+*.\#*
+# *
+# !.gitignore
+# !pod.manifest
+# !*/
+# !*/conf/
+# !*/conf/sisu_document_make
+# !*/media/
+# !*/media/text/
+# !*/media/text/*/
+# !*/media/text/*/*.sst
+# !*/media/text/*/*.ssm
+# !*/media/text/*/*.ssi
+# !*/media/image/
+# !*/media/image/*.png
+# !*/media/image/*.jpg
+# !*/media/image/*.PNG
+# !*/media/image/*.JPG
diff --git a/markup/pod/.dr/config_local_site b/markup/pod/.dr/config_local_site
index 80d293e..ba26be8 100644
--- a/markup/pod/.dr/config_local_site
+++ b/markup/pod/.dr/config_local_site
@@ -5,7 +5,7 @@ output:
   path:                        "/srv/www/spine"
 default:
   language:                    "en"
-  papersize:                   "a4"
+  papersize:                   "a4,letter.portrait,b4.portrait"
   text_wrap:                   "80"
   digest:                      "sha256"
 webserv:
diff --git a/markup/pod/.gitignore b/markup/pod/.gitignore
deleted file mode 100644
index b280b51..0000000
--- a/markup/pod/.gitignore
+++ /dev/null
@@ -1,60 +0,0 @@
-# git ls-files --others --exclude-from=.git/info/exclude
-*
-!.gitignore
-!COPYRIGHT
-!README
-!shell.nix
-!packages.nix
-!version.txt
-!*/
-!*/pod.manifest
-!*/conf/
-!*/conf/sisu_document_make
-!*/media/
-!*/media/text/
-!*/media/text/*/
-!*/media/text/*/*.sst
-!*/media/text/*/*.ssm
-!*/media/text/*/*.ssi
-!*/media/image/
-!*/media/image/*.png
-!*/media/image/*.jpg
-!*/media/image/*.PNG
-!*/media/image/*.JPG
-!*/tools/
-!*/tools/po4a/
-!*/tools/po4a/pot/
-!*/tools/po4a/pot/*.sst.pot
-!*/tools/po4a/pot/*.ssm.pot
-!*/tools/po4a/pot/*.ssi.pot
-!*/tools/po4a/po/
-!*/tools/po4a/po/*/
-!*/tools/po4a/po/*/*.sst.po
-!*/tools/po4a/po/*/*.ssm.po
-!*/tools/po4a/po/*/*.ssi.po
-.dub/**
-tmp/**
-*_.org
-*_.d
-*_.txt
-*_
-*~
-\#*
-*.\#*
-# *
-# !.gitignore
-# !pod.manifest
-# !*/
-# !*/conf/
-# !*/conf/sisu_document_make
-# !*/media/
-# !*/media/text/
-# !*/media/text/*/
-# !*/media/text/*/*.sst
-# !*/media/text/*/*.ssm
-# !*/media/text/*/*.ssi
-# !*/media/image/
-# !*/media/image/*.png
-# !*/media/image/*.jpg
-# !*/media/image/*.PNG
-# !*/media/image/*.JPG
diff --git a/markup/pod/README b/markup/pod/README
new file mode 100644
index 0000000..cadc8c8
--- /dev/null
+++ b/markup/pod/README
@@ -0,0 +1 @@
+find . -type f -iname "*sst" > sst_files_
diff --git a/markup/pod/accelerando.charles_stross/media/text/en/accelerando.charles_stross.sst b/markup/pod/accelerando.charles_stross/media/text/en/accelerando.charles_stross.sst
index ab0cb29..5c6afdc 100644
--- a/markup/pod/accelerando.charles_stross/media/text/en/accelerando.charles_stross.sst
+++ b/markup/pod/accelerando.charles_stross/media/text/en/accelerando.charles_stross.sst
@@ -32,6 +32,7 @@ links: [
   ]
 
 make:
+  doc_type: "book"
   headings: "none; PART; none; Chapter;"
   breaks: "new=:A,:B; break=:C,1"
   home_button_image: "{accelerando_stross.png }http://www.accelerando.org/"
diff --git a/markup/pod/alices_adventures_in_wonderland.lewis_carroll/media/text/en/alices_adventures_in_wonderland.lewis_carroll.sst b/markup/pod/alices_adventures_in_wonderland.lewis_carroll/media/text/en/alices_adventures_in_wonderland.lewis_carroll.sst
index ca78482..7f1bb04 100644
--- a/markup/pod/alices_adventures_in_wonderland.lewis_carroll/media/text/en/alices_adventures_in_wonderland.lewis_carroll.sst
+++ b/markup/pod/alices_adventures_in_wonderland.lewis_carroll/media/text/en/alices_adventures_in_wonderland.lewis_carroll.sst
@@ -25,7 +25,7 @@ links: [
   ]
 
 make:
-  breaks: "new=3; break=4"
+  doc_type: "book"
 
 :A~ @title-creator-date \\ The Millennium Fulcrum Edition 3.0 [text only]
 
diff --git a/markup/pod/content.cory_doctorow/media/text/en/content.cory_doctorow.sst b/markup/pod/content.cory_doctorow/media/text/en/content.cory_doctorow.sst
index 891f934..e18e5a5 100644
--- a/markup/pod/content.cory_doctorow/media/text/en/content.cory_doctorow.sst
+++ b/markup/pod/content.cory_doctorow/media/text/en/content.cory_doctorow.sst
@@ -31,8 +31,9 @@ links: [
   ]
 
 make:
-  auto_num_top_at_level: "1"
+  doc_type: "book"
   breaks: "break=1"
+  auto_num_top_at_level: "1"
   emphasis: "italics"
   home_button_text: "{CONTENT}http://craphound.com/content; {Cory Doctorow}http://www.doctorow.com"
   footer: "{CONTENT}http://craphound.com/content; {Cory Doctorow}http://www.doctorow.com"
diff --git a/markup/pod/down_and_out_in_the_magic_kingdom.cory_doctorow/media/text/en/down_and_out_in_the_magic_kingdom.cory_doctorow.sst b/markup/pod/down_and_out_in_the_magic_kingdom.cory_doctorow/media/text/en/down_and_out_in_the_magic_kingdom.cory_doctorow.sst
index 4e19624..ca549cc 100644
--- a/markup/pod/down_and_out_in_the_magic_kingdom.cory_doctorow/media/text/en/down_and_out_in_the_magic_kingdom.cory_doctorow.sst
+++ b/markup/pod/down_and_out_in_the_magic_kingdom.cory_doctorow/media/text/en/down_and_out_in_the_magic_kingdom.cory_doctorow.sst
@@ -36,7 +36,8 @@ links: [
   ]
 
 make:
-  breaks: "new=:C; break=1"
+  doc_type: "book"
+  breaks: "break=1"
   home_button_text: "{Down and Out in the Magic Kingdom}http://craphound.com/down; {Cory Doctorow}http://www.doctorow.com"
   footer: "{Down and Out in the Magic Kingdom}http://craphound.com/down; {Cory Doctorow}http://www.doctorow.com"
 
diff --git a/markup/pod/for_the_win.cory_doctorow/media/text/en/for_the_win.cory_doctorow.sst b/markup/pod/for_the_win.cory_doctorow/media/text/en/for_the_win.cory_doctorow.sst
index 965477b..a68cdd8 100644
--- a/markup/pod/for_the_win.cory_doctorow/media/text/en/for_the_win.cory_doctorow.sst
+++ b/markup/pod/for_the_win.cory_doctorow/media/text/en/for_the_win.cory_doctorow.sst
@@ -33,8 +33,9 @@ links: [
   ]
 
 make:
+  doc_type: "book"
+  breaks: "new=:B; break=1"
   auto_num_top_at_level: "1"
-  breaks: "new=:C; break=1"
   home_button_text: "{For the Win}http://craphound.com/ftw; {Cory Doctorow}http://www.doctorow.com"
   footer: "{For the Win}http://craphound.com/ftw; {Cory Doctorow}http://www.doctorow.com"
 
diff --git a/markup/pod/free_culture.lawrence_lessig/media/text/en/free_culture.lawrence_lessig.sst b/markup/pod/free_culture.lawrence_lessig/media/text/en/free_culture.lawrence_lessig.sst
index 9182759..a9141fe 100644
--- a/markup/pod/free_culture.lawrence_lessig/media/text/en/free_culture.lawrence_lessig.sst
+++ b/markup/pod/free_culture.lawrence_lessig/media/text/en/free_culture.lawrence_lessig.sst
@@ -37,6 +37,7 @@ links: [
   ]
 
 make:
+  doc_type: "book"
   breaks: "new=:B; break=1"
   home_button_image: "{freeculture.home.png }http://www.free-culture.cc"
   home_button_text: "{Free Culture}http://www.free-culture.cc; {Lawrence Lessig}http://www.lessig.org"
diff --git a/markup/pod/free_for_all.peter_wayner/media/text/en/free_for_all.peter_wayner.sst b/markup/pod/free_for_all.peter_wayner/media/text/en/free_for_all.peter_wayner.sst
index 252cad1..5a9e0af 100644
--- a/markup/pod/free_for_all.peter_wayner/media/text/en/free_for_all.peter_wayner.sst
+++ b/markup/pod/free_for_all.peter_wayner/media/text/en/free_for_all.peter_wayner.sst
@@ -41,8 +41,9 @@ links: [
   ]
 
 make:
-  auto_num_top_at_level: "1"
+  doc_type: "book"
   breaks: "new=:A,:B,:C,1"
+  auto_num_top_at_level: "1"
   home_button_image: "{wayner.home.png }http://www.wayner.org/books/ffa/"
   home_button_text: "{Free For All}http://www.wayner.org/books/ffa/; {Peter Wayner}http://www.wayner.org"
   footer: "{Free For All}http://www.wayner.org/books/ffa/; {Peter Wayner}http://www.wayner.org"
diff --git a/markup/pod/gpl2.fsf/media/text/en/gpl2.fsf.sst b/markup/pod/gpl2.fsf/media/text/en/gpl2.fsf.sst
index 37a1c91..6cb7e8a 100644
--- a/markup/pod/gpl2.fsf/media/text/en/gpl2.fsf.sst
+++ b/markup/pod/gpl2.fsf/media/text/en/gpl2.fsf.sst
@@ -20,6 +20,9 @@ links: [
     "{ GPL @ SiSU }http://www.jus.uio.no/sisu/gpl2.fsf"
   ]
 
+make:
+  doc_type: "article"
+
 :A~ GNU GENERAL PUBLIC LICENSE
 
 :B~ Version 2, June 1991
diff --git a/markup/pod/gpl3.fsf/media/text/en/gpl3.fsf.sst b/markup/pod/gpl3.fsf/media/text/en/gpl3.fsf.sst
index bdcf318..b2b4059 100644
--- a/markup/pod/gpl3.fsf/media/text/en/gpl3.fsf.sst
+++ b/markup/pod/gpl3.fsf/media/text/en/gpl3.fsf.sst
@@ -29,6 +29,9 @@ links: [
     "{ GPL3 source text }http://www.gnu.org/licenses/gpl-3.0.txt"
   ]
 
+make:
+  doc_type: "article"
+
 :A~ GNU GENERAL PUBLIC LICENSE
 
 :B~ Version 3, 29 June 2007
diff --git a/markup/pod/gullivers_travels.jonathan_swift/media/text/en/gullivers_travels.jonathan_swift.sst b/markup/pod/gullivers_travels.jonathan_swift/media/text/en/gullivers_travels.jonathan_swift.sst
index 29f0dbd..27a0686 100644
--- a/markup/pod/gullivers_travels.jonathan_swift/media/text/en/gullivers_travels.jonathan_swift.sst
+++ b/markup/pod/gullivers_travels.jonathan_swift/media/text/en/gullivers_travels.jonathan_swift.sst
@@ -27,8 +27,9 @@ links: [
   ]
 
 make:
+  doc_type: "book"
   headings: "PART; none; none; CHAPTER;"
-  breaks: "new=3; break=4"
+  breaks: "new=:B; break=1"
 
 A~ @title-author-date
 
diff --git a/markup/pod/little_brother.cory_doctorow/media/text/en/little_brother.cory_doctorow.sst b/markup/pod/little_brother.cory_doctorow/media/text/en/little_brother.cory_doctorow.sst
index 71a267a..6f3ba21 100644
--- a/markup/pod/little_brother.cory_doctorow/media/text/en/little_brother.cory_doctorow.sst
+++ b/markup/pod/little_brother.cory_doctorow/media/text/en/little_brother.cory_doctorow.sst
@@ -37,7 +37,7 @@ links: [
   ]
 
 make:
-  breaks: "break=1"
+  doc_type: "book"
   cover_image: "{cover_image_wordle_little_brother.png 494x775 \"Little Brother\" }image"
   home_button_image: "{little_brother_doctorow.png }http://craphound.com/littlebrother"
   home_button_text: "{Little Brother}http://craphound.com/littlebrother; {Cory Doctorow}http://www.doctorow.com"
diff --git a/markup/pod/on_the_net_and_information.ralph_amissah/media/text/en/on_the_net_and_information.ralph_amissah.sst b/markup/pod/on_the_net_and_information.ralph_amissah/media/text/en/on_the_net_and_information.ralph_amissah.sst
index 757bca2..27f1500 100644
--- a/markup/pod/on_the_net_and_information.ralph_amissah/media/text/en/on_the_net_and_information.ralph_amissah.sst
+++ b/markup/pod/on_the_net_and_information.ralph_amissah/media/text/en/on_the_net_and_information.ralph_amissah.sst
@@ -19,6 +19,9 @@ classify:
 notes:
   summary: "Writing on the implications of the positive potential of the web for knowledge and information dissemination given the different motives for publication."
 
+make:
+  doc_type: "article"
+
 # links = [
 #   "{ LM Information }../lm.information/toc.html",
 #   "{ LM Objective }../lm.information/objective.html"
diff --git a/markup/pod/outputs_of_ai_systems_qualify_as_artwork.anna_linne/media/text/en/outputs_of_ai_systems_qualify_as_artwork.anna_linne.sst b/markup/pod/outputs_of_ai_systems_qualify_as_artwork.anna_linne/media/text/en/outputs_of_ai_systems_qualify_as_artwork.anna_linne.sst
index ec8a080..f1a52ee 100644
--- a/markup/pod/outputs_of_ai_systems_qualify_as_artwork.anna_linne/media/text/en/outputs_of_ai_systems_qualify_as_artwork.anna_linne.sst
+++ b/markup/pod/outputs_of_ai_systems_qualify_as_artwork.anna_linne/media/text/en/outputs_of_ai_systems_qualify_as_artwork.anna_linne.sst
@@ -18,6 +18,9 @@ classify:
 notes:
   summary: "on Art and Artificial Intelligence"
 
+make:
+  doc_type: "article"
+
 A~ @title-author-date
 
 1~ What is an artwork?
diff --git a/markup/pod/revisiting_the_autonomous_contract.ralph_amissah/media/text/en/revisiting_the_autonomous_contract.ralph_amissah.sst b/markup/pod/revisiting_the_autonomous_contract.ralph_amissah/media/text/en/revisiting_the_autonomous_contract.ralph_amissah.sst
index 57e5005..1397948 100644
--- a/markup/pod/revisiting_the_autonomous_contract.ralph_amissah/media/text/en/revisiting_the_autonomous_contract.ralph_amissah.sst
+++ b/markup/pod/revisiting_the_autonomous_contract.ralph_amissah/media/text/en/revisiting_the_autonomous_contract.ralph_amissah.sst
@@ -18,6 +18,7 @@ classify:
   subject: "international contracts, international commercial arbitration, private international law"
 
 make:
+  doc_type: "article"
   italics: "CISG|PICC|PECL|UNCITRAL|UNIDROIT|lex mercatoria|pacta sunt servanda|caveat subscriptor|ex aequo et bono|amiable compositeur|ad hoc"
   auto_num_top_at_level: "1"
 
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
diff --git a/markup/pod/the_autonomous_contract.ralph_amissah/media/text/en/the_autonomous_contract.ralph_amissah.sst b/markup/pod/the_autonomous_contract.ralph_amissah/media/text/en/the_autonomous_contract.ralph_amissah.sst
index 183491c..6919582 100644
--- a/markup/pod/the_autonomous_contract.ralph_amissah/media/text/en/the_autonomous_contract.ralph_amissah.sst
+++ b/markup/pod/the_autonomous_contract.ralph_amissah/media/text/en/the_autonomous_contract.ralph_amissah.sst
@@ -18,6 +18,7 @@ classify:
   subject: "international contracts, international commercial arbitration, private international law"
 
 make:
+  doc_type: "article"
   auto_num_top_at_level: "1"
   prefix: "Prepared for the XIII Nordic Conference on Legal Informatics, Paper publication not yet available"
 
diff --git a/markup/pod/the_cathedral_and_the_bazaar.eric_s_raymond/media/text/en/the_cathedral_and_the_bazaar.eric_s_raymond.sst b/markup/pod/the_cathedral_and_the_bazaar.eric_s_raymond/media/text/en/the_cathedral_and_the_bazaar.eric_s_raymond.sst
index d796953..8269d16 100644
--- a/markup/pod/the_cathedral_and_the_bazaar.eric_s_raymond/media/text/en/the_cathedral_and_the_bazaar.eric_s_raymond.sst
+++ b/markup/pod/the_cathedral_and_the_bazaar.eric_s_raymond/media/text/en/the_cathedral_and_the_bazaar.eric_s_raymond.sst
@@ -33,7 +33,8 @@ links: [
   ]
 
 make:
-  breaks: "new=:C; break=1"
+  doc_type: "article"
+  breaks: "break=1"
   home_button_text: "{The Cathedral and the Bazaar}http://www.catb.org/esr/writings/homesteading/; {Eric S. Raymond}http://www.catb.org/~esr/"
   footer: "{The Cathedral and the Bazaar}http://www.catb.org/esr/writings/homesteading/; {Eric S. Raymond}http://www.catb.org/~esr/"
 
diff --git a/markup/pod/the_public_domain.james_boyle/media/text/en/the_public_domain.james_boyle.sst b/markup/pod/the_public_domain.james_boyle/media/text/en/the_public_domain.james_boyle.sst
index 2adfe9c..7ffbe3e 100644
--- a/markup/pod/the_public_domain.james_boyle/media/text/en/the_public_domain.james_boyle.sst
+++ b/markup/pod/the_public_domain.james_boyle/media/text/en/the_public_domain.james_boyle.sst
@@ -23,8 +23,9 @@ links: [
   ]
 
 make:
+  doc_type: "book"
+  breaks: "break=1"
   headings: "none; none; none; none;"
-  breaks: "new=:C; break=1"
   home_button_text: "{The Public Domain}http://www.thepublicdomain.org/; {James Boyle}http://james-boyle.com/"
   footer: "{The Public Domain}http://www.thepublicdomain.org/; {James Boyle}http://james-boyle.com/"
 
diff --git a/markup/pod/the_wealth_of_networks.yochai_benkler/media/text/en/the_wealth_of_networks.yochai_benkler.sst b/markup/pod/the_wealth_of_networks.yochai_benkler/media/text/en/the_wealth_of_networks.yochai_benkler.sst
index 13f9310..6ee9a44 100644
--- a/markup/pod/the_wealth_of_networks.yochai_benkler/media/text/en/the_wealth_of_networks.yochai_benkler.sst
+++ b/markup/pod/the_wealth_of_networks.yochai_benkler/media/text/en/the_wealth_of_networks.yochai_benkler.sst
@@ -42,6 +42,7 @@ links: [
   ]
 
 make:
+  doc_type: "book"
   breaks: "new=:B; break=1"
   home_button_image: "{won_benkler.png }http://cyber.law.harvard.edu/wealth_of_networks/Main_Page"
   footer: "{The Wealth of Networks}http://cyber.law.harvard.edu/wealth_of_networks/Main_Page; {Yochai Benkler}http://http://www.benkler.org"
diff --git a/markup/pod/through_the_looking_glass.lewis_carroll/media/text/en/through_the_looking_glass.lewis_carroll.sst b/markup/pod/through_the_looking_glass.lewis_carroll/media/text/en/through_the_looking_glass.lewis_carroll.sst
index 04a9f01..5d693ba 100644
--- a/markup/pod/through_the_looking_glass.lewis_carroll/media/text/en/through_the_looking_glass.lewis_carroll.sst
+++ b/markup/pod/through_the_looking_glass.lewis_carroll/media/text/en/through_the_looking_glass.lewis_carroll.sst
@@ -27,8 +27,9 @@ links: [
   ]
 
 make:
+  doc_type: "book"
   headings: "none; none; none; CHAPTER;"
-  breaks: "new=3; break=4"
+  breaks: "new=B; break=1"
 
 :A~ @title-author-date \\ The Millennium Fulcrum Edition 1.7 [text only]
 
diff --git a/markup/pod/two_bits.christopher_kelty/media/text/en/two_bits.christopher_kelty.sst b/markup/pod/two_bits.christopher_kelty/media/text/en/two_bits.christopher_kelty.sst
index 33321c1..e005da7 100644
--- a/markup/pod/two_bits.christopher_kelty/media/text/en/two_bits.christopher_kelty.sst
+++ b/markup/pod/two_bits.christopher_kelty/media/text/en/two_bits.christopher_kelty.sst
@@ -11,7 +11,7 @@ date:
   published: "2008"
 
 rights:
-  copyright: "© 2008 Duke University Press \\ Printed in the United States of America on acid-free paper ∞ \\ Designed by C. H. Westmoreland \\ Typeset in Charis (an Open Source font) by Achorn International \\ Library of Congress Cataloging-in-Publication data and republication acknowledgments appear on the last printed pages of this book."
+  copyright: "2008 Duke University Press \\ Printed in the United States of America on acid-free paper ∞ \\ Designed by C. H. Westmoreland \\ Typeset in Charis (an Open Source font) by Achorn International \\ Library of Congress Cataloging-in-Publication data and republication acknowledgments appear on the last printed pages of this book."
   license: "Licensed under the Creative Commons Attribution-NonCommercial-Share Alike License, available at http://creativecommons.org/licenses/by-nc-sa/3.0/ or by mail from Creative Commons, 559 Nathan Abbott Way, Stanford, Calif. 94305, U.S.A. \"NonCommercial\" as defined in this license specifically excludes any sale of this work or any portion thereof for money, even if sale does not result in a profit by the seller or if the sale is by a 501(c)(3) nonprofit or NGO. \\ Duke University Press gratefully acknowledges the support of HASTAC (Humanities, Arts, Science, and Technology Advanced Collaboratory), which provided funds to help support the electronic interface of this book. \\ Two Bits is accessible on the Web at twobits.net."
 
 classify:
@@ -31,7 +31,8 @@ links: [
   ]
 
 make:
-  breaks: "new=:C; break=1"
+  doc_type: "book"
+  breaks: "new=:B; break=1"
   italics: "/Two Bits/i"
   home_button_text: "{Two Bits}http://twobits.net; {Christopher M. Kelty}http://kelty.org/"
   footer: "{Two Bits}http://twobits.net; {Christopher M. Kelty}http://kelty.org/"
diff --git a/markup/pod/viral_spiral.david_bollier/media/text/en/viral_spiral.david_bollier.sst b/markup/pod/viral_spiral.david_bollier/media/text/en/viral_spiral.david_bollier.sst
index 8931c8d..973062a 100644
--- a/markup/pod/viral_spiral.david_bollier/media/text/en/viral_spiral.david_bollier.sst
+++ b/markup/pod/viral_spiral.david_bollier/media/text/en/viral_spiral.david_bollier.sst
@@ -30,6 +30,7 @@ links: [
   ]
 
 make:
+  doc_type: "book"
   breaks: "new=:B,C; break=1"
   texpdf_font: "Liberation Sans"
   home_button_text: "{Viral Spiral}http://viralspiral.cc/; {David Bollier}http://www.bollier.org/"
diff --git a/markup/pod/war_and_peace.leo_tolstoy/media/text/en/war_and_peace.leo_tolstoy.sst b/markup/pod/war_and_peace.leo_tolstoy/media/text/en/war_and_peace.leo_tolstoy.sst
index 405a88d..260dc3e 100644
--- a/markup/pod/war_and_peace.leo_tolstoy/media/text/en/war_and_peace.leo_tolstoy.sst
+++ b/markup/pod/war_and_peace.leo_tolstoy/media/text/en/war_and_peace.leo_tolstoy.sst
@@ -28,7 +28,8 @@ date:
 #  :original: Russian
 
 make:
-  breaks: "new=:C; break=1"
+  doc_type: "book"
+  breaks: "new=:B; break=1"
   headings:
     - BOOK|FIRST|SECOND
     - none