Merge branch 'upstream' into debian/sid

2 files changed, 43 insertions, 28 deletions

diff --git a/data/doc/sisu/CHANGELOG b/data/doc/sisu/CHANGELOG
index 78b3acac..563fb8bd 100644
--- a/data/doc/sisu/CHANGELOG
+++ b/data/doc/sisu/CHANGELOG
@@ -3,7 +3,7 @@ Reverse Chronological:
 
 %% STABLE MANIFEST
 
-%% sisu_0.60.0.orig.tar.gz (2007-09-29:39/6)
+%% sisu_0.60.0.orig.tar.gz (2007-10-03:40/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
@@ -29,6 +29,16 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.60.0.orig.tar.gz
 
   * sysenv, sisurc.yml allow use of relative output paths, expand to absolute
 
+  * parameter reading on first run of file, (initialization of parameters)
+
+  * processing directory /tmp/_sisu_processing permissions set to 777 as
+    processing for individual users occurs within sub-directory named after
+    user
+
+  * composite files (.ssm) building moved to processing directory, to overcome
+    problem of non-writable sisu-source document directories, perhaps also
+    cleaner (management of files)
+
   * param, behavior for reading headers changed to take in multi-lines, affects
     regex matching, watch
 
@@ -38,6 +48,11 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.60.0.orig.tar.gz
   * html segmented, bugfix: footnotes for headings levels :A,:B and :C
     correctly placed in first segment when batch-processing files/output
 
+  * latex/pdf minor cleaning,
+    * caret '^' is latex special character, additional match for escaping
+    * clean major headings of markup heading tag with tilde and name
+      e.g. '1~meta'
+
   * help, (hub), minor reorganisation and a change in info returned, most
     significantly the response for typing 'sisu' without options
 
@@ -48,15 +63,16 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.60.0.orig.tar.gz
 
   * man-pages, refinements to generation
 
+  * param / metadata, hash sums now returns has sum and file-name only even for
+    sisu-skin
+
   * NOTE you may be better off doing any diffs between 0.60 and 0.58 branch
     than against 0.59 which includes a lot of generated within the package
     documentation, 0.60 adds source only. [Am tempted to remove 0.59 completely
     from git history as it increases the size of the scm repository by so
     much...]
 
-  * debian, 0.60 sorts issues with 0.59 branch, 0.60 should be debian ready but
-    is all dressed up and not uploadable anywhere before 2007-10-02 when back
-    online
+  * debian, 0.60 sorts issues with 0.59 branch
 
 %% 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
diff --git a/data/doc/sisu/html/sisu_vim.7.html b/data/doc/sisu/html/sisu_vim.7.html
index c9ea62bb..ad968136 100644
--- a/data/doc/sisu/html/sisu_vim.7.html
+++ b/data/doc/sisu/html/sisu_vim.7.html
@@ -35,7 +35,8 @@ sisu markup syntax highlighting.
 (including the syntax highlighter which may be used for earlier versions
 of Vim). 
 <p>  sisu-vim actions are activated on files with the suffix .sst .ssm
-.ssi .-sst ._sst (and the same with a further .meta extension) 
+.ssi  .-sst ._sst (and the same with a further .meta extension)<br>
+ 
 <p> 
 <p> <br>
 <pre>  &lt;ctrl&gt;F activate folds on headings matched in a document
@@ -81,60 +82,58 @@ Amissah 2007, part of SiSU documentation, License GPL 3
 <p>  Sourcefile
 Digest, MD5(sisu_vim.sst)= <i>a3db74eebef04815aa234d3c3b17f375</i> 
 <p>  Skin_Digest:
-MD5(/home/ralph/grotto/theatre/dbld/sisu-dev/sisu/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/skin/doc/skin_sisu_manual.rb)=
-
-<p><i>20fc43cf3eb6590bc3399a1aef65c5a9</i> 
+MD5(skin_sisu_manual.rb)= <i>20fc43cf3eb6590bc3399a1aef65c5a9</i> 
 <p>  <b>Generated</b> 
-<p>  Document (metaverse) last
-generated: <i>Sat</i> Sep 29 13:20:58 +0100 2007 
-<p>  Generated by: <i>SiSU</i> <i>0.59.1</i> of
-2007w39/2 (2007-09-25) 
-<p>  Ruby version: <i>ruby</i> 1.8.6 (2007-06-07 patchlevel 36)
-&nbsp;[i486-linux] 
+<p>
+ Document (metaverse) last generated: <i>Sat</i> Sep 29 17:14:44 +0100 2007 
+<p> 
+Generated by: <i>SiSU</i> <i>0.59.1</i> of 2007w39/2 (2007-09-25) 
+<p>  Ruby version: <i>ruby</i> 1.8.6
+(2007-06-07 patchlevel 36) &nbsp;[i486-linux] 
 <p> 
 <p> 
 <dl>
 
-<dt>Other versions of this document: </dt>
+<dt>Other versions of this document:
+</dt>
 <dd></dd>
 
 <dt>manifest: &lt;<a href='http://www.jus.uio.no/sisu/sisu_vim/sisu_manifest.html'><a href='http://www.jus.uio.no/sisu/sisu_vim/sisu_manifest.html'>http://www.jus.uio.no/sisu/sisu_vim/sisu_manifest.html</a>
 </a>
-&gt;
-</dt>
+&gt; </dt>
 <dd></dd>
 
 <dt>html: &lt;<a href='http://www.jus.uio.no/sisu/sisu_vim/toc.html'><a href='http://www.jus.uio.no/sisu/sisu_vim/toc.html'>http://www.jus.uio.no/sisu/sisu_vim/toc.html</a>
 </a>
-&gt; </dt>
+&gt;
+</dt>
 <dd></dd>
 
 <dt>pdf: &lt;<a href='http://www.jus.uio.no/sisu/sisu_vim/portrait.pdf'><a href='http://www.jus.uio.no/sisu/sisu_vim/portrait.pdf'>http://www.jus.uio.no/sisu/sisu_vim/portrait.pdf</a>
 </a>
-&gt;
-</dt>
+&gt; </dt>
 <dd></dd>
 
 <dt>pdf: &lt;<a href='http://www.jus.uio.no/sisu/sisu_vim/landscape.pdf'><a href='http://www.jus.uio.no/sisu/sisu_vim/landscape.pdf'>http://www.jus.uio.no/sisu/sisu_vim/landscape.pdf</a>
 </a>
-&gt; </dt>
+&gt;
+</dt>
 <dd>  </dd>
 
 <dt>at: &lt;<a href='http://www.jus.uio.no/sisu'><a href='http://www.jus.uio.no/sisu'>http://www.jus.uio.no/sisu</a>
 </a>
-&gt;
-</dt>
+&gt; </dt>
 <dd></dd>
 
-<dt>* Generated by: SiSU 0.59.1 of 2007w39/2 (2007-09-25) </dt>
+<dt>* Generated by: SiSU 0.59.1 of 2007w39/2 (2007-09-25)
+</dt>
 <dd></dd>
 
-<dt>* Ruby version: ruby
-1.8.6 (2007-06-07 patchlevel 36) [i486-linux] </dt>
+<dt>* Ruby version: ruby 1.8.6 (2007-06-07 patchlevel 36) [i486-linux] </dt>
 <dd></dd>
 
-<dt>* Last Generated on: Sat Sep 29
-13:21:02 +0100 2007 </dt>
+<dt>* Last Generated
+on: Sat Sep 29 17:14:44 +0100 2007 </dt>
 <dd></dd>
 
 <dt>* SiSU <a href='http://www.jus.uio.no/sisu'>http://www.jus.uio.no/sisu</a>