From 594d7bb060a2c1f7779ce1453ef6dc83179e3071 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Wed, 26 Sep 2007 21:16:47 +0100
Subject: gen manual pages alone for testing

---
 data/doc/sisu/sisu_markup_samples/sisu_manual/Rantfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/Rantfile b/data/doc/sisu/sisu_markup_samples/sisu_manual/Rantfile
index bc3e2b5d..f62b7f5e 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/Rantfile
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/Rantfile
@@ -309,6 +309,7 @@ task :genlite do
 end
 task :manpages do
   manpages
+  manpage_move
   clean
 end
 task :manpage_mv do
-- 
cgit v1.2.3


From 8d5f29f47ab21a2b30f0e5457993a10793936f47 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Wed, 26 Sep 2007 22:52:05 +0100
Subject: sisu-0.60 intruduces separate sisu-doc package, rationale in
 CHANGELOG

---
 data/doc/sisu/CHANGELOG | 42 ++++++++++++++++++++++++++++++++++++++----
 1 file changed, 38 insertions(+), 4 deletions(-)

diff --git a/data/doc/sisu/CHANGELOG b/data/doc/sisu/CHANGELOG
index e0b8156f..9dc35163 100644
--- a/data/doc/sisu/CHANGELOG
+++ b/data/doc/sisu/CHANGELOG
@@ -3,11 +3,45 @@ Reverse Chronological:
 
 %% STABLE MANIFEST
 
-%% sisu_0.59.1.orig.tar.gz (2007-09-24:39/1)
+%% sisu_0.60.0.orig.tar.gz (2007-09-26:39/3)
+http://www.jus.uio.no/sisu/pkg/src/sisu_0.60.0.orig.tar.gz
+  sisu_0.60.0.orig.tar.gz
+  sisu_0.60.0-1.dsc
+  sisu_0.60.0-1.diff.gz
+
+  * generated documentation moved out of source tarball entirely, in sisu-0.59
+    series sisu documentation as generated by sisu was introduced, (the debian
+    package made a separate sub-package of this), however: this made the
+    tarball much larger than it was previously (in the order of 5 times the
+    size, over 10Mb instead of under 2), and; this has very unattractive
+    implications for source control management / git, as much of the output is
+    in binary file format which as they include information on when they were
+    built and which version of sisu they were built with, have different hash
+    values from one generation to the next, which means large diffs and
+    repeated storing of binary files which may contain essentially the same
+    data, and rapid growth in size of the git repository. Solution sisu-0.60:
+    * keep the sisu source tarball to as little binary content as is necessary
+      by separating out the documents produced (this keeps diffs to essentials,
+      and both the tarball and repository smaller in size)
+    * keep a separate tarball for documentation as generated sisu-doc; offer
+      that as a package on its own, (request that debian consider it for
+      inclusion as such).
+
+  * sysenv, sisurc.yml allow use of relative output paths, expand to absolute
+
+  * html segmented, bugfix: footnotes for headings levels :A,:B and :C
+    correctly placed in first segment when batch-processing files/output
+
+  * help, (hub), minor reorganisation and a change in info returned, most
+    significantly the response for typing 'sisu' without options
+
+  * sysenv, syslink issue, additional check
+
+%% sisu_0.59.1.orig.tar.gz (2007-09-25:39/2)
 http://www.jus.uio.no/sisu/pkg/src/sisu_0.59.1.orig.tar.gz
-  sisu_0.59.1.orig.tar.gz
-  sisu_0.59.1-1.dsc
-  sisu_0.59.1-1.diff.gz
+  cf512ec871aeb7cdabc0b3b35b7e6d05 10952059 sisu_0.59.1.orig.tar.gz
+  a260c1dbec59c78cd0e330b5cd790f6a 617 sisu_0.59.1-1.dsc
+  55837afd842d274afc2180fca519d260 141832 sisu_0.59.1-1.diff.gz
 
   * plaintext, more space between endnotes where chosen (default remains
     footnotes)
-- 
cgit v1.2.3


From 3f282d767483807e33d4d1611056a005cdd68ff5 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Wed, 26 Sep 2007 23:43:31 +0100
Subject: matches to take account of internal new naming/tagging of "document
 information" heading 1~meta

---
 lib/sisu/v0/html.rb              | 6 +++---
 lib/sisu/v0/html_scroll.rb       | 4 ++--
 lib/sisu/v0/odf.rb               | 2 +-
 lib/sisu/v0/sst_to_s_xml_dom.rb  | 2 +-
 lib/sisu/v0/sst_to_s_xml_node.rb | 4 ++--
 lib/sisu/v0/sst_to_s_xml_sax.rb  | 2 +-
 lib/sisu/v0/xhtml.rb             | 2 +-
 lib/sisu/v0/xml.rb               | 2 +-
 lib/sisu/v0/xml_dom.rb           | 2 +-
 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/lib/sisu/v0/html.rb b/lib/sisu/v0/html.rb
index bdfd98ee..d12b6637 100644
--- a/lib/sisu/v0/html.rb
+++ b/lib/sisu/v0/html.rb
@@ -390,14 +390,14 @@ WOK
         end
         toc={}
         format_toc=SiSU_HTML_Format_type::Format_toc.new(@md,title)
-        toc[:seg]=if para =~/^\d~\s+Document Information/
+        toc[:seg]=if para =~/^\d~meta\s+Document Information/
           format_toc.lev0
         else format_toc.lev1
         end
         title=if para =~/(<~0;(?:\w|[0-6]:)\d+;\w\d+><#@dp:#@dp>)$/
           m=/#{$1}/
           para.gsub!(m,'')
-          if para=~/^\d~\s+Document Information/
+          if para=~/^\d~meta\s+Document Information/
             %{<a href="#docinfo">#{linkname}</a>}
           else linkname
           end
@@ -409,7 +409,7 @@ WOK
           %{<b><a href="##{link}">#{linkname}</a></b>}
         end
         format_toc=SiSU_HTML_Format_type::Format_toc.new(@md,title)
-        toc[:scr]=if para =~/^\d~\s+Document Information/
+        toc[:scr]=if para =~/^\d~meta\s+Document Information/
           format_toc.lev0
         else format_toc.lev1
         end
diff --git a/lib/sisu/v0/html_scroll.rb b/lib/sisu/v0/html_scroll.rb
index 629cfc0c..30640f30 100644
--- a/lib/sisu/v0/html_scroll.rb
+++ b/lib/sisu/v0/html_scroll.rb
@@ -80,13 +80,13 @@ module SiSU_HTML_scroll
       @rcdc=false
       @scr={ :body=>[],:metadata=>[],:owner_details=>[] }
       data.each do |para|
-        if para =~/^\d~\s+Document Information/
+        if para =~/^\d~meta\s+Document Information/
           para.gsub!(/(Document Information(?: \(metadata\))?)/,'\1<a name="docinfo"></a>')
         end
         if para =~/^\d~metadata\s+Metadata/
           para.gsub!(/(Metadata)/,'\1<a name="metadata"></a>')
         end
-        @rcdc=true if @rcdc==false and (para =~/^\d~metadata/ or para =~/^1~\s+Document Information/)
+        @rcdc=true if @rcdc==false and (para =~/^\d~metadata/ or para =~/^1~meta\s+Document Information/)
         if para !~/(^0~|<ENDNOTES>|<EOF>)/
           unless para =~/^<:code>/; para.gsub!(/~[{\[].+?[}\]]~\s+/m,' ')
           end
diff --git a/lib/sisu/v0/odf.rb b/lib/sisu/v0/odf.rb
index d4d4fd2f..981bedeb 100644
--- a/lib/sisu/v0/odf.rb
+++ b/lib/sisu/v0/odf.rb
@@ -516,7 +516,7 @@ module SiSU_ODF
             if d_meta; odf_metadata(d_meta)
             end
           end
-          @rcdc=true if @rcdc==false and (para =~/~metadata/ or para =~/1~\s+Document Information/)
+          @rcdc=true if @rcdc==false and (para =~/~metadata/ or para =~/1~meta\s+Document Information/)
           if para !~/(^0~|<ENDNOTES>|<EOF>)/
             if para =~@regx #/.+?<~\d+;\w\d+;\w\d+>.*/ #watch change
               paranum=para[@regx,3]
diff --git a/lib/sisu/v0/sst_to_s_xml_dom.rb b/lib/sisu/v0/sst_to_s_xml_dom.rb
index 46c2d366..8e3fce27 100644
--- a/lib/sisu/v0/sst_to_s_xml_dom.rb
+++ b/lib/sisu/v0/sst_to_s_xml_dom.rb
@@ -356,7 +356,7 @@ WOK
             if d_meta; xml_head(d_meta)
             end
           end
-          @rcdc=true if @rcdc==false and (para =~/~metadata/ or para =~/^1~\s+Document Information/)
+          @rcdc=true if @rcdc==false and (para =~/~metadata/ or para =~/^1~meta\s+Document Information/)
           if para !~/(^0~|^@\S+?:|<ENDNOTES>|<EOF>)/
             @sto=SiSU_text_parts::Split_text_object.new(@md,para).lev_segname_para
             unless @rcdc
diff --git a/lib/sisu/v0/sst_to_s_xml_node.rb b/lib/sisu/v0/sst_to_s_xml_node.rb
index 8ed1b51b..cbaf7672 100644
--- a/lib/sisu/v0/sst_to_s_xml_node.rb
+++ b/lib/sisu/v0/sst_to_s_xml_node.rb
@@ -418,7 +418,7 @@ WOK
         obj.each do |o|
           para=o.txt unless o.txt =~/^%% / #comments are lost, consider
           if para
-            @rcdc=true if @rcdc==false and (para =~/~metadata/ or para =~/^1~\s+Document Information/)
+            @rcdc=true if @rcdc==false and (para =~/~metadata/ or para =~/^1~meta\s+Document Information/)
             if para !~/(^0~|^@\S+?:|^\s*$|<ENDNOTES>|<EOF>)/
               @sto=SiSU_text_parts::Split_text_object.new(@md,para).lev_segname_para
               unless @rcdc
@@ -457,7 +457,7 @@ WOK
         obj.each do |o|
           para=o.txt unless o.txt =~/^%% / #comments are lost, consider
           if para
-            @rcdc=true if @rcdc==false and (para =~/~metadata/ or para =~/^1~\s+Document Information/)
+            @rcdc=true if @rcdc==false and (para =~/~metadata/ or para =~/^1~meta\s+Document Information/)
             if para !~/(^0~|^@\S+?:|^\s*$|<ENDNOTES>|<EOF>)/
               @sto=SiSU_text_parts::Split_text_object.new(@md,para).lev_segname_para
               unless @rcdc
diff --git a/lib/sisu/v0/sst_to_s_xml_sax.rb b/lib/sisu/v0/sst_to_s_xml_sax.rb
index 5a232455..9ea7d58c 100644
--- a/lib/sisu/v0/sst_to_s_xml_sax.rb
+++ b/lib/sisu/v0/sst_to_s_xml_sax.rb
@@ -265,7 +265,7 @@ WOK
             if d_meta; xml_head(d_meta)
             end
           end
-          @rcdc=true if @rcdc==false and (para =~/~metadata/ or para =~/^1~\s+Document Information/)
+          @rcdc=true if @rcdc==false and (para =~/~metadata/ or para =~/^1~meta\s+Document Information/)
           if para !~/(^0~|^@\S+?:|^\s*$|<ENDNOTES>|<EOF>)/
             @sto=SiSU_text_parts::Split_text_object.new(@md,para).lev_segname_para
             unless @rcdc
diff --git a/lib/sisu/v0/xhtml.rb b/lib/sisu/v0/xhtml.rb
index 20fa702a..1d7d63d1 100644
--- a/lib/sisu/v0/xhtml.rb
+++ b/lib/sisu/v0/xhtml.rb
@@ -289,7 +289,7 @@ WOK
             if d_meta; xml_head(d_meta)
             end
           end
-          @rcdc=true if @rcdc==false and (para =~/~metadata/ or para =~/1~\s+Document Information/)
+          @rcdc=true if @rcdc==false and (para =~/~metadata/ or para =~/1~meta\s+Document Information/)
           if para !~/(^0~|<ENDNOTES>|<EOF>)/
             if para =~/.+?<~\d+;(?:\w|[0-6]:)\d+;\w\d+><#@dp:#@dp>$/
               paranum=para[@regx,3]
diff --git a/lib/sisu/v0/xml.rb b/lib/sisu/v0/xml.rb
index d9070dc1..2dd25491 100644
--- a/lib/sisu/v0/xml.rb
+++ b/lib/sisu/v0/xml.rb
@@ -313,7 +313,7 @@ WOK
             if d_meta; xml_head(d_meta)
             end
           end
-          @rcdc=true if @rcdc==false and (para =~/~metadata/ or para =~/1~\s+Document Information/)
+          @rcdc=true if @rcdc==false and (para =~/~metadata/ or para =~/1~meta\s+Document Information/)
           if para !~/(^0~|<ENDNOTES>|<EOF>)/
             if para =~/.+?<~\d+;(?:\w|[0-6]:)\d+;\w\d+><#@dp:#@dp>$/
               paranum=para[@regx,3]
diff --git a/lib/sisu/v0/xml_dom.rb b/lib/sisu/v0/xml_dom.rb
index 82d882e0..83b15dc8 100644
--- a/lib/sisu/v0/xml_dom.rb
+++ b/lib/sisu/v0/xml_dom.rb
@@ -338,7 +338,7 @@ WOK
             if d_meta; xml_head(d_meta)
             end
           end
-          @rcdc=true if @rcdc==false and (para =~/~metadata/ or para =~/1~\s+Document Information/)
+          @rcdc=true if @rcdc==false and (para =~/~metadata/ or para =~/1~meta\s+Document Information/)
           if para !~/(^0~|<ENDNOTES>|<EOF>)/
             if para =~/.+?<~\d+;(?:\w|[0-6]:)\d+;\w\d+><#@dp:#@dp>$/
               paranum=para[@regx,3]
-- 
cgit v1.2.3


From 162fe2a563e93e5686c570cc3667226537d393a6 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Fri, 28 Sep 2007 07:48:56 +0100
Subject: for now remove (sphinx or robot) images, obtain compatible copyright
 permission from author, likely not to be a problem, but clarify

---
 .../sisu_manual/_sisu/image/aukio.png                   | Bin 63838 -> 0 bytes
 .../sisu_manual/_sisu/image/i_sor.png                   | Bin 36028 -> 0 bytes
 .../sisu_manual/_sisu/image/tulva.png                   | Bin 70930 -> 0 bytes
 .../sisu_markup_samples/sisu_manual/sisu_download.ssi   |   2 --
 .../sisu_markup_samples/sisu_manual/sisu_examples.sst   |   4 ----
 5 files changed, 6 deletions(-)
 delete mode 100644 data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/image/aukio.png
 delete mode 100644 data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/image/i_sor.png
 delete mode 100644 data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/image/tulva.png

diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/image/aukio.png b/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/image/aukio.png
deleted file mode 100644
index f64d94a5..00000000
Binary files a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/image/aukio.png and /dev/null differ
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/image/i_sor.png b/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/image/i_sor.png
deleted file mode 100644
index fa8be7f6..00000000
Binary files a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/image/i_sor.png and /dev/null differ
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/image/tulva.png b/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/image/tulva.png
deleted file mode 100644
index 20ab95bb..00000000
Binary files a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/image/tulva.png and /dev/null differ
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
index 25d2f5b9..68010c60 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
@@ -83,8 +83,6 @@ For installation notes see http://www.jus.uio.no/sisu/SiSU/download.html
 
 For changelogs see http://www.jus.uio.no/sisu/SiSU/changelog.html
 
-{ tulva.png 425x339 "Tulva, by Leena Krohn" }http://www.jus.uio.no/sisu/SiSU ~{ Reproduced with the kind permission of author and artist Leena Krohn, http://www.kaapeli.fi/krohn Tulva is from the work Sphinx or Robot http://www.jus.uio.no/sisu/sphinx_or_robot.leena_krohn.1996 other works available online include Tainaron http://www.jus.uio.no/sisu/tainaron.leena_krohn.1998, these two works can be found in the book sample section http://www.jus.uio.no/sisu/SiSU/2.html#sample }~
-
 3~git- Git (source control management)
 
 Git repository currently at:
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_examples.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_examples.sst
index 6c30b395..eb1d641d 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_examples.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_examples.sst
@@ -59,8 +59,6 @@ For some documents hardly any markup at all is required at all, other than a hea
 
 2~ A few book (and other) examples *~books *~sample *~example *~output
 
-{ aukio.png 397x340 "Aukio, by Leena Krohn" }http://www.jus.uio.no/sisu/SiSU ~{ Reproduced with the kind permission of author and artist Leena Krohn, http://www.kaapeli.fi/krohn "Aukio" is from the work /{"Sphinx or Robot"}/ http://www.jus.uio.no/sisu/sphinx_or_robot.leena_krohn.1996 which is included as a book example in this section, together with another of the author's works, /{"Tainaron"}/ http://www.jus.uio.no/sisu/tainaron.leena_krohn.1998 }~
-
 3~wealth_of_networks- /{"The Wealth of Networks"}/, Yochai Benkler
 
 { "The Wealth of Networks", Yochai Benkler [3sS]}the_wealth_of_networks.yochai_benkler.sst
@@ -91,8 +89,6 @@ For some documents hardly any markup at all is required at all, other than a hea
 
 3~sphinx- /{"Sphinx or Robot"}/, Leena Krohn *~sor
 
-{i_sor.png 294x59 "Sphinx or Robot by Leena Krohn" }http://www.jus.uio.no/sisu/sphinx_or_robot.leena_krohn.1996
-
 { "Sphinx or Robot", Leena Krohn [3sS]}sphinx_or_robot.leena_krohn.1996.sst
 
 3~war_and_peace- /{"War and Peace"}/, Leo Tolstoy, PG Etext 2600 *~wap *~gutenberg
-- 
cgit v1.2.3