Merge branch 'upstream' into debian/sid

174 files changed, 664 insertions, 559 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 92a56752..5da70577 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,11 +4,35 @@
 * <http://sisudoc.org/sisu/sisu_manual>
 * data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_manual.ssm
 * data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
+* CHANGELOG README data/doc/sisu/
 
 Reverse Chronological:
 
 %% STABLE MANIFEST
 
+%% 1.0.0.orig.tar.gz (2009-12-19:50/6)
+http://www.jus.uio.no/sisu/pkg/src/sisu_1.0.0.orig.tar.gz
+  sisu_1.0.0.orig.tar.gz
+  sisu_1.0.0-1.dsc
+  sisu_1.0.0-1.diff.gz
+  * open v1 branch, bump series vesion number to 1
+    * with the introduction of sisu version 2 (a new middle layer engine)
+      imminent, that will be maintained in parallel with this version, it is
+      time to have a version 1 branch
+    * version 1 is pretty much the previous release, it will be maintained
+      alongside version 2 (in the tarball) and the directory structure is
+      modified to accommodate this
+    * [version 2: will have a different middle layer; markup remains the same
+      apart from some modification to document headers]
+
+  * param / document header changed not to accept older markup, e.g. must use
+    '@title:' rather than '0~title'
+
+  * minor changes inter alia for new directory structure
+
+  * documentation, modified description of command flags -m and -n (in line
+    with communication on Debian bug #555496, closing it)  
+
 %% sisu_0.71.4.orig.tar.gz (2009-08-29:34/6)
 http://www.jus.uio.no/sisu/pkg/src/sisu_0.71.4.orig.tar.gz
   a9accd67316fcc21fa289dd3923641b182023ee3e038ee7c3324b6e71b129a68 1551081 sisu_0.71.4.orig.tar.gz
diff --git a/README b/README
index 607b88db..43f84b06 100644
--- a/README
+++ b/README
@@ -1,5 +1,6 @@
-SiSU 0.55 2007w27/6 2007-07-07
+SiSU 1.0 2009
 Homepage: <http://www.jus.uio.no/sisu>
+* README CHANGELOG
 
 %% Description
 ---------------
diff --git a/bin/sisu b/bin/sisu
index 23577573..eaced442 100644
--- a/bin/sisu
+++ b/bin/sisu
@@ -5,8 +5,8 @@
 raise "Please, use Ruby1.8.4 or later, current Ruby #{RUBY_VERSION}" if RUBY_VERSION < '1.8.4'
 $VERBOSE=nil
 $KCODE='u' if RUBY_VERSION < '1.9'
-branch='v1'
-SiSU_lib="sisu/#{branch}"
+SiSU_version_dir='v1'
+SiSU_lib="sisu/#{SiSU_version_dir}"
 require "#{SiSU_lib}/hub"
 __END__
 
diff --git a/bin/sisu_termsheet b/bin/sisu_termsheet
index c2c040d3..b70c41ba 100644
--- a/bin/sisu_termsheet
+++ b/bin/sisu_termsheet
@@ -4,8 +4,8 @@
 raise "Please, use Ruby1.8 (1.8.4 or later), current Ruby #{RUBY_VERSION}" if RUBY_VERSION < '1.8.4' or RUBY_VERSION > '1.9'
 #raise "Please, use Ruby1.8.4 or later, current Ruby #{RUBY_VERSION}" if RUBY_VERSION < '1.8.4'
 $VERBOSE=nil
-branch='v1'
-SiSU_lib="sisu/#{branch}"
+SiSU_version_dir='v1'
+SiSU_lib="sisu/#{SiSU_version_dir}"
 require "#{SiSU_lib}/termsheet"
 __END__
 
diff --git a/bin/sisu_webrick b/bin/sisu_webrick
index f954a8a8..df17da57 100644
--- a/bin/sisu_webrick
+++ b/bin/sisu_webrick
@@ -4,8 +4,8 @@
 raise "Please, use Ruby1.8 (1.8.4 or later), current Ruby #{RUBY_VERSION}" if RUBY_VERSION < '1.8.4' or RUBY_VERSION > '1.9'
 #raise "Please, use Ruby1.8.4 or later, current Ruby #{RUBY_VERSION}" if RUBY_VERSION < '1.8.4'
 $VERBOSE=nil
-branch='v1'
-SiSU_lib="sisu/#{branch}"
+SiSU_version_dir='v1'
+SiSU_lib="sisu/#{SiSU_version_dir}"
 require "#{SiSU_lib}/webrick"
 __END__
 
diff --git a/conf/sisu/sisurc.yml b/conf/sisu/v1/sisurc.yml
index 34629d86..34629d86 100644
--- a/conf/sisu/sisurc.yml
+++ b/conf/sisu/v1/sisurc.yml
diff --git a/conf/sisu/v1/version.yml b/conf/sisu/v1/version.yml
new file mode 100644
index 00000000..1abdc8d2
--- /dev/null
+++ b/conf/sisu/v1/version.yml
@@ -0,0 +1,5 @@
+--- 
+:version: 1.0.0
+:date_stamp: 2009w50/6
+:date: "2009-12-19"
+:project: SiSU
diff --git a/conf/sisu/version1.yml b/conf/sisu/version1.yml
deleted file mode 100644
index b3d4e7d5..00000000
--- a/conf/sisu/version1.yml
+++ /dev/null
@@ -1,5 +0,0 @@
---- 
-:version: 0.71.5
-:date_stamp: 2009w35/1
-:date: "2009-08-31"
-:project: SiSU
diff --git a/data/doc/sisu/README b/data/doc/sisu/README
index 607b88db..43f84b06 100644
--- a/data/doc/sisu/README
+++ b/data/doc/sisu/README
@@ -1,5 +1,6 @@
-SiSU 0.55 2007w27/6 2007-07-07
+SiSU 1.0 2009
 Homepage: <http://www.jus.uio.no/sisu>
+* README CHANGELOG
 
 %% Description
 ---------------
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
deleted file mode 100644
index 864bd303..00000000
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
+++ /dev/null
@@ -1,139 +0,0 @@
-% SiSU insert 0.57
-
-@title: SiSU
-
-@subtitle: Download
-
-@creator: Ralph Amissah
-
-@rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
-
-@type: information
-
-@subject: ebook, epublishing, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, search
-
-@date.created: 2007-08-28
-
-@date.issued: 2007-08-28
-
-@date.available: 2007-08-28
-
-@date.modified: 2008-07-21
-
-@date: 2008-07-21
-
-@level: new=C; break=1; num_top=1
-
-@skin: skin_sisu_manual
-
-@bold: /Gnu|Debian|Ruby|SiSU/
-
-@links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
-{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/examples.html
-{ SiSU @ Wikipedia }http://en.wikipedia.org/wiki/SiSU
-{ SiSU @ Freshmeat }http://freshmeat.net/projects/sisu/
-{ SiSU @ Ruby Application Archive }http://raa.ruby-lang.org/project/sisu/
-{ SiSU @ Debian }http://packages.qa.debian.org/s/sisu.html
-{ SiSU Download }http://www.jus.uio.no/sisu/SiSU/download.html
-{ SiSU Changelog }http://www.jus.uio.no/sisu/SiSU/changelog.html
-{ SiSU help }http://www.jus.uio.no/sisu/sisu_manual/sisu_help/
-{ SiSU help sources }http://www.jus.uio.no/sisu/sisu_manual/sisu_help_sources/
-
-% @rcs$
-
-:A~? @title @creator
-
-:B~? SiSU Downloads, Stable and Development Branches
-
-:C~ Download
-
-1~download Download SiSU - Linux/Unix
-
-2~current- SiSU Current Version - Linux/Unix
-
-3~source- Source (tarball tar.gz)
-
-Download the latest version of SiSU (and SiSU markup samples):~{ Breakage and Fixes Report<br> http://www.jus.uio.no/sisu/SiSU/breakage_and_fixes.html }~
-
-_* {~^ sisu_0.68.0.orig.tar.gz (of 2008-07-21:29/1) }http://www.jus.uio.no/sisu/pkg/src/sisu_0.68.0.orig.tar.gz
-
-_* {~^ sisu-markup-samples_1.0.8.orig.tar.gz (of 2007-08-19:33/7 ) }http://www.jus.uio.no/sisu/pkg/src/sisu-markup-samples_1.0.8.orig.tar.gz *~sisu-markup-samples
-
-For installation notes see http://sisudoc.org/sisu/sisu_manual/installation.html
-
-For more general use see http://sisudoc.org/sisu/sisu_manual
-
-For changelogs see http://www.jus.uio.no/sisu/SiSU/changelog.html
-
-3~git- Git (source control management)
-
-Git repository currently at:
-
-_* git clone git://sisudoc.org/git/sisu/
-
-_* http://search.sisudoc.org/cgi-bin/gitweb.cgi?p=sisu;a=summary
-
-3~debian- Debian
-
-This section contains information on the latest SiSU release. For installation notes see http://sisudoc.org/sisu/sisu_manual/installation.html
-
-SiSU is updated fairly regularly in Debian testing and unstable, and should be available therefrom.
-
-To add this archive, should you still choose to do so, add the following lines to your /etc/apt/sources.list
-
-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
-
-}code
-
-!_ Source
-
-_* {~^ sisu_0.68.0.orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_0.68.0.orig.tar.gz
-
-_* {~^ sisu_0.68.0-1.diff.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_0.68.0-1.diff.gz
-
-_* {~^ sisu_0.68.0-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu_0.68.0-1.dsc
-
-!_ Debs
-
-_* {~^ sisu_0.68.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_0.68.0-1_all.deb ~{ <br>sisu, the base code, (the main package on which the others depend), without any dependencies other than ruby (and for convenience the ruby webrick web server), this generates a number of types of output on its own, other packages provide additional functionality, and have their dependencies <br>Depends: ruby (>=1.8.2), libwebrick-ruby<br>Recommends: sisu-pdf, sisu-sqlite, sisu-postgresql, sisu-examples, vim-sisu, librmagick-ruby, trang, tidy, libtidy, librexml-ruby, zip, unzip, openssl }~
-
-_* {~^ sisu-complete_0.68.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-complete_0.68.0-1_all.deb ~{ <br>a package that pulls in other packages to build the whole of sisu (excluding sisu-examples) <br>Depends: ruby (>=1.8.2), sisu, sisu-pdf, sisu-postgresql, sisu-remote, sisu-sqlite, vim-sisu<br>Recommends: sisu-examples }~
-
-_* {~^ sisu-pdf_0.68.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-pdf_0.68.0-1_all.deb ~{ <br>dependencies used by sisu to produce pdf from LaTeX generated <br>Depends: sisu, tetex-bin, tetex-extra, latex-ucs<br>Suggests: evince, xpdf }~
-
-_* {~^ sisu-postgresql_0.68.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-postgresql_0.68.0-1_all.deb ~{ <br>dependencies used by sisu to populate postgresql database (further configuration is necessary) <br>Depends: sisu, postgresql-8.1, libdbi-ruby, libdbm-ruby, libdbd-pg-ruby<br>Suggests: pgaccess, libdbd-pgsql, postgresql-contrib-8.1 }~
-
-_* {~^ sisu-sqlite_0.68.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-sqlite_0.68.0-1_all.deb ~{ <br>dependencies used by sisu to populate sqlite database <br>Depends: sisu, sqlite, libdbi-ruby, libdbm-ruby, libdbd-sqlite-ruby<br>Suggests: libdbd-sqlite }~
-
-For changelogs see:
-
-_1 http://www.jus.uio.no/sisu/SiSU/changelog.html
-
-_1 http://www.jus.uio.no/sisu/sisu_changelog/changelog.html
-
-!_ non-free
-
-Book markup samples have been moved to non-free as the substantive text of the documents are available under the author or original publisher's license, and usually do not comply with the Debian Free Software Guidelines.
-
-_* {~^ sisu-markup-samples_1.0.8-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_1.0.8-1_all.deb ~{ <br>marked up documents and other examples related to sisu, a larger package containing a number of texts <br>Depends: sisu }~
-
-_* {~^ sisu-markup-samples_1.0.8-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu-markup-samples_1.0.8-1.dsc
-
-For changelogs see:
-
-_1 http://www.jus.uio.no/sisu/SiSU/changelog_markup_samples.html
-
-_1 http://www.jus.uio.no/sisu/sisu_markup_samples_changelog/changelog_markup_samples.html
-
-3~rpm- RPM
-
-The RPM is generated Alien~{ http://www.kitenet.net/programs/alien/ }~ from two deb packages (sisu and sisu-doc). Dependencies are not handled, not even that of the essential Ruby.
-
-_* {~^ sisu-0.68.0-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-0.68.0-2.noarch.rpm ~{ untested, created using: alien -r sisu_0.68.0-1_all.deb }~
-
-_* {~^ sisu-markup-samples_1.0.8.orig-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-markup-samples_1.0.6.orig-2.noarch.rpm ~{ <br> untested, created using alien }~
-
-sudo rpm -i [package name]
diff --git a/data/doc/sisu/CHANGELOG b/data/doc/sisu/v1/CHANGELOG
index 4f34af69..5da70577 100644
--- a/data/doc/sisu/CHANGELOG
+++ b/data/doc/sisu/v1/CHANGELOG
@@ -4,16 +4,40 @@
 * <http://sisudoc.org/sisu/sisu_manual>
 * data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_manual.ssm
 * data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
+* CHANGELOG README data/doc/sisu/
 
 Reverse Chronological:
 
 %% STABLE MANIFEST
 
+%% 1.0.0.orig.tar.gz (2009-12-19:50/6)
+http://www.jus.uio.no/sisu/pkg/src/sisu_1.0.0.orig.tar.gz
+  sisu_1.0.0.orig.tar.gz
+  sisu_1.0.0-1.dsc
+  sisu_1.0.0-1.diff.gz
+  * open v1 branch, bump series vesion number to 1
+    * with the introduction of sisu version 2 (a new middle layer engine)
+      imminent, that will be maintained in parallel with this version, it is
+      time to have a version 1 branch
+    * version 1 is pretty much the previous release, it will be maintained
+      alongside version 2 (in the tarball) and the directory structure is
+      modified to accommodate this
+    * [version 2: will have a different middle layer; markup remains the same
+      apart from some modification to document headers]
+
+  * param / document header changed not to accept older markup, e.g. must use
+    '@title:' rather than '0~title'
+
+  * minor changes inter alia for new directory structure
+
+  * documentation, modified description of command flags -m and -n (in line
+    with communication on Debian bug #555496, closing it)  
+
 %% sisu_0.71.4.orig.tar.gz (2009-08-29:34/6)
 http://www.jus.uio.no/sisu/pkg/src/sisu_0.71.4.orig.tar.gz
-  sisu_0.71.4.orig.tar.gz
-  sisu_0.71.4-1.dsc
-  sisu_0.71.4-1.diff.gz
+  a9accd67316fcc21fa289dd3923641b182023ee3e038ee7c3324b6e71b129a68 1551081 sisu_0.71.4.orig.tar.gz
+  1014c3807a2ba159682b8f52c2b287a7858bd83acf4ffa041d99f759dcebd310 1151 sisu_0.71.4-1.dsc
+  c3566cb294440482526bc10f3bee45ff5eeae7ed6ec39178f1fd3785c6b3d1dd 151444 sisu_0.71.4-1.diff.gz
 
   * sql, fix, different solutions for postgresql and sqlite to populate
     database using ruby-dbi
diff --git a/data/doc/sisu/html/README b/data/doc/sisu/v1/html/README
index a4263458..a4263458 100644
--- a/data/doc/sisu/html/README
+++ b/data/doc/sisu/v1/html/README
diff --git a/data/doc/sisu/html/homepage/index.html b/data/doc/sisu/v1/html/homepage/index.html
index 8493cffd..8493cffd 100644
--- a/data/doc/sisu/html/homepage/index.html
+++ b/data/doc/sisu/v1/html/homepage/index.html
diff --git a/data/doc/sisu/html/sisu.1.html b/data/doc/sisu/v1/html/sisu.1.html
index faf8069c..301933b2 100644
--- a/data/doc/sisu/html/sisu.1.html
+++ b/data/doc/sisu/v1/html/sisu.1.html
@@ -256,9 +256,9 @@ processing preserved and their locations indicated. (also see -V)
 
 <dt><b>-m [filename/wildcard/url]</b>
 </dt>
-<dd>assumed for most other flags, creates new meta-markup file, (the metaverse
-) that is used in all subsequent processing of other output. This step is
-assumed for most processing flags. To skip it see -n 
+<dd>assumed for most other flags, creates new intermediate files for processing
+(document abstraction) that is used in all subsequent processing of other
+output. This step is assumed for most processing flags. To skip it see -n
 <p> </dd>
 
 <dt><b>-N [filename/wildcard/url]</b>
@@ -271,8 +271,10 @@ that produced it) (digest.txt). -NV for verbose digest output to screen.
 
 <dt><b>-n
 [filename/wildcard/url]</b> </dt>
-<dd>skip meta-markup (building of -m which is otherwise
-assumed by most processing flags. 
+
+<dd>skip the creation of intermediate processing files (document abstraction)
+if they already exist, this skips the equivalent of -m which is otherwise
+assumed by most processing flags.
 <p> </dd>
 
 <dt><b>-o [filename/wildcard/url]</b> </dt>
diff --git a/data/doc/sisu/html/sisu.8.html b/data/doc/sisu/v1/html/sisu.8.html
index c6134b33..c6134b33 100644
--- a/data/doc/sisu/html/sisu.8.html
+++ b/data/doc/sisu/v1/html/sisu.8.html
diff --git a/data/doc/sisu/html/sisu_complete.7.html b/data/doc/sisu/v1/html/sisu_complete.7.html
index 51afaa87..51afaa87 100644
--- a/data/doc/sisu/html/sisu_complete.7.html
+++ b/data/doc/sisu/v1/html/sisu_complete.7.html
diff --git a/data/doc/sisu/html/sisu_pdf.7.html b/data/doc/sisu/v1/html/sisu_pdf.7.html
index 4c2f884e..4c2f884e 100644
--- a/data/doc/sisu/html/sisu_pdf.7.html
+++ b/data/doc/sisu/v1/html/sisu_pdf.7.html
diff --git a/data/doc/sisu/html/sisu_postgresql.7.html b/data/doc/sisu/v1/html/sisu_postgresql.7.html
index 73cbabf3..73cbabf3 100644
--- a/data/doc/sisu/html/sisu_postgresql.7.html
+++ b/data/doc/sisu/v1/html/sisu_postgresql.7.html
diff --git a/data/doc/sisu/html/sisu_sqlite.7.html b/data/doc/sisu/v1/html/sisu_sqlite.7.html
index 7559ff17..7559ff17 100644
--- a/data/doc/sisu/html/sisu_sqlite.7.html
+++ b/data/doc/sisu/v1/html/sisu_sqlite.7.html
diff --git a/data/doc/sisu/html/sisu_termsheet.1.html b/data/doc/sisu/v1/html/sisu_termsheet.1.html
index e91cd9d7..e91cd9d7 100644
--- a/data/doc/sisu/html/sisu_termsheet.1.html
+++ b/data/doc/sisu/v1/html/sisu_termsheet.1.html
diff --git a/data/doc/sisu/html/sisu_vim.7.html b/data/doc/sisu/v1/html/sisu_vim.7.html
index cb4a347b..cb4a347b 100644
--- a/data/doc/sisu/html/sisu_vim.7.html
+++ b/data/doc/sisu/v1/html/sisu_vim.7.html
diff --git a/data/doc/sisu/html/sisu_webrick.1.html b/data/doc/sisu/v1/html/sisu_webrick.1.html
index 8250affe..8250affe 100644
--- a/data/doc/sisu/html/sisu_webrick.1.html
+++ b/data/doc/sisu/v1/html/sisu_webrick.1.html
diff --git a/data/doc/sisu/model/README b/data/doc/sisu/v1/model/README
index 0b03e45e..0b03e45e 100644
--- a/data/doc/sisu/model/README
+++ b/data/doc/sisu/v1/model/README
diff --git a/data/doc/sisu/model/relaxng/sisu_object_model_dom.rnc b/data/doc/sisu/v1/model/relaxng/sisu_object_model_dom.rnc
index fddacbb8..fddacbb8 100644
--- a/data/doc/sisu/model/relaxng/sisu_object_model_dom.rnc
+++ b/data/doc/sisu/v1/model/relaxng/sisu_object_model_dom.rnc
diff --git a/data/doc/sisu/model/relaxng/sisu_object_model_input.rnc b/data/doc/sisu/v1/model/relaxng/sisu_object_model_input.rnc
index ad221da7..ad221da7 100644
--- a/data/doc/sisu/model/relaxng/sisu_object_model_input.rnc
+++ b/data/doc/sisu/v1/model/relaxng/sisu_object_model_input.rnc
diff --git a/data/doc/sisu/model/relaxng/sisu_object_model_metaverse.rnc b/data/doc/sisu/v1/model/relaxng/sisu_object_model_metaverse.rnc
index b00ca480..b00ca480 100644
--- a/data/doc/sisu/model/relaxng/sisu_object_model_metaverse.rnc
+++ b/data/doc/sisu/v1/model/relaxng/sisu_object_model_metaverse.rnc
diff --git a/data/doc/sisu/model/relaxng/sisu_object_model_sax.rnc b/data/doc/sisu/v1/model/relaxng/sisu_object_model_sax.rnc
index 02507881..02507881 100644
--- a/data/doc/sisu/model/relaxng/sisu_object_model_sax.rnc
+++ b/data/doc/sisu/v1/model/relaxng/sisu_object_model_sax.rnc
diff --git a/data/doc/sisu/model/relaxng/sisu_object_model_xhtml.rnc b/data/doc/sisu/v1/model/relaxng/sisu_object_model_xhtml.rnc
index 740642fa..740642fa 100644
--- a/data/doc/sisu/model/relaxng/sisu_object_model_xhtml.rnc
+++ b/data/doc/sisu/v1/model/relaxng/sisu_object_model_xhtml.rnc
diff --git a/data/doc/sisu/model/xml/input/rnc/dom.rnc b/data/doc/sisu/v1/model/xml/input/rnc/dom.rnc
index 7391eca4..7391eca4 100644
--- a/data/doc/sisu/model/xml/input/rnc/dom.rnc
+++ b/data/doc/sisu/v1/model/xml/input/rnc/dom.rnc
diff --git a/data/doc/sisu/model/xml/input/rnc/node.rnc b/data/doc/sisu/v1/model/xml/input/rnc/node.rnc
index 5116f629..5116f629 100644
--- a/data/doc/sisu/model/xml/input/rnc/node.rnc
+++ b/data/doc/sisu/v1/model/xml/input/rnc/node.rnc
diff --git a/data/doc/sisu/model/xml/input/rnc/sax.rnc b/data/doc/sisu/v1/model/xml/input/rnc/sax.rnc
index 891a18f8..891a18f8 100644
--- a/data/doc/sisu/model/xml/input/rnc/sax.rnc
+++ b/data/doc/sisu/v1/model/xml/input/rnc/sax.rnc
diff --git a/data/doc/sisu/model/xml/input/rng/dom.rng b/data/doc/sisu/v1/model/xml/input/rng/dom.rng
index 746421c8..746421c8 100644
--- a/data/doc/sisu/model/xml/input/rng/dom.rng
+++ b/data/doc/sisu/v1/model/xml/input/rng/dom.rng
diff --git a/data/doc/sisu/model/xml/input/rng/node.rng b/data/doc/sisu/v1/model/xml/input/rng/node.rng
index 8b60cce8..8b60cce8 100644
--- a/data/doc/sisu/model/xml/input/rng/node.rng
+++ b/data/doc/sisu/v1/model/xml/input/rng/node.rng
diff --git a/data/doc/sisu/model/xml/input/rng/sax.rng b/data/doc/sisu/v1/model/xml/input/rng/sax.rng
index 14412938..14412938 100644
--- a/data/doc/sisu/model/xml/input/rng/sax.rng
+++ b/data/doc/sisu/v1/model/xml/input/rng/sax.rng
diff --git a/data/doc/sisu/model/xml/input/xsd/dom.xsd b/data/doc/sisu/v1/model/xml/input/xsd/dom.xsd
index 8de8999a..8de8999a 100644
--- a/data/doc/sisu/model/xml/input/xsd/dom.xsd
+++ b/data/doc/sisu/v1/model/xml/input/xsd/dom.xsd
diff --git a/data/doc/sisu/model/xml/input/xsd/node.xsd b/data/doc/sisu/v1/model/xml/input/xsd/node.xsd
index f0fc9614..f0fc9614 100644
--- a/data/doc/sisu/model/xml/input/xsd/node.xsd
+++ b/data/doc/sisu/v1/model/xml/input/xsd/node.xsd
diff --git a/data/doc/sisu/model/xml/input/xsd/sax.xsd b/data/doc/sisu/v1/model/xml/input/xsd/sax.xsd
index 450bfce5..450bfce5 100644
--- a/data/doc/sisu/model/xml/input/xsd/sax.xsd
+++ b/data/doc/sisu/v1/model/xml/input/xsd/sax.xsd
diff --git a/data/doc/sisu/model/xml/output/rnc/dom.rnc b/data/doc/sisu/v1/model/xml/output/rnc/dom.rnc
index e8a3ed42..e8a3ed42 100644
--- a/data/doc/sisu/model/xml/output/rnc/dom.rnc
+++ b/data/doc/sisu/v1/model/xml/output/rnc/dom.rnc
diff --git a/data/doc/sisu/model/xml/output/rnc/sax.rnc b/data/doc/sisu/v1/model/xml/output/rnc/sax.rnc
index b242afb3..b242afb3 100644
--- a/data/doc/sisu/model/xml/output/rnc/sax.rnc
+++ b/data/doc/sisu/v1/model/xml/output/rnc/sax.rnc
diff --git a/data/doc/sisu/model/xml/output/rng/dom.rng b/data/doc/sisu/v1/model/xml/output/rng/dom.rng
index eea891ec..eea891ec 100644
--- a/data/doc/sisu/model/xml/output/rng/dom.rng
+++ b/data/doc/sisu/v1/model/xml/output/rng/dom.rng
diff --git a/data/doc/sisu/model/xml/output/rng/sax.rng b/data/doc/sisu/v1/model/xml/output/rng/sax.rng
index a2df4fed..a2df4fed 100644
--- a/data/doc/sisu/model/xml/output/rng/sax.rng
+++ b/data/doc/sisu/v1/model/xml/output/rng/sax.rng
diff --git a/data/doc/sisu/model/xml/output/xsd/dom.xsd b/data/doc/sisu/v1/model/xml/output/xsd/dom.xsd
index 3132338a..3132338a 100644
--- a/data/doc/sisu/model/xml/output/xsd/dom.xsd
+++ b/data/doc/sisu/v1/model/xml/output/xsd/dom.xsd
diff --git a/data/doc/sisu/model/xml/output/xsd/sax.xsd b/data/doc/sisu/v1/model/xml/output/xsd/sax.xsd
index db6eb147..db6eb147 100644
--- a/data/doc/sisu/model/xml/output/xsd/sax.xsd
+++ b/data/doc/sisu/v1/model/xml/output/xsd/sax.xsd
diff --git a/data/doc/sisu/sisu_markup_samples/README.samples b/data/doc/sisu/v1/sisu_markup_samples/README.samples
index fe068333..fe068333 100644
--- a/data/doc/sisu/sisu_markup_samples/README.samples
+++ b/data/doc/sisu/v1/sisu_markup_samples/README.samples
diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/README b/data/doc/sisu/v1/sisu_markup_samples/dfsg/README
index ef602a54..ef602a54 100644
--- a/data/doc/sisu/sisu_markup_samples/dfsg/README
+++ b/data/doc/sisu/v1/sisu_markup_samples/dfsg/README
diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/image/Gnu_Debian_Linux_Ruby_Way_Better.png b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/image/Gnu_Debian_Linux_Ruby_Way_Better.png
index 0f3f4a16..0f3f4a16 100644
--- a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/image/Gnu_Debian_Linux_Ruby_Way_Better.png
+++ b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/image/Gnu_Debian_Linux_Ruby_Way_Better.png
diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/image/b_doc.png b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/image/b_doc.png
index 13ca8ebe..13ca8ebe 100644
--- a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/image/b_doc.png
+++ b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/image/b_doc.png
diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/image/c_Copyleft.png b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/image/c_Copyleft.png
index 5b3865b8..5b3865b8 100644
--- a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/image/c_Copyleft.png
+++ b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/image/c_Copyleft.png
diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/image/c_Euro.png b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/image/c_Euro.png
index 8e5c13a9..8e5c13a9 100644
--- a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/image/c_Euro.png
+++ b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/image/c_Euro.png
diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/image/debian_home.png b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/image/debian_home.png
index cee42aa0..cee42aa0 100644
--- a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/image/debian_home.png
+++ b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/image/debian_home.png
diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/image/free_as_in_freedom.png b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/image/free_as_in_freedom.png
index ad4c05b2..ad4c05b2 100644
--- a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/image/free_as_in_freedom.png
+++ b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/image/free_as_in_freedom.png
diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/image/free_as_in_freedom_01_rms.png b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/image/free_as_in_freedom_01_rms.png
index 3b4563b0..3b4563b0 100644
--- a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/image/free_as_in_freedom_01_rms.png
+++ b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/image/free_as_in_freedom_01_rms.png
diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/image/free_as_in_freedom_02_rms_snr_year_report.png b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/image/free_as_in_freedom_02_rms_snr_year_report.png
index 5d5a57aa..5d5a57aa 100644
--- a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/image/free_as_in_freedom_02_rms_snr_year_report.png
+++ b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/image/free_as_in_freedom_02_rms_snr_year_report.png
diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/image/free_as_in_freedom_03_rms_st_ignucius.png b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/image/free_as_in_freedom_03_rms_st_ignucius.png
index d84bf568..d84bf568 100644
--- a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/image/free_as_in_freedom_03_rms_st_ignucius.png
+++ b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/image/free_as_in_freedom_03_rms_st_ignucius.png
diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/image/free_as_in_freedom_04_rms_pleasure_card.png b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/image/free_as_in_freedom_04_rms_pleasure_card.png
index 2ab79e1c..2ab79e1c 100644
--- a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/image/free_as_in_freedom_04_rms_pleasure_card.png
+++ b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/image/free_as_in_freedom_04_rms_pleasure_card.png
diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/image/kdissert.png b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/image/kdissert.png
index 2dff3753..2dff3753 100644
--- a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/image/kdissert.png
+++ b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/image/kdissert.png
diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/image/levitating_gnu.png b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/image/levitating_gnu.png
index 9a25319a..9a25319a 100644
--- a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/image/levitating_gnu.png
+++ b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/image/levitating_gnu.png
diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/image/philosophical_gnu.png b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/image/philosophical_gnu.png
index ebd239ef..ebd239ef 100644
--- a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/image/philosophical_gnu.png
+++ b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/image/philosophical_gnu.png
diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/image/sisu.png b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/image/sisu.png
index b449fa6b..b449fa6b 100644
--- a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/image/sisu.png
+++ b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/image/sisu.png
diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/dir/skin_sisu.rb b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/skin/dir/skin_sisu.rb
index ad1d42a6..ad1d42a6 100644
--- a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/dir/skin_sisu.rb
+++ b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/skin/dir/skin_sisu.rb
diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_gnu.rb b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_gnu.rb
index e998624b..e998624b 100644
--- a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_gnu.rb
+++ b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_gnu.rb
diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_gutenberg.rb b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_gutenberg.rb
index 47d2d28f..47d2d28f 100644
--- a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_gutenberg.rb
+++ b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_gutenberg.rb
diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_kdissert.rb b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_kdissert.rb
index d1f6a889..d1f6a889 100644
--- a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_kdissert.rb
+++ b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_kdissert.rb
diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_rms.rb b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_rms.rb
index 95f936a8..95f936a8 100644
--- a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_rms.rb
+++ b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_rms.rb
diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/site/skin_sisu.rb b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/skin/site/skin_sisu.rb
index ad1d42a6..ad1d42a6 100644
--- a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/site/skin_sisu.rb
+++ b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/skin/site/skin_sisu.rb
diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/yml/list.yml b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/skin/yml/list.yml
index 1deded88..1deded88 100644
--- a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/yml/list.yml
+++ b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/skin/yml/list.yml
diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/yml/promo.yml b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/skin/yml/promo.yml
index 88497d41..88497d41 100644
--- a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/yml/promo.yml
+++ b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/skin/yml/promo.yml
diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/yml/skin_countries.yml b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/skin/yml/skin_countries.yml
index 179b9978..179b9978 100644
--- a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/yml/skin_countries.yml
+++ b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/skin/yml/skin_countries.yml
diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/yml/skin_country.yml b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/skin/yml/skin_country.yml
index dc835465..dc835465 100644
--- a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/yml/skin_country.yml
+++ b/data/doc/sisu/v1/sisu_markup_samples/dfsg/_sisu/skin/yml/skin_country.yml
diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst b/data/doc/sisu/v1/sisu_markup_samples/dfsg/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst
index 74b90a4f..74b90a4f 100644
--- a/data/doc/sisu/sisu_markup_samples/dfsg/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst
+++ b/data/doc/sisu/v1/sisu_markup_samples/dfsg/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst
diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/gpl2.fsf.sst b/data/doc/sisu/v1/sisu_markup_samples/dfsg/gpl2.fsf.sst
index b091616b..b091616b 100644
--- a/data/doc/sisu/sisu_markup_samples/dfsg/gpl2.fsf.sst
+++ b/data/doc/sisu/v1/sisu_markup_samples/dfsg/gpl2.fsf.sst
diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/gpl3.fsf.sst b/data/doc/sisu/v1/sisu_markup_samples/dfsg/gpl3.fsf.sst
index 10889acf..10889acf 100644
--- a/data/doc/sisu/sisu_markup_samples/dfsg/gpl3.fsf.sst
+++ b/data/doc/sisu/v1/sisu_markup_samples/dfsg/gpl3.fsf.sst
diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/sisu_output_overview.ssi b/data/doc/sisu/v1/sisu_markup_samples/dfsg/sisu_output_overview.ssi
index e2c90529..e2c90529 100644
--- a/data/doc/sisu/sisu_markup_samples/dfsg/sisu_output_overview.ssi
+++ b/data/doc/sisu/v1/sisu_markup_samples/dfsg/sisu_output_overview.ssi
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/Rantfile b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/Rantfile
index 37198c7c..37198c7c 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/Rantfile
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/Rantfile
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/home/index.html b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/_sisu/home/index.html
index b2e44e48..b2e44e48 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/home/index.html
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/_sisu/home/index.html
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/image/GnuDebianLinuxRubyBetterWay.png b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/_sisu/image/GnuDebianLinuxRubyBetterWay.png
index ce5b8830..ce5b8830 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/image/GnuDebianLinuxRubyBetterWay.png
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/_sisu/image/GnuDebianLinuxRubyBetterWay.png
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/image/sisu.home.png b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/_sisu/image/sisu.home.png
index b449fa6b..b449fa6b 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/image/sisu.home.png
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/_sisu/image/sisu.home.png
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/image/sisu.png b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/_sisu/image/sisu.png
index b449fa6b..b449fa6b 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/image/sisu.png
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/_sisu/image/sisu.png
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/image/tux.png b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/_sisu/image/tux.png
index 15fd152b..15fd152b 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/image/tux.png
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/_sisu/image/tux.png
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/sisurc.yml b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/_sisu/sisurc.yml
index 908992ee..908992ee 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/sisurc.yml
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/_sisu/sisurc.yml
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/skin/dir/skin_sisu_manual.rb b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/_sisu/skin/dir/skin_sisu_manual.rb
index 86a7b6f3..86a7b6f3 120000
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/skin/dir/skin_sisu_manual.rb
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/_sisu/skin/dir/skin_sisu_manual.rb
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/skin/doc/skin_sisu_manual.rb b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/_sisu/skin/doc/skin_sisu_manual.rb
index 92ee2b34..92ee2b34 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/skin/doc/skin_sisu_manual.rb
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/_sisu/skin/doc/skin_sisu_manual.rb
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/skin/yml/list.yml b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/_sisu/skin/yml/list.yml
index b26a1c74..b26a1c74 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/skin/yml/list.yml
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/_sisu/skin/yml/list.yml
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/skin/yml/promo.yml b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/_sisu/skin/yml/promo.yml
index 40a2c190..40a2c190 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/skin/yml/promo.yml
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/_sisu/skin/yml/promo.yml
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu.ssm b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu.ssm
index 1d2e34c6..154aebe5 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu.ssm
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu.ssm
@@ -4,7 +4,7 @@
 
 @subtitle: Manual
 
-@creator: Ralph Amissah
+@creator: Amissah, Ralph
 
 @rights: Copyright (C) Ralph Amissah 2008, part of SiSU documentation, License GPL 3
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_commands.sst b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_commands.sst
index 4c53ac74..c9b6e7c8 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_commands.sst
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_commands.sst
@@ -4,7 +4,7 @@
 
 @subtitle: Commands
 
-@creator: Ralph Amissah
+@creator: Amissah, Ralph
 
 @rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
 
@@ -39,8 +39,6 @@
 { SiSU help }http://www.jus.uio.no/sisu/sisu_manual/sisu_help/
 { SiSU help sources }http://www.jus.uio.no/sisu/sisu_manual/sisu_help_sources/
 
-% @prefix: 
-
 :A~? @title @creator
 
 :B~? SiSU Commands
@@ -112,13 +110,13 @@ prints license information.
 maintenance mode files created for processing preserved and their locations indicated. (also see -V)
 
 !_ -m [filename/wildcard/url] <br>
-assumed for most other flags, creates new meta-markup file, (the metaverse ) that is used in all subsequent processing of other output. This step is assumed for most processing flags. To skip it see -n
+assumed for most other flags, creates new intermediate files for processing (document abstraction) that is used in all subsequent processing of other output. This step is assumed for most processing flags. To skip it see -n
 
 !_ -N [filename/wildcard/url] <br>
 document digest or document content certificate ( DCC ) as md5 digest tree of the document: the digest for the document, and digests for each object contained within the document (together with information on software versions that produced it) (digest.txt). -NV for verbose digest output to screen.
 
 !_ -n [filename/wildcard/url] <br>
-skip meta-markup (building of "metaverse"), this skips the equivalent of -m which is otherwise assumed by most processing flags.
+skip the creation of intermediate processing files (document abstraction) if they already exist, this skips the equivalent of -m which is otherwise assumed by most processing flags.
 
 !_ -o [filename/wildcard/url] <br>
 output basic document in opendocument file format (opendocument.odt).
@@ -206,7 +204,6 @@ strips output text of editor endnotes~[* square brackets ]~ denoted by asterisk
 !_ --no-dagger <br>
 strips output text of editor endnotes~[+ square brackets ]~ denoted by dagger/plus sign
 
-
 1~commands_database database commands
 
 dbi - database interface
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_complete.sst b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_complete.sst
index 0e601011..6637fd0e 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_complete.sst
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_complete.sst
@@ -4,7 +4,7 @@
 
 @subtitle: Complete Package
 
-@creator: Ralph Amissah
+@creator: Amissah, Ralph
 
 @rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_config.ssi b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_config.ssi
index 1512d6a4..57eed103 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_config.ssi
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_config.ssi
@@ -4,7 +4,7 @@
 
 @subtitle: Configuration
 
-@creator: Ralph Amissah
+@creator: Amissah, Ralph
 
 @rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_configuration.ssm b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_configuration.ssm
index c1661002..6cadf688 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_configuration.ssm
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_configuration.ssm
@@ -4,7 +4,7 @@
 
 @subtitle: Configuration
 
-@creator: Ralph Amissah
+@creator: Amissah, Ralph
 
 @rights: Ralph Amissah
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_content_directories.ssi b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_content_directories.ssi
index 343af720..2d40863d 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_content_directories.ssi
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_content_directories.ssi
@@ -4,7 +4,7 @@
 
 @subtitle: Content Directories, Organising Content
 
-@creator: Ralph Amissah
+@creator: Amissah, Ralph
 
 @rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
 
@@ -39,8 +39,6 @@
 { SiSU help }http://www.jus.uio.no/sisu/sisu_manual/sisu_help/
 { SiSU help sources }http://www.jus.uio.no/sisu/sisu_manual/sisu_help_sources/
 
-% @rcs$
-
 :A~? Organisation of Content
 
 :B~? Content Directories
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_css.ssi b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_css.ssi
index 46f01cda..6045aa6e 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_css.ssi
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_css.ssi
@@ -4,7 +4,7 @@
 
 @subtitle: CSS - Cascading Style Sheets
 
-@creator: Ralph Amissah
+@creator: Amissah, Ralph
 
 @rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
 
@@ -39,8 +39,6 @@
 { SiSU help }http://www.jus.uio.no/sisu/sisu_manual/sisu_help/
 { SiSU help sources }http://www.jus.uio.no/sisu/sisu_manual/sisu_help_sources/
 
-% @rcs$
-
 :A~? CSS
 
 1~css CSS - Cascading Style Sheets (for html, XHTML and XML)
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_description.sst b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_description.sst
index 34bccfdf..18b6295d 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_description.sst
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_description.sst
@@ -4,7 +4,7 @@
 
 @subtitle: Description
 
-@creator: Ralph Amissah
+@creator: Amissah, Ralph
 
 @rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
 
@@ -39,8 +39,6 @@
 { SiSU help }http://www.jus.uio.no/sisu/sisu_manual/sisu_help/
 { SiSU help sources }http://www.jus.uio.no/sisu/sisu_manual/sisu_help_sources/
 
-% @rcs:+ $Id$
-
 :A~? @title @creator
 
 :B~? SiSU an attempt to describe
@@ -122,7 +120,7 @@ creates organised directory/file structure for (file-system) output, easily mapp
 "Concordance file" wordmap, consisting of all the words in a document and their (text/ object) locations within the text, (and the possibility of adding vocabularies),
 
 !_ (ix)
-document content certification and comparison considerations: (a) the document and each object within it stamped with an md5 hash making it possible to easily check or guarantee that the substantive content of a document is unchanged, (b)version control, documents integrated with time based source control system, default RCS or CVS with use of $Id: sisu_description.sst,v 1.25 2007/08/23 12:22:36 ralph Exp $ tag, which SiSU checks
+document content certification and comparison considerations: the document and each object within it stamped with an md5 hash making it possible to easily check or guarantee that the substantive content of a document is unchanged.
 
 !_ (x)
 SiSU's minimalist markup makes for meaningful "diffing" of the substantive content of markup-files,
@@ -509,8 +507,6 @@ you may alternatively display the text of each paragraph in which the match was
 
 Several options for output - select database to search, show results in index view (links to locations within text), show results with text, echo search in form, show what was searched, create and show a "canned url" for search, show available search fields. Also shows counters number of documents in which found and number of locations within documents where found. [could consider sorting by document with most occurrences of the search result].
 
-Earlier version of the search frontend - Simple search, results with files in which search found, and locations where found within files.
-
 Simple search, results with files in which search found, and text object (paragraph or endnote) where found within files.
 
 3~ Other forms
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_doc.sst b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_doc.sst
index b18f423f..e8a6e29e 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_doc.sst
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_doc.sst
@@ -4,7 +4,7 @@
 
 @subtitle: sisu-doc
 
-@creator: Ralph Amissah
+@creator: Amissah, Ralph
 
 @rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
 
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_download.ssi b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_download.ssi
new file mode 100644
index 00000000..cf741dc4
--- /dev/null
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_download.ssi
@@ -0,0 +1,161 @@
+% SiSU insert 0.57
+
+@title: SiSU
+
+@subtitle: Download
+
+@creator: Amissah, Ralph
+
+@rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
+
+@type: information
+
+@subject: ebook, epublishing, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, search
+
+@date.created: 2007-08-28
+
+@date.issued: 2007-08-28
+
+@date.available: 2007-08-28
+
+@date.modified: 2008-07-21
+
+@date: 2008-07-21
+
+@level: new=C; break=1; num_top=1
+
+@skin: skin_sisu_manual
+
+@bold: /Gnu|Debian|Ruby|SiSU/
+
+@links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
+{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/examples.html
+{ SiSU @ Wikipedia }http://en.wikipedia.org/wiki/SiSU
+{ SiSU @ Freshmeat }http://freshmeat.net/projects/sisu/
+{ SiSU @ Ruby Application Archive }http://raa.ruby-lang.org/project/sisu/
+{ SiSU @ Debian }http://packages.qa.debian.org/s/sisu.html
+{ SiSU Download }http://www.jus.uio.no/sisu/SiSU/download.html
+{ SiSU Changelog }http://www.jus.uio.no/sisu/SiSU/changelog.html
+{ SiSU help }http://www.jus.uio.no/sisu/sisu_manual/sisu_help/
+{ SiSU help sources }http://www.jus.uio.no/sisu/sisu_manual/sisu_help_sources/
+
+:A~? @title @creator
+
+:B~? SiSU Downloads, Stable and Development Branches
+
+:C~ Download information
+
+1~download Download SiSU - Linux/Unix
+
+2~current- SiSU Current Version - Linux/Unix
+
+3~source- Source (tarball tar.gz)
+
+Download the latest version of SiSU (and SiSU markup samples):~{ Breakage and Fixes Report<br> http://www.jus.uio.no/sisu/SiSU/breakage_and_fixes.html }~
+
+_* {~^ sisu_1.0.0.orig.tar.gz (of 2009-12-5:48/5) }http://www.jus.uio.no/sisu/pkg/src/sisu_1.0.0.orig.tar.gz
+
+_* {~^ sisu-markup-samples_1.0.10.orig.tar.gz (of 2008-10-09:40/4 ) }http://www.jus.uio.no/sisu/pkg/src/sisu-markup-samples_1.0.10.orig.tar.gz ~{ <br>1e769b5c2c2d6135c3f5a14ede1d019f77588c7024168c756c7093510145c7dc 3442966 }~ *~sisu-markup-samples
+
+For installation notes see http://sisudoc.org/sisu/sisu_manual/installation.html
+
+For more general use see http://sisudoc.org/sisu/sisu_manual
+
+For changelogs see http://www.jus.uio.no/sisu/SiSU/changelog.html
+
+3~git- Git (source control management)
+
+Git repository currently at:
+
+_* git clone git://git.sisudoc.org/git/code/sisu.git
+
+_* git clone _http://git.sisudoc.org/git/code/sisu.git
+
+_* http://git.sisudoc.org/?p=code/sisu.git;a=summary
+
+On using git, see
+
+!_ Git documentation:
+{~^ Git User's Manual }http://www.kernel.org/pub/software/scm/git/docs/user-manual.html, {~^ Everyday GIT With 20 Commands Or So }http://www.kernel.org/pub/software/scm/git/docs/everyday.html, {~^ A tutorial introduction to git }http://www.kernel.org/pub/software/scm/git/docs/v1.4.4.4/tutorial.html, {~^ A tutorial introduction to git: part two }http://www.kernel.org/pub/software/scm/git/docs/v1.4.4.4/tutorial-2.html
+
+!_ User contributed texts:
+{~^ The Git Community Book }http://book.git-scm.com/index.html, {~^ Git Magic }http://www-cs-students.stanford.edu/~blynn/gitmagic/, {~^ Git From the Bottom Up (pdf) }http://www.newartisans.com/blog_assets/git.from.bottom.up.pdf
+
+3~debian- Debian
+
+This section contains information on the latest SiSU release. For installation notes see http://sisudoc.org/sisu/sisu_manual/installation.html
+
+SiSU is updated fairly regularly in Debian testing and unstable, and should be available therefrom.
+
+To add this archive, should you still choose to do so, add the following lines to your /etc/apt/sources.list
+
+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
+
+}code
+
+group{
+
+*{Source}*
+
+{~^ sisu_1.0.0.orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_1.0.0.orig.tar.gz
+
+{~^ sisu_1.0.0-1.diff.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_1.0.0-1.diff.gz
+
+{~^ sisu_1.0.0-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu_1.0.0-1.dsc
+
+}group
+
+group{
+
+*{Debs}*
+
+{~^ sisu_1.0.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_1.0.0-1_all.deb ~{ <br>sisu, the base code, (the main package on which the others depend), without any dependencies other than ruby (and for convenience the ruby webrick web server), this generates a number of types of output on its own, other packages provide additional functionality, and have their dependencies <br>Depends: ruby (>=1.8.2), libwebrick-ruby<br>Recommends: sisu-pdf, sisu-sqlite, sisu-postgresql, sisu-examples, vim-sisu, librmagick-ruby, trang, tidy, libtidy, librexml-ruby, zip, unzip, openssl }~
+
+{~^ sisu-complete_1.0.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-complete_1.0.0-1_all.deb ~{ <br>a package that pulls in other packages to build the whole of sisu (excluding sisu-examples) <br>Depends: ruby (>=1.8.2), sisu, sisu-pdf, sisu-postgresql, sisu-remote, sisu-sqlite, vim-sisu<br>Recommends: sisu-examples }~
+
+{~^ sisu-pdf_1.0.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-pdf_1.0.0-1_all.deb ~{ <br>dependencies used by sisu to produce pdf from LaTeX generated <br>Depends: sisu, tetex-bin, tetex-extra, latex-ucs<br>Suggests: evince, xpdf }~
+
+{~^ sisu-postgresql_1.0.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-postgresql_1.0.0-1_all.deb ~{ <br>dependencies used by sisu to populate postgresql database (further configuration is necessary) <br>Depends: sisu, postgresql-8.1, libdbi-ruby, libdbm-ruby, libdbd-pg-ruby<br>Suggests: pgaccess, libdbd-pgsql, postgresql-contrib-8.1 }~
+
+{~^ sisu-sqlite_1.0.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-sqlite_1.0.0-1_all.deb ~{ <br>dependencies used by sisu to populate sqlite database <br>Depends: sisu, sqlite, libdbi-ruby, libdbm-ruby, libdbd-sqlite-ruby<br>Suggests: libdbd-sqlite }~
+
+}group
+
+For changelogs see:
+
+_1 http://www.jus.uio.no/sisu/SiSU/changelog.html
+
+_1 http://www.jus.uio.no/sisu/sisu_changelog/changelog.html
+
+!_ non-free
+
+Book markup samples have been moved to non-free as the substantive text of the documents are available under the author or original publisher's license, and usually do not comply with the Debian Free Software Guidelines.
+
+_* {~^ sisu-markup-samples_1.0.10-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_1.0.10-1_all.deb ~{ <br>marked up documents and other examples related to sisu, a larger package containing a number of texts <br>Depends: sisu }~
+
+_* {~^ sisu-markup-samples_1.0.10-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu-markup-samples_1.0.10-1.dsc ~{ <br>sisu-markup-samples_1.0.10-1.dsc }~
+
+For changelogs see:
+
+_1 http://www.jus.uio.no/sisu/SiSU/changelog_markup_samples.html
+
+_1 http://www.jus.uio.no/sisu/sisu_markup_samples_changelog/changelog_markup_samples.html
+
+3~rpm- RPM
+
+The RPM is generated from the source file using Alien.~{ http://www.kitenet.net/programs/alien/ }~ Dependencies are not handled, not even that of the essential Ruby.
+
+sudo rpm -i [package name]
+
+_* {~^ sisu-1.0.0-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-1.0.0-2.noarch.rpm ~{ <br>created using alien }~
+
+_* {~^ sisu-markup-samples_1.0.10.orig-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-markup-samples_1.0.6.orig-2.noarch.rpm ~{ <br> http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_1.0.10-1_all.deb <br> created using: alien -r sisu_0.70.5-1_all.deb }~
+
+For changelogs see:
+
+_1 http://www.jus.uio.no/sisu/SiSU/changelog_markup_samples.html
+
+_1 http://www.jus.uio.no/sisu/sisu_markup_samples_changelog/changelog_markup_samples.html
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_examples.ssi b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_examples.ssi
index 06f1ec23..d70c5118 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_examples.ssi
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_examples.ssi
@@ -4,7 +4,7 @@
 
 @subtitle: Markup Samples, Output Examples
 
-@creator: Ralph Amissah
+@creator: Amissah, Ralph
 
 @rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_examples.sst b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_examples.sst
index 307b7107..2d580d1e 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_examples.sst
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_examples.sst
@@ -4,7 +4,7 @@
 
 @subtitle: Markup Samples, Output Examples
 
-@creator: Ralph Amissah
+@creator: Amissah, Ralph
 
 @rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
 
@@ -95,7 +95,7 @@ For some documents hardly any markup at all is required at all, other than a hea
 
 3~war_and_peace- /{"War and Peace"}/, Leo Tolstoy, PG Etext 2600 *~wap *~gutenberg
 
-{ "War and Peace", Leo Tolstoy [3sS]}war_and_peace.leo_tolstoy.sst ~{ http://www.jus.uio.no/sisu/war_and_peace.leo_tolstoy/toc.html <br> The ascii text was taken from Project Gutenberg. The markup transforms required are trivial. Of interest, in this instance I am saved by having alternative syntaxes/(structural modes) for marking up endnotes... as it was possible to do a simple search and replace to make the Project Gutenberg ascii presentation suitable for SiSU, using the older endnote markup style. This example instructs the program to use regular expressions, in this example the words: none; none; BOOK|FIRST|SECOND; CHAPTER; occurring at the beginning of a line, to identify what should be treated as different levels of heading in a document (and used to make the table of contents). Note that there was _{very little markup required}_ after the document headers and Project Gutenberg legal notices. As I presume the legal notices are similar in Project Gutenberg documents, (and I could not bear to think of preparing the same legal notices twice), I moved those to the "skin" for the Project, and these are now represented in the markup by \<:insert1\> and \<:insert2\> and the legal notices are available for similar insertion into the next Project Gutenberg text prepared for SiSU, should there be one. <br> I did a stylesheet/skin for the Gutenberg Project, ... I may have to remove. The markup transforms required are trivial. Of interest, in this instance I am saved by having alternative syntaxes/(structural modes) for marking up endnotes... as it is possible to do a simple search and replace to make Project Gutenberg ascii presentations suitable for SiSU using the older endnote markup style. There is _{very little markup required}_ after the document headers and Project Gutenberg legal notices. As I presume the legal notices are similar in Project Gutenberg documents, (and I could not bear to think of preparing the same legal notices twice), I moved those to the "skin" for the Project, and these are now represented in the markup by the \<:insert1\> and \<:insert2\> markers and the legal notices are available for similar insertion into the next Project Gutenberg text prepared for SiSU, should there be one. }~
+{ "War and Peace", Leo Tolstoy [3sS]}war_and_peace.leo_tolstoy.sst ~{ http://www.jus.uio.no/sisu/war_and_peace.leo_tolstoy/toc.html <br> The ascii text was taken from Project Gutenberg. The markup transforms required are trivial. Of interest, in this instance I am saved by having alternative syntaxes/(structural modes) for marking up endnotes... as it was possible to do a simple search and replace to make the Project Gutenberg ascii presentation suitable for SiSU, using the older endnote markup style. This example instructs the program to use regular expressions, in this example the words: none; none; BOOK|FIRST|SECOND; CHAPTER; occurring at the beginning of a line, to identify what should be treated as different levels of heading in a document (and used to make the table of contents). Note that there was _{very little markup required}_ after the document headers and Project Gutenberg legal notices. As I presume the legal notices are similar in Project Gutenberg documents, (and I could not bear to think of preparing the same legal notices twice), I moved those to the "skin" for the Project, and these are now represented in the markup by \<:insert1\> and \<:insert2\> and the legal notices are available for similar insertion into the next Project Gutenberg text prepared for SiSU, should there be one. <br> I did a stylesheet/skin for the Gutenberg Project, ... I may have to remove. }~
 
 3~quixote- /{"Don Quixote"}/, Miguel de Cervantes [Saavedra], translated by John Ormsby, PG Etext 996
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_faq.sst b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_faq.sst
index f7fead86..87274bc7 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_faq.sst
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_faq.sst
@@ -4,7 +4,7 @@
 
 @subtitle: FAQ - Frequently Asked/Answered Questions
 
-@creator: Ralph Amissah
+@creator: Amissah, Ralph
 
 @rights: Copyright (C) Ralph Amissah 2008, part of SiSU documentation, License GPL 3
 
@@ -39,8 +39,6 @@
 { SiSU help }http://www.jus.uio.no/sisu/sisu_manual/sisu_help/
 { SiSU help sources }http://www.jus.uio.no/sisu/sisu_manual/sisu_help_sources/
 
-% @rcs: $Id$
-
 :A~? @title @creator
 
 1~faq FAQ - Frequently Asked/Answered Questions
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_filetypes.sst b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_filetypes.sst
index 3c5a46e2..9f1dc99c 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_filetypes.sst
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_filetypes.sst
@@ -4,7 +4,7 @@
 
 @subtitle: Filetypes
 
-@creator: Ralph Amissah
+@creator: Amissah, Ralph
 
 @rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_help.sst b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_help.sst
index 6001d6ea..77bab0ad 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_help.sst
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_help.sst
@@ -4,7 +4,7 @@
 
 @subtitle: Help
 
-@creator: Ralph Amissah
+@creator: Amissah, Ralph
 
 @rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_help_sources.sst b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_help_sources.sst
index e2a85890..99b8d492 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_help_sources.sst
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_help_sources.sst
@@ -4,7 +4,7 @@
 
 @subtitle: References
 
-@creator: Ralph Amissah
+@creator: Amissah, Ralph
 
 @rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
 
@@ -39,8 +39,6 @@
 { SiSU help }http://www.jus.uio.no/sisu/sisu_manual/sisu_help/
 { SiSU help sources }http://www.jus.uio.no/sisu/sisu_manual/sisu_help_sources/
 
-% @rcs$
-
 :A~? @title @creator
 
 :B~? SiSU Help Sources
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_homepages.ssi b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_homepages.ssi
index 3bc6782b..965282db 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_homepages.ssi
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_homepages.ssi
@@ -4,7 +4,7 @@
 
 @subtitle: Homepages
 
-@creator: Ralph Amissah
+@creator: Amissah, Ralph
 
 @rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
 
@@ -39,8 +39,6 @@
 { SiSU help }http://www.jus.uio.no/sisu/sisu_manual/sisu_help/
 { SiSU help sources }http://www.jus.uio.no/sisu/sisu_manual/sisu_help_sources/
 
-% @rcs$
-
 :A~? @title @creator
 
 :B~? Setting up of homepages
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_how.ssi b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_how.ssi
index 0620b178..eaa17656 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_how.ssi
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_how.ssi
@@ -4,7 +4,7 @@
 
 @subtitle: How Does SiSU Work?
 
-@creator: Ralph Amissah
+@creator: Amissah, Ralph
 
 @rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_howto.sst b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_howto.sst
index 550b59f6..c67208d6 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_howto.sst
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_howto.sst
@@ -4,7 +4,7 @@
 
 @subtitle: Technical, Howto
 
-@creator: Ralph Amissah
+@creator: Amissah, Ralph
 
 @rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
 
@@ -39,8 +39,6 @@
 { SiSU help }http://www.jus.uio.no/sisu/sisu_manual/sisu_help/
 { SiSU help sources }http://www.jus.uio.no/sisu/sisu_manual/sisu_help_sources/
 
-% @rcs:+ $Id$
-
 :A~? @title @creator
 
 :B~? SiSU some technical information
@@ -389,29 +387,53 @@ here\~^
 
 { SiSU }http://sisudoc.org
 
-\{ SiSU \}http://sisudoc.org
+code{
+
+{ SiSU }http://sisudoc.org
+
+}code
+
+{sisu.png }http://sisudoc.org
+
+code{
 
 {sisu.png }http://sisudoc.org
 
-\{sisu.png \}http://sisudoc.org
+}code
 
 {tux.png 64x80 }image
 
-\{ tux.png 64x80 \}image
+code{
+
+{ tux.png 64x80 }image
+
+}code
+
+{~^ SiSU }http://sisudoc.org
+
+code{
 
 {~^ SiSU }http://sisudoc.org
 
-\{~^ SiSU \}http://sisudoc.org
+}code
 
 is equivalent to:
 
-\{ SiSU \}http://sisudoc.org ~\{ http://sisudoc.org \}~
+code{
+
+{ SiSU }http://sisudoc.org ~{ http://sisudoc.org }~
+
+}code
 
 the same can be done with an image:
 
 {~^ sisu.png "SiSU" }http://sisudoc.org
 
-\{~^ sisu.png "SiSU" \}http://sisudoc.org
+code{
+
+{~^ sisu.png "SiSU" }http://sisudoc.org
+
+}code
 
 2~ Number Titles
 
@@ -443,15 +465,15 @@ _* bullet paragraph
 
 \_#  number  paragraph level 2  (see headers for numbering document headings)
 
-_#  number  paragraph level 2  (see headers for numbering document headings)
+_#  number paragraph level 2 (see headers for numbering document headings)
 
 2~ Tables
 
 Table markup sample
 
-poem{
+code{
 
-table\{~h c3; 26; 32; 32;
+table{~h c3; 26; 32; 32;
 
 This is a table, column1
 this would become row one of column two
@@ -465,15 +487,15 @@ column one row three
 and so on
 here
 
-\}table
+}table
 
-}poem
+}code
 
 Alternative form of table markup
 
 code{
 
-{t\~h}
+{t~h}
      |Mon|Tue|Wed|Thu|Fri|Sat|Sun
 0    | * | * | * | * | * | * | *
 1    | * | * | * | * |   |   |  
@@ -513,19 +535,19 @@ and made cider inside her inside.
 
 }poem
 
-poem{
+code{
 
-poem\{
+poem{
 
 There was a young lady from Clyde,
 who ate a green apple and died,
 but the apple fermented inside the lamented,
 and made cider inside her inside.
 
-}\poem
-
 }poem
 
+}code
+
 2~ Composite Document
 
 To import another document, the master document or importing document should be named filename.r3 (r for require)
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_hyperestraier.ssi b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_hyperestraier.ssi
index e84476a8..1b97904c 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_hyperestraier.ssi
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_hyperestraier.ssi
@@ -4,7 +4,7 @@
 
 @subtitle: Hyperestraier Search
 
-@creator: Ralph Amissah
+@creator: Amissah, Ralph
 
 @rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_installation.ssi b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_installation.ssi
index b57cdef6..b58b5659 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_installation.ssi
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_installation.ssi
@@ -4,7 +4,7 @@
 
 @subtitle: Installation
 
-@creator: Ralph Amissah
+@creator: Amissah, Ralph
 
 @rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
 
@@ -39,8 +39,6 @@
 { SiSU help }http://www.jus.uio.no/sisu/sisu_manual/sisu_help/
 { SiSU help sources }http://www.jus.uio.no/sisu/sisu_manual/sisu_help_sources/
 
-% @rcs$
-
 :A~? SiSU Installation notes
 
 :C~ Installation
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_interesting_to_whom.ssi b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_interesting_to_whom.ssi
index 93248d29..abdcf77e 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_interesting_to_whom.ssi
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_interesting_to_whom.ssi
@@ -4,7 +4,7 @@
 
 @subtitle: Who Might Be Interested?
 
-@creator: Ralph Amissah
+@creator: Amissah, Ralph
 
 @rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_introduction.ssi b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_introduction.ssi
index 000a3fd5..106e2252 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_introduction.ssi
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_introduction.ssi
@@ -4,7 +4,7 @@
 
 @subtitle: Introduction
 
-@creator: Ralph Amissah
+@creator: Amissah, Ralph
 
 @rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_introduction.ssm b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_introduction.ssm
index f199fc78..44f71f1d 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_introduction.ssm
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_introduction.ssm
@@ -4,7 +4,7 @@
 
 @subtitle: Commands
 
-@creator: Ralph Amissah
+@creator: Amissah, Ralph
 
 @rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_manual.ssm b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_manual.ssm
index 41fd724b..5dcb56c5 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_manual.ssm
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_manual.ssm
@@ -4,7 +4,7 @@
 
 @subtitle: Manual
 
-@creator: Ralph Amissah
+@creator: Amissah, Ralph
 
 @rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_markup.sst b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_markup.sst
index dd620872..053174eb 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_markup.sst
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_markup.sst
@@ -1,10 +1,10 @@
-% SiSU 0.67
+% SiSU 0.72
 
 @title: SiSU
 
 @subtitle: Markup
 
-@creator: Ralph Amissah
+@creator: Amissah, Ralph
 
 @rights: Copyright (C) Ralph Amissah 2008, part of SiSU documentation, License GPL 3
 
@@ -41,8 +41,6 @@
 { SiSU help }http://www.jus.uio.no/sisu/sisu_manual/sisu_help/
 { SiSU help sources }http://www.jus.uio.no/sisu/sisu_manual/sisu_help_sources/
 
-% @prefix:
-
 :A~? @title @creator
 
 :B~? SiSU Markup
@@ -129,8 +127,6 @@ code{
 
 @creator: Amissah, Ralph
 
-% note formatting rules on author / creator field, "Surname, Other names", if more than one author separate by semi-colon (if name is of an institution just write name or the name contains a comma enclose in quotation marks)
-
 @rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
 
 @type: information
@@ -139,12 +135,8 @@ code{
 
 @topic_register: text markup language; application:text processing;output:html|xml|latex|pdf|sql
 
-% note formatting for topic_register topic levels are separated by a colon, a semi-colon separates main topics
-
 @date: 2007-09-16
 
-% original publication date unless the substantive text is updated/modified, then date of update
-
 @date.created: 2002-08-28
 
 @date.issued: 2002-08-28
@@ -283,9 +275,6 @@ loc=[Library of Congress classification]; dewey=[Dewey classification]; isbn=[IS
 
 !_ @prefix_b:
 
-!_ @rcs:
-$Id: sisu_markup.sst,v 1.2 2007/09/08 17:12:47 ralph Exp $ [used by rcs or cvs to embed version (revision control) information into document, rcs or cvs can usefully provide a history of updates to a document ]
-
 !_ @structure:
 PART; CHAPTER; SECTION; ARTICLE; none; none;<br>
 optional, document structure can be defined by words to match or regular expression (the regular expression is assumed to start at the beginning of a line of text i.e. ^) default markers :A~ to :C~ and 1~ to 6~ can be used within text instead, without this header tag, and may be used to supplement the instructions provided in this header tag if provided (@structure: is a synonym for @toc:)
@@ -575,7 +564,7 @@ code{
 
 normal text _http://www.jus.uio.no/sisu continues
 
-deb _http://www.jus.uio.no/sisu/archive unstable main non-free
+deb http://www.jus.uio.no/sisu/archive unstable main non-free
 
 }code
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_output_overview.sst b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_output_overview.sst
index 4a5cfad9..ab0a41db 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_output_overview.sst
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_output_overview.sst
@@ -4,7 +4,7 @@
 
 @subtitle: SiSU overview of status of features available in various outputs
 
-@creator: Ralph Amissah
+@creator: Amissah, Ralph
 
 @rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_pdf.sst b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_pdf.sst
index 384734b7..b413b198 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_pdf.sst
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_pdf.sst
@@ -4,7 +4,7 @@
 
 @subtitle: PDF
 
-@creator: Ralph Amissah
+@creator: Amissah, Ralph
 
 @rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_postgresql.sst b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_postgresql.sst
index 7a0e4281..fe8bd7d1 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_postgresql.sst
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_postgresql.sst
@@ -4,7 +4,7 @@
 
 @subtitle: Search
 
-@creator: Ralph Amissah
+@creator: Amissah, Ralph 
 
 @rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_quickstart.sst b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_quickstart.sst
index 35fd55ef..64a9d690 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_quickstart.sst
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_quickstart.sst
@@ -4,7 +4,7 @@
 
 @subtitle: Quickstart, installation and use
 
-@creator: Ralph Amissah
+@creator: Amissah, Ralph
 
 @rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
 
@@ -68,7 +68,6 @@ code{
 
   deb http://ftp.fi.debian.org/debian/ unstable main non-free contrib
   deb-src http://ftp.fi.debian.org/debian/ unstable main non-free contrib
-d
 
 }code
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_remote.sst b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_remote.sst
index 793380c9..3067e3e3 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_remote.sst
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_remote.sst
@@ -4,7 +4,7 @@
 
 @subtitle: Remote Operations
 
-@creator: Ralph Amissah
+@creator: Amissah, Ralph
 
 @rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
 
@@ -39,8 +39,6 @@
 { SiSU help }http://www.jus.uio.no/sisu/sisu_manual/sisu_help/
 { SiSU help sources }http://www.jus.uio.no/sisu/sisu_manual/sisu_help_sources/
 
-% @prefix: 
-
 :A~? @title @creator
 
 :B~? SiSU Remote Operations
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search.ssm b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_search.ssm
index 93549b7f..bc817b97 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search.ssm
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_search.ssm
@@ -4,7 +4,7 @@
 
 @subtitle: Search
 
-@creator: Ralph Amissah
+@creator: Amissah, Ralph 
 
 @rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search_cgi.ssi b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_search_cgi.ssi
index 4b3b9e86..d7919598 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search_cgi.ssi
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_search_cgi.ssi
@@ -4,7 +4,7 @@
 
 @subtitle: Search
 
-@creator: Ralph Amissah
+@creator: Amissah, Ralph
 
 @rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search_examples.ssi b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_search_examples.ssi
index f2fbe243..15a6d2db 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search_examples.ssi
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_search_examples.ssi
@@ -4,7 +4,7 @@
 
 @subtitle: Search
 
-@creator: Ralph Amissah
+@creator: Amissah, Ralph
 
 @rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search_intro.ssi b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_search_intro.ssi
index d8fef831..803330e7 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search_intro.ssi
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_search_intro.ssi
@@ -4,7 +4,7 @@
 
 @subtitle: Search
 
-@creator: Ralph Amissah
+@creator: Amissah, Ralph
 
 @rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_short_feature_summary.ssi b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_short_feature_summary.ssi
index e1c57ec7..7f6db5a8 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_short_feature_summary.ssi
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_short_feature_summary.ssi
@@ -4,7 +4,7 @@
 
 @subtitle: Summary of Features
 
-@creator: Ralph Amissah
+@creator: Amissah, Ralph
 
 @rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_skin.sst b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_skin.sst
index 8d19ba76..7c154c4b 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_skin.sst
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_skin.sst
@@ -4,7 +4,7 @@
 
 @subtitle: Skins
 
-@creator: Ralph Amissah
+@creator: Amissah, Ralph
 
 @rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
 
@@ -39,8 +39,6 @@
 { SiSU help }http://www.jus.uio.no/sisu/sisu_manual/sisu_help/
 { SiSU help sources }http://www.jus.uio.no/sisu/sisu_manual/sisu_help_sources/
 
-% @rcs$
-
 :A~? @title @creator
 
 :B~? Document Skins - configuration
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_sql.ssi b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_sql.ssi
index 00399816..65304a69 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_sql.ssi
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_sql.ssi
@@ -4,7 +4,7 @@
 
 @subtitle: SQL and Search
 
-@creator: Ralph Amissah
+@creator: Amissah, Ralph
 
 @rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_sqlite.sst b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_sqlite.sst
index 1a2b90b0..a713a7b1 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_sqlite.sst
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_sqlite.sst
@@ -4,7 +4,7 @@
 
 @subtitle: Search
 
-@creator: Ralph Amissah
+@creator: Amissah, Ralph
 
 @rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_syntax_highlighting.sst b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_syntax_highlighting.sst
index 9d319abb..62a16573 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_syntax_highlighting.sst
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_syntax_highlighting.sst
@@ -4,7 +4,7 @@
 
 @subtitle: Syntax Highlighting
 
-@creator: Ralph Amissah
+@creator: Amissah, Ralph
 
 @rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
 
@@ -39,8 +39,6 @@
 { SiSU help }http://www.jus.uio.no/sisu/sisu_manual/sisu_help/
 { SiSU help sources }http://www.jus.uio.no/sisu/sisu_manual/sisu_help_sources/
 
-% @rcs$
-
 :A~? @title @creator
 
 :B~? SiSU Syntax Highlighting
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_vim.sst b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_vim.sst
index b8018fa8..16cbe6af 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_vim.sst
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_vim.sst
@@ -4,7 +4,7 @@
 
 @subtitle: Vim
 
-@creator: Ralph Amissah
+@creator: Amissah, Ralph
 
 @rights: Copyright (C) Ralph Amissah 2008, part of SiSU documentation, License GPL 3
 
@@ -41,8 +41,6 @@
 { SiSU help }http://www.jus.uio.no/sisu/sisu_manual/sisu_help/
 { SiSU help sources }http://www.jus.uio.no/sisu/sisu_manual/sisu_help_sources/
 
-% @rcs$
-
 :A~? @title @creator
 
 :B~? SiSU Vim
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_webrick.sst b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_webrick.sst
index 5c588c68..c7b2fdcb 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_webrick.sst
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_webrick.sst
@@ -4,7 +4,7 @@
 
 @subtitle: sisu_webrick
 
-@creator: Ralph Amissah
+@creator: Amissah, Ralph
 
 @rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
 
@@ -42,8 +42,6 @@ synopsis=sisu -W
 { SiSU help }http://www.jus.uio.no/sisu/sisu_manual/sisu_help/
 { SiSU help sources }http://www.jus.uio.no/sisu/sisu_manual/sisu_help_sources/
 
-% @prefix: 
-
 :A~? @title @creator
 
 :B~? SiSU Webrick
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_work_needed_and_wishlist.ssi b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_work_needed_and_wishlist.ssi
index 52578a95..8ac075a7 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_work_needed_and_wishlist.ssi
+++ b/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_work_needed_and_wishlist.ssi
@@ -4,7 +4,7 @@
 
 @subtitle: Work Needed and Wishlist
 
-@creator: Ralph Amissah
+@creator: Amissah, Ralph
 
 @rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
 
diff --git a/data/sisu/image/b_search.png b/data/sisu/image/b_search.png
new file mode 100644
index 00000000..489d3585
--- /dev/null
+++ b/data/sisu/image/b_search.png
diff --git a/data/sisu/conf/cgi-bin/sisu_search_pgsql.cgi b/data/sisu/v1/conf/cgi-bin/sisu_search_pgsql.cgi
index c196c756..c196c756 100644
--- a/data/sisu/conf/cgi-bin/sisu_search_pgsql.cgi
+++ b/data/sisu/v1/conf/cgi-bin/sisu_search_pgsql.cgi
diff --git a/data/sisu/conf/cgi-bin/sisu_search_sqlite.cgi b/data/sisu/v1/conf/cgi-bin/sisu_search_sqlite.cgi
index 34bb3748..34bb3748 100644
--- a/data/sisu/conf/cgi-bin/sisu_search_sqlite.cgi
+++ b/data/sisu/v1/conf/cgi-bin/sisu_search_sqlite.cgi
diff --git a/data/sisu/conf/completion/README b/data/sisu/v1/conf/completion/README
index d723a140..d723a140 100644
--- a/data/sisu/conf/completion/README
+++ b/data/sisu/v1/conf/completion/README
diff --git a/data/sisu/conf/completion/_sisu b/data/sisu/v1/conf/completion/_sisu
index 076795cb..076795cb 100644
--- a/data/sisu/conf/completion/_sisu
+++ b/data/sisu/v1/conf/completion/_sisu
diff --git a/data/sisu/conf/convert/kdissert_to_sisu b/data/sisu/v1/conf/convert/kdissert_to_sisu
index daa7fd11..daa7fd11 100644
--- a/data/sisu/conf/convert/kdissert_to_sisu
+++ b/data/sisu/v1/conf/convert/kdissert_to_sisu
diff --git a/data/sisu/conf/convert/modify.rb b/data/sisu/v1/conf/convert/modify.rb
index 5f4f9ae0..5f4f9ae0 100644
--- a/data/sisu/conf/convert/modify.rb
+++ b/data/sisu/v1/conf/convert/modify.rb
diff --git a/data/sisu/conf/convert/sisu_convert b/data/sisu/v1/conf/convert/sisu_convert
index 7be075fc..7be075fc 100644
--- a/data/sisu/conf/convert/sisu_convert
+++ b/data/sisu/v1/conf/convert/sisu_convert
diff --git a/data/sisu/conf/convert/wvHtml.xml b/data/sisu/v1/conf/convert/wvHtml.xml
index 3cc9dd29..3cc9dd29 100644
--- a/data/sisu/conf/convert/wvHtml.xml
+++ b/data/sisu/v1/conf/convert/wvHtml.xml
diff --git a/data/sisu/conf/convert/wvSiSU.xml b/data/sisu/v1/conf/convert/wvSiSU.xml
index 271b00ff..271b00ff 100644
--- a/data/sisu/conf/convert/wvSiSU.xml
+++ b/data/sisu/v1/conf/convert/wvSiSU.xml
diff --git a/data/sisu/conf/editor-syntax-etc/README b/data/sisu/v1/conf/editor-syntax-etc/README
index c03f3569..c03f3569 100644
--- a/data/sisu/conf/editor-syntax-etc/README
+++ b/data/sisu/v1/conf/editor-syntax-etc/README
diff --git a/data/sisu/conf/editor-syntax-etc/diakonos/diakonos.conf b/data/sisu/v1/conf/editor-syntax-etc/diakonos/diakonos.conf
index 5b7a049a..5b7a049a 100644
--- a/data/sisu/conf/editor-syntax-etc/diakonos/diakonos.conf
+++ b/data/sisu/v1/conf/editor-syntax-etc/diakonos/diakonos.conf
diff --git a/data/sisu/conf/editor-syntax-etc/emacs/README b/data/sisu/v1/conf/editor-syntax-etc/emacs/README
index 24816c1e..24816c1e 100644
--- a/data/sisu/conf/editor-syntax-etc/emacs/README
+++ b/data/sisu/v1/conf/editor-syntax-etc/emacs/README
diff --git a/data/sisu/conf/editor-syntax-etc/emacs/sisu-mode.el b/data/sisu/v1/conf/editor-syntax-etc/emacs/sisu-mode.el
index ba2633d3..ba2633d3 100644
--- a/data/sisu/conf/editor-syntax-etc/emacs/sisu-mode.el
+++ b/data/sisu/v1/conf/editor-syntax-etc/emacs/sisu-mode.el
diff --git a/data/sisu/conf/editor-syntax-etc/gedit/sisu.lang b/data/sisu/v1/conf/editor-syntax-etc/gedit/sisu.lang
index b82d5f80..b82d5f80 100644
--- a/data/sisu/conf/editor-syntax-etc/gedit/sisu.lang
+++ b/data/sisu/v1/conf/editor-syntax-etc/gedit/sisu.lang
diff --git a/data/sisu/conf/editor-syntax-etc/kate/sisu.xml b/data/sisu/v1/conf/editor-syntax-etc/kate/sisu.xml
index a8054f2d..a8054f2d 100644
--- a/data/sisu/conf/editor-syntax-etc/kate/sisu.xml
+++ b/data/sisu/v1/conf/editor-syntax-etc/kate/sisu.xml
diff --git a/data/sisu/conf/editor-syntax-etc/nano/nanorc b/data/sisu/v1/conf/editor-syntax-etc/nano/nanorc
index 30ba439c..30ba439c 100644
--- a/data/sisu/conf/editor-syntax-etc/nano/nanorc
+++ b/data/sisu/v1/conf/editor-syntax-etc/nano/nanorc
diff --git a/data/sisu/conf/editor-syntax-etc/nedit/sisu_nedit.pats b/data/sisu/v1/conf/editor-syntax-etc/nedit/sisu_nedit.pats
index ef01b2be..ef01b2be 100644
--- a/data/sisu/conf/editor-syntax-etc/nedit/sisu_nedit.pats
+++ b/data/sisu/v1/conf/editor-syntax-etc/nedit/sisu_nedit.pats
diff --git a/data/sisu/conf/editor-syntax-etc/vim/colors/slate.vim b/data/sisu/v1/conf/editor-syntax-etc/vim/colors/slate.vim
index 64ae0ff1..64ae0ff1 100644
--- a/data/sisu/conf/editor-syntax-etc/vim/colors/slate.vim
+++ b/data/sisu/v1/conf/editor-syntax-etc/vim/colors/slate.vim
diff --git a/data/sisu/conf/editor-syntax-etc/vim/filetype.vim b/data/sisu/v1/conf/editor-syntax-etc/vim/filetype.vim
index 917c3e04..917c3e04 100644
--- a/data/sisu/conf/editor-syntax-etc/vim/filetype.vim
+++ b/data/sisu/v1/conf/editor-syntax-etc/vim/filetype.vim
diff --git a/data/sisu/conf/editor-syntax-etc/vim/ftplugin/sisu.vim b/data/sisu/v1/conf/editor-syntax-etc/vim/ftplugin/sisu.vim
index 314dd7d2..314dd7d2 100644
--- a/data/sisu/conf/editor-syntax-etc/vim/ftplugin/sisu.vim
+++ b/data/sisu/v1/conf/editor-syntax-etc/vim/ftplugin/sisu.vim
diff --git a/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim b/data/sisu/v1/conf/editor-syntax-etc/vim/syntax/sisu.vim
index fd570fa7..fd570fa7 100644
--- a/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim
+++ b/data/sisu/v1/conf/editor-syntax-etc/vim/syntax/sisu.vim
diff --git a/data/sisu/conf/editor-syntax-etc/vim/vim-sisu.yaml b/data/sisu/v1/conf/editor-syntax-etc/vim/vim-sisu.yaml
index ca665bc8..ca665bc8 100644
--- a/data/sisu/conf/editor-syntax-etc/vim/vim-sisu.yaml
+++ b/data/sisu/v1/conf/editor-syntax-etc/vim/vim-sisu.yaml
diff --git a/data/sisu/conf/lighttpd/lighttpd.cfg.sisu b/data/sisu/v1/conf/lighttpd/lighttpd.cfg.sisu
index a8819e3c..a8819e3c 100644
--- a/data/sisu/conf/lighttpd/lighttpd.cfg.sisu
+++ b/data/sisu/v1/conf/lighttpd/lighttpd.cfg.sisu
diff --git a/data/sisu/conf/lighttpd/lighttpd.cfg.sisu_www b/data/sisu/v1/conf/lighttpd/lighttpd.cfg.sisu_www
index d23c12ce..d23c12ce 100644
--- a/data/sisu/conf/lighttpd/lighttpd.cfg.sisu_www
+++ b/data/sisu/v1/conf/lighttpd/lighttpd.cfg.sisu_www
diff --git a/data/sisu/conf/ruby/irbrc b/data/sisu/v1/conf/ruby/irbrc
index cceffdfc..cceffdfc 100644
--- a/data/sisu/conf/ruby/irbrc
+++ b/data/sisu/v1/conf/ruby/irbrc
diff --git a/data/sisu/odf/odt.zip b/data/sisu/v1/odf/odt.zip
index 8f855535..8f855535 100644
--- a/data/sisu/odf/odt.zip
+++ b/data/sisu/v1/odf/odt.zip
diff --git a/lib/sisu/v1/cgi_pgsql.rb b/lib/sisu/v1/cgi_pgsql.rb
index 4f201dfa..f6f62bfb 100644
--- a/lib/sisu/v1/cgi_pgsql.rb
+++ b/lib/sisu/v1/cgi_pgsql.rb
@@ -153,11 +153,11 @@ module  SiSU_CGI_pgsql
             end
             search_construct=[]
             if @c
-              unescaped_search.gsub!(/\s*(AND|OR)\s*/,"' \) \\1 #@l~\( '")
-              unescaped_search.gsub!(/(.+)/,"#@l~\( '\\1' \)")
+              unescaped_search.gsub!(/\s*(AND|OR)\s*/,"' \) \\1 #{@l}~\( '")
+              unescaped_search.gsub!(/(.+)/,"#{@l}~\( '\\1' \)")
             else
-              unescaped_search.gsub!(/\s*(AND|OR)\s*/,"' \) \\1 #@l~*\( '")
-              unescaped_search.gsub!(/(.+)/,"#@l~*\( '\\1' \)")
+              unescaped_search.gsub!(/\s*(AND|OR)\s*/,"' \) \\1 #{@l}~*\( '")
+              unescaped_search.gsub!(/(.+)/,"#{@l}~*\( '\\1' \)")
             end
             search_construct << unescaped_search
             search_construct=search_construct.join(' ')
@@ -188,7 +188,7 @@ module  SiSU_CGI_pgsql
         def sql_select_body
           limit ||=@@limit
           offset ||=@@offset
-          @sql_statement[:body]=%{SELECT metadata.title, metadata.subtitle, metadata.creator, metadata.filename, metadata.suffix, documents.body, documents.seg, documents.ocn, metadata.tid FROM documents, metadata WHERE (#@search_text) AND documents.metadata_tid = metadata.tid ORDER BY metadata.title, metadata.filename, documents.ocn}
+          @sql_statement[:body]=%{SELECT metadata.title, metadata.subtitle, metadata.creator, metadata.filename, metadata.suffix, documents.body, documents.seg, documents.ocn, metadata.tid FROM documents, metadata WHERE (#{@search_text}) AND documents.metadata_tid = metadata.tid ORDER BY metadata.title, metadata.filename, documents.ocn}
           @sql_statement[:range]=%{LIMIT #{limit} OFFSET #{offset} ;}
           select=@sql_statement[:body] + ' ' + @sql_statement[:range]
           select
@@ -196,7 +196,7 @@ module  SiSU_CGI_pgsql
         def sql_select_endnotes
           limit ||=@@limit
           offset ||=@@offset
-          @sql_statement[:endnotes]=%{SELECT metadata.title, metadata.subtitle, metadata.creator, metadata.filename, endnotes.body, endnotes.nr, endnotes.ocn, endnotes.metadata_tid FROM metadata, endnotes WHERE (#@search_endnotes) AND metadata.tid = endnotes.metadata_tid ORDER BY metadata.title, metadata.filename, endnotes.nr}
+          @sql_statement[:endnotes]=%{SELECT metadata.title, metadata.subtitle, metadata.creator, metadata.filename, endnotes.body, endnotes.nr, endnotes.ocn, endnotes.metadata_tid FROM metadata, endnotes WHERE (#{@search_endnotes}) AND metadata.tid = endnotes.metadata_tid ORDER BY metadata.title, metadata.filename, endnotes.nr}
           @sql_statement[:range]=%{LIMIT #{limit} OFFSET #{offset} ;}
           select=@sql_statement[:endnotes] + ' ' + @sql_statement[:range]
           select
@@ -218,7 +218,7 @@ module  SiSU_CGI_pgsql
     end
     def buttons1_pgsql
       <<-'WOK_SQL'
-            <input type="checkbox" name="casesense" #@checked_case> case sensitive
+            <input type="checkbox" name="casesense" #{@checked_case}> case sensitive
       WOK_SQL
     end
     def dbi_connect
diff --git a/lib/sisu/v1/cgi_sql_common.rb b/lib/sisu/v1/cgi_sql_common.rb
index bd0b38a5..5138e311 100644
--- a/lib/sisu/v1/cgi_sql_common.rb
+++ b/lib/sisu/v1/cgi_sql_common.rb
@@ -129,7 +129,7 @@ module SiSU_CGI_sql
       <<-'WOK_SQL'
 #Common TOP
       @@limit,@@offset=1000,0
-      @base="#@hosturl_db/cgi-bin/#@version.cgi"
+      @base="#{@hosturl_db}/cgi-bin/#{@version}.cgi"
       @@canned_search_url=@base
       @color_heading='#DDFFAA'
       @color_match='#ffff48'
@@ -160,12 +160,12 @@ module SiSU_CGI_sql
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
     <meta name="sourcefile" content="SiSU._sst" />
     <link rel="generator" href="http://www.jus.uio.no/sisu" />
-    <link rel="shortcut icon" href="#@image_src/rb7.ico" />
+    <link rel="shortcut icon" href="#{@image_src}/rb7.ico" />
     <link rel="stylesheet" href="../_sisu/css/html.css" type="text/css" />
     </head>
     <body bgcolor="#ffffff" text="#000000" link="#003090" lang="en" xml:lang="en">
     <table summary="band" border="0" cellpadding="3" cellspacing="0">
-    <tr><td align="left" bgcolor="#ffffff"><a href="http://www.jus.uio.no/sisu/" target="_top"><img border="0" src="#@image_src/sisu.png" alt="SiSU --&gt;" /></a></td><td>
+    <tr><td align="left" bgcolor="#ffffff"><a href="http://www.jus.uio.no/sisu/" target="_top"><img border="0" src="#{@image_src}/sisu.png" alt="SiSU --&gt;" /></a></td><td>
 <!--    <p class="tiny"><a href="http://www.jus.uio.no/sisu/SiSU/">&nbsp;http://www.jus.uio.no/sisu/SiSU/</a></p> -->
       <label for="find"><b>#{@env.sample_search_form_title}</b></label>
     </td></tr>
@@ -174,49 +174,49 @@ module SiSU_CGI_sql
     end
     def header2
       <<-'WOK_SQL'
-    <form action="#@base" id="Test Form" method="post">
+    <form action="#{@base}" id="Test Form" method="post">
       <table cellpadding="2">
       <tr><td valign=\"top\">
-          <textarea id="find" name="find" type="text" rows="6" cols="40" maxlength="256">#@search_field</textarea>
+          <textarea id="find" name="find" type="text" rows="6" cols="40" maxlength="256">#{@search_field}</textarea>
       </td>
       <td valign=\"top\">
-        #@tip
-        #@search_note
-        #@the_can
+        #{@tip}
+        #{@search_note}
+        #{@the_can}
       </td></tr></table>
       <td valign=\"top\"><tr><td>
-        <!input type="text" id="find" name="find" value="#@search_field" />
+        <!input type="text" id="find" name="find" value="#{@search_field}" />
         <!input type="text" id="find" name="find" value="" />
         <font size="2" color="#222222">
         <b>to search:</b> select which database to search (drop-down menu below); enter your search query (in the form above); and <b>click on the search button</b> (below)
         <br />
         <select name="db" size="1">
-          #@selected_db
+          #{@selected_db}
       WOK_SQL
     end
     def buttons1
       <<-'WOK_SQL'
         </select>
         <input type="submit" value="SiSU search" />
-        <input type="radio" name="view" value="index" #@checked_index> index
-        <input type="radio" name="view" value="text" #@checked_text> text / grep
+        <input type="radio" name="view" value="index" #{@checked_index}> index
+        <input type="radio" name="view" value="text" #{@checked_text}> text / grep
       WOK_SQL
     end
     def buttons2
       <<-'WOK_SQL'
         <br />
-          <input type="checkbox" name="echo" #@checked_echo> echo query
-          <input type="checkbox" name="stats" #@checked_stats> result stats
-          <input type="checkbox" name="url" #@checked_url> search url
-          <input type="checkbox" name="searched" #@checked_searched> searched
-          <input type="checkbox" name="tip" #@checked_tip> available fields
-          <input type="checkbox" name="sql" #@checked_sql> sql statement
+          <input type="checkbox" name="echo" #{@checked_echo}> echo query
+          <input type="checkbox" name="stats" #{@checked_stats}> result stats
+          <input type="checkbox" name="url" #{@checked_url}> search url
+          <input type="checkbox" name="searched" #{@checked_searched}> searched
+          <input type="checkbox" name="tip" #{@checked_tip}> available fields
+          <input type="checkbox" name="sql" #{@checked_sql}> sql statement
         <br />
           checks:
-          <input type="radio" name="checks" value="check_default" #@checked_default> default
-          <input type="radio" name="checks" value="check_selected" #@checked_selected> selected
-          <input type="radio" name="checks" value="check_all" #@checked_all> all
-          <input type="radio" name="checks" value="check_none" #@checked_none> none
+          <input type="radio" name="checks" value="check_default" #{@checked_default}> default
+          <input type="radio" name="checks" value="check_selected" #{@checked_selected}> selected
+          <input type="radio" name="checks" value="check_all" #{@checked_all}> all
+          <input type="radio" name="checks" value="check_none" #{@checked_none}> none
           </font>
       </td></tr>
       </table>
@@ -285,8 +285,9 @@ module SiSU_CGI_sql
             @date_modified=q['dtm'] if q['dtm']=~/\S/
             @date_available=q['dta'] if q['dta']=~/\S/
             @date_valid=q['dtv'] if q['dtv']=~/\S/
-            @filename=q['fns'] if q['fns']=~/\S/
-            @filename=q['doc'] if q['search'] !~/search db/
+            @filename=if q['doc'] and q['search'] !~/search db/; q['doc']
+            elsif q['fns']=~/\S/; q['fns']·
+            end 
             @@limit=q['ltd'] if q['ltd']=~/\d+/  # 1000
             @@offset=q['off'] if q['off']=~/\d+/ # 0
           end
@@ -525,7 +526,7 @@ module SiSU_CGI_sql
 <tr><td valign="top" width="10%">
   <p class="tiny_left"><font color="#666666" size="2">
     <a href="http://www.jus.uio.no/sisu" >
-      <img border="0" src="#@image_src/sisu.png" alt="SiSU" width="120" height="39" />
+      <img border="0" src="#{@image_src}/sisu.png" alt="SiSU" width="120" height="39" />
     </a>
   </font></p>
 </td><td valign="top" width="45%">
@@ -572,7 +573,7 @@ module SiSU_CGI_sql
 <tr><td valign="top" width="10%">
   <p class="tiny_left"><font color="#666666" size="2">
     <a href="http://www.gnu.org/licenses/gpl.html">
-      <img border="0" src="#@image_src/gplv3_free_software.png" alt="GPLv3" width="127" height="51" />
+      <img border="0" src="#{@image_src}/gplv3_free_software.png" alt="GPLv3" width="127" height="51" />
     </a>
   </font></p>
 </td><td valign="top" width="45%">
@@ -692,10 +693,10 @@ module SiSU_CGI_sql
             dtv='&dtv=' + CGI.escape(@search_for.date_valid) if @search_for.date_valid=~/\S/
             fns='&fns=' + CGI.escape(@search_for.filename) if @search_for.filename=~/\S/
             @@canned_search_url=if checked_all =~/checked/
-              "#@base?#{s1}#{key}#{ti}#{au}#{sj}#{dsc}#{pb}#{cntr}#{dt}#{ty}#{id}#{src}#{lang}#{rel}#{cov}#{cr}#{co}#{ab}#{dtc}#{dti}#{dtm}#{dta}#{dtv}#{fns}&db=#{cgi['db']}&view=#{cgi['view']}&a=1"
-            else "#@base?#{s1}#{key}#{ti}#{au}#{sj}#{dsc}#{pb}#{cntr}#{dt}#{ty}#{id}#{src}#{lang}#{rel}#{cov}#{cr}#{co}#{ab}#{dtc}#{dti}#{dtm}#{dta}#{dtv}#{fns}&db=#{cgi['db']}&view=#{cgi['view']}"
+              "#{@base}?#{s1}#{key}#{ti}#{au}#{sj}#{dsc}#{pb}#{cntr}#{dt}#{ty}#{id}#{src}#{lang}#{rel}#{cov}#{cr}#{co}#{ab}#{dtc}#{dti}#{dtm}#{dta}#{dtv}#{fns}&db=#{cgi['db']}&view=#{cgi['view']}&a=1"
+            else "#{@base}?#{s1}#{key}#{ti}#{au}#{sj}#{dsc}#{pb}#{cntr}#{dt}#{ty}#{id}#{src}#{lang}#{rel}#{cov}#{cr}#{co}#{ab}#{dtc}#{dti}#{dtm}#{dta}#{dtv}#{fns}&db=#{cgi['db']}&view=#{cgi['view']}"
             end
-            @canned_base_url="#@base?#{s1}&db=#{cgi['db']}"
+            @canned_base_url="#{@base}?#{s1}&db=#{cgi['db']}"
             if checked_case=~/\S/
               @search[:text][1]=%{documents.clean~'#{@search_for.text1}'} #s1
               @search[:endnotes][1]=%{endnotes.clean~'#{@search_for.text1}'} #s1
@@ -705,7 +706,7 @@ module SiSU_CGI_sql
             end
             canned_note='search url:'
           else
-            @@canned_search_url="#@base?db=#{@db}&view=index"
+            @@canned_search_url="#{@base}?db=#{@db}&view=index"
             canned_note='search url example:'
           end
           if search_field =~/\S+/
@@ -748,7 +749,7 @@ module SiSU_CGI_sql
           p_filename=%{filename: #{green}#{@search_for.filename}</font><br />} if @search_for.filename =~/\S+/
           search_note=<<-WOK
       <font size="2" color="#666666">
-      <b>database:</b> #{green}#@db</font>; <b>selected view:</b> #{green}#{cgi['view']}</font>
+      <b>database:</b> #{green}#{@db}</font>; <b>selected view:</b> #{green}#{cgi['view']}</font>
       <b>search string:</b> "#{green}#{analyze_format}</font>"<br />
       #{p_text} #{p_keywords} #{p_title} #{p_author} #{p_subject} #{p_description} #{p_publisher} #{p_contributor} #{p_date} #{p_type} #{p_format} #{p_identifier} #{p_source} #{p_language} #{p_relation} #{p_coverage} #{p_rights} #{p_comment} #{p_abstract} #{p_filename}
       </font>
@@ -805,10 +806,10 @@ module SiSU_CGI_sql
               ti=if c['subtitle'] =~/\S+/; "#{c['title']} - #{c['subtitle']}"
               else c['title']
               end
-              can_txt_srch=if cgi['view']=~/index/; %{<a href="#{@canned_base_url}&fns=#{c['filename']}&view=text"><img border="0" width="12" height="12" src="#@image_src/bullet_red.png" alt="red bullet"></a>&nbsp;}
-              else %{<a href="#{@canned_base_url}&fns=#{c['filename']}&view=index"><img border="0" width="12" height="12" src="#@image_src/bullet_red.png" alt="red bullet"></a>&nbsp;}
+              can_txt_srch=if cgi['view']=~/index/; %{<a href="#{@canned_base_url}&fns=#{c['filename']}&view=text"><img border="0" width="24" height="16" src="#{@image_src}/b_search.png" alt="search"></a>&nbsp;}
+              else %{<a href="#{@canned_base_url}&fns=#{c['filename']}&view=index"><img border="0" width="24" height="16" src="#{@image_src}/b_search.png" alt="search"></a>&nbsp;}
               end
-              title=%{<span style="background-color: #@color_heading"><a href="#@hosturl_files/#@stub/#{location}/toc#{lang}.html"><img border="0" width="15" height="18" src="#@image_src/b_toc.png" alt="toc html">&nbsp;#{ti}</a></span> by #{c['creator']} #{can_txt_srch}<a href="#@hosturl_files/#@stub/#{location}/toc#{lang}.html"><img border="0" width="15" height="18" src="#@image_src/b_toc.png" alt="toc html"></a>&nbsp;<a href="#@hosturl_files/#@stub/#{location}/portrait#{lang}.pdf"><img border="0" width="15" height="18" src="#@image_src/b_pdf.png" alt="pdf portrait"></a>&nbsp;<a href="#@hosturl_files/#@stub/#{location}/landscape#{lang}.pdf"><img border="0" width="18" height="15" src="#@image_src/b_pdf.png" alt="pdf landscape"></a>&nbsp;<a href="#@hosturl_files/#@stub/#{location}/opendocument#{lang}.odt"><img border="0" width="15" height="15" src="#@image_src/b_odf.png" alt="odf"></a>&nbsp;<a href="#@hosturl_files/#@stub/#{location}/sisu_manifest#{lang}.html"><img border="0" width="15" height="15" src="#@image_src/b_info.png" alt="manifest"></a><br />}  if file_suffix=~/s/ #hmm watch file_suffix
+              title=%{<span style="background-color: #{@color_heading}"><a href="#{@hosturl_files}/#{@stub}/#{location}/toc#{lang}.html"><img border="0" width="15" height="18" src="#{@image_src}/b_toc.png" alt="toc html">&nbsp;#{ti}</a></span> by #{c['creator']} #{can_txt_srch}<a href="#{@hosturl_files}/#{@stub}/#{location}/toc#{lang}.html"><img border="0" width="15" height="18" src="#{@image_src}/b_toc.png" alt="toc html"></a>&nbsp;<a href="#{@hosturl_files}/#{@stub}/#{location}/portrait#{lang}.pdf"><img border="0" width="15" height="18" src="#{@image_src}/b_pdf.png" alt="pdf portrait"></a>&nbsp;<a href="#{@hosturl_files}/#{@stub}/#{location}/landscape#{lang}.pdf"><img border="0" width="18" height="15" src="#{@image_src}/b_pdf.png" alt="pdf landscape"></a>&nbsp;<a href="#{@hosturl_files}/#{@stub}/#{location}/opendocument#{lang}.odt"><img border="0" width="15" height="15" src="#{@image_src}/b_odf.png" alt="odf"></a>&nbsp;<a href="#{@hosturl_files}/#{@stub}/#{location}/sisu_manifest#{lang}.html"><img border="0" width="15" height="15" src="#{@image_src}/b_info.png" alt="manifest"></a><br />}  if file_suffix=~/s/ #hmm watch file_suffix
               if @text_search_flag; title='<br /><hr>'+title
               else                  title='<br />'+title
               end
@@ -844,10 +845,10 @@ module SiSU_CGI_sql
                   else nil
                   end
                   matched_para=if (@search_regx.to_s.class==String && @search_regx.to_s=~/\S\S+/)
-                    matched=c['body'].gsub(/(<a\s+href="https?:\/\/[^><\s]+#{@search_regx}[^>]+?>|#@search_regx)/mi,%{<span style="background-color: #@color_match">\\1</span>})
+                    matched=c['body'].gsub(/(<a\s+href="https?:\/\/[^><\s]+#{@search_regx}[^>]+?>|#{@search_regx})/mi,%{<span style="background-color: #{@color_match}">\\1</span>})
                   else c['body']
                   end
-                  %{<hr><p><font size="2">ocn <b><a href="#@hosturl_files/#@stub/#{location}/#{c['seg']}#{lang}.html##{c['ocn']}">#{c['ocn']}</a></b>:</font></p>#{matched_para}}
+                  %{<hr><p><font size="2">ocn <b><a href="#{@hosturl_files}/#{@stub}/#{location}/#{c['seg']}#{lang}.html##{c['ocn']}">#{c['ocn']}</a></b>:</font></p>#{matched_para}}
                 elsif c['suffix'] =~/1/ #doc
                   %{#{title}<hr><p><font size="2">ocn #{c['ocn']}:#{c['body']}}
                 end
@@ -857,9 +858,9 @@ module SiSU_CGI_sql
                 end
               else #elsif cgi['view']=~/index/                                #% idx body
                 if c['suffix'] !~/1/ #seg
-                  index=%{<a href="#@hosturl_files/#@stub/#{location}/#{c['seg']}#{lang}.html##{c['ocn']}">#{c['ocn']}</a>, } if @text_search_flag
+                  index=%{<a href="#{@hosturl_files}/#{@stub}/#{location}/#{c['seg']}#{lang}.html##{c['ocn']}">#{c['ocn']}</a>, } if @text_search_flag
                 elsif c['suffix'] =~/1/ #doc
-                  index=%{<a href="#@hosturl_files/#@stub/#{location}/doc#{lang}.html##{c['ocn']}">#{c['ocn']}</a>, }
+                  index=%{<a href="#{@hosturl_files}/#{@stub}/#{location}/doc#{lang}.html##{c['ocn']}">#{c['ocn']}</a>, }
                 end
                 if c['seg'] =~/\S+/
                   if @text_search_flag
@@ -884,7 +885,7 @@ module SiSU_CGI_sql
                   over=''
                   false
                 end
-                %{<hr /><font size="2" color="#666666">Found in the main body of #@counter_txt_doc documents, and at #{over} #@counter_txt_ocn locations within.</font><br />}
+                %{<hr /><font size="2" color="#666666">Found in the main body of #{@counter_txt_doc} documents, and at #{over} #{@counter_txt_ocn} locations within.</font><br />}
               else ''
               end
             else ''
@@ -908,10 +909,10 @@ module SiSU_CGI_sql
                 ti=if e['subtitle'] =~/\S+/; "#{e['title']} - #{e['subtitle']}"
                 else e['title']
                 end
-                can_txt_srch=if cgi['view']=~/index/; %{<a href="#{@canned_base_url}&fns=#{e['filename']}&view=text"><img border="0" width="12" height="12" src="#@image_src/bullet_red.png" alt="red bullet"></a>&nbsp;}
-                else %{<a href="#{@canned_base_url}&fns=#{e['filename']}&view=index"><img border="0" width="12" height="12" src="#@image_src/bullet_red.png" alt="red bullet"></a>&nbsp;}
+                can_txt_srch=if cgi['view']=~/index/; %{<a href="#{@canned_base_url}&fns=#{e['filename']}&view=text"><img border="0" width="24" height="16" src="#{@image_src}/b_search.png" alt="search"></a>&nbsp;}
+                else %{<a href="#{@canned_base_url}&fns=#{e['filename']}&view=index"><img border="0" width="24" height="16" src="#{@image_src}/b_search.png" alt="search"></a>&nbsp;}
                 end
-                title=%{<br /><hr><span style="background-color: #@color_heading"><a href="#@hosturl_files/#@stub/#{location}/toc#{lang}.html"><img border="0" width="15" height="18" src="#@image_src/b_toc.png" alt="toc html">&nbsp;#{ti}</a></span> by #{e['creator']} #{can_txt_srch}<a href="#@hosturl_files/#@stub/#{location}/toc#{lang}.html"><img border="0" width="15" height="18" src="#@image_src/b_toc.png" alt="toc html"></a>&nbsp;<a href="#@hosturl_files/#@stub/#{location}/portrait.pdf"><img border="0" width="15" height="18" src="#@image_src/b_pdf.png" alt="pdf portrait"></a>&nbsp;<a href="#@hosturl_files/#@stub/#{location}/landscape.pdf"><img border="0" width="18" height="15" src="#@image_src/b_pdf.png" alt="pdf landscape"></a>&nbsp;<a href="#@hosturl_files/#@stub/#{location}/opendocument#{lang}.odt"><img border="0" width="15" height="15" src="#@image_src/b_odf.png" alt="odf"></a>&nbsp;<a href="#@hosturl_files/#@stub/#{location}/sisu_manifest#{lang}.html"><img border="0" width="15" height="15" src="#@image_src/b_info.png" alt="manifest"></a><br />}  if file_suffix=~/s/
+                title=%{<br /><hr><span style="background-color: #{@color_heading}"><a href="#{@hosturl_files}/#{@stub}/#{location}/toc#{lang}.html"><img border="0" width="15" height="18" src="#{@image_src}/b_toc.png" alt="toc html">&nbsp;#{ti}</a></span> by #{e['creator']} #{can_txt_srch}<a href="#{@hosturl_files}/#{@stub}/#{location}/toc#{lang}.html"><img border="0" width="15" height="18" src="#{@image_src}/b_toc.png" alt="toc html"></a>&nbsp;<a href="#{@hosturl_files}/#{@stub}/#{location}/portrait.pdf"><img border="0" width="15" height="18" src="#{@image_src}/b_pdf.png" alt="pdf portrait"></a>&nbsp;<a href="#{@hosturl_files}/#{@stub}/#{location}/landscape.pdf"><img border="0" width="18" height="15" src="#{@image_src}/b_pdf.png" alt="pdf landscape"></a>&nbsp;&nbsp;<a href="#{@hosturl_files}/#{@stub}/#{location}/opendocument#{lang}.odt"><img border="0" width="15" height="15" src="#{@image_src}/b_odf.png" alt="odf"></a>&nbsp;<a href="#{@hosturl_files}/#{@stub}/#{location}/sisu_manifest#{lang}.html"><img border="0" width="15" height="15" src="#{@image_src}/b_info.png" alt="manifest"></a><br />}  if file_suffix=~/s/
                 @counter_endn_doc+=1
                 oldtid=e['metadata_tid'].to_i
               else title = ''
@@ -920,13 +921,13 @@ module SiSU_CGI_sql
               or (cgi['view']!~/index/ and cgi['search'] !~/search db/)      #% txt endnotes
                 @counter_endn_ocn+=1
                 matched_endnote=if (@search_regx.to_s.class==String && @search_regx.to_s=~/\S\S+/)
-                  matched=e['body'].gsub(/(<a\s+href="https?:\/\/[^><\s]+#{@search_regx}[^>]+?>|#@search_regx)/mi,%{<span style="background-color: #@color_match">\\1</span>})
+                  matched=e['body'].gsub(/(<a\s+href="https?:\/\/[^><\s]+#{@search_regx}[^>]+?>|#{@search_regx})/mi,%{<span style="background-color: #{@color_match}">\\1</span>})
                 else e['body']
                 end
-                output=%{#{title}<hr><font size="2">note <b><a href="#@hosturl_files/#@stub/#{location}/endnotes.html#_#{e['nr']}">#{e['nr']}</a></b> referred to from ocn <a href="#@hosturl_files/#@stub/#{location}/doc.html##{e['ocn']}">#{e['ocn']}</a>:</font> #{matched_endnote}}
+                output=%{#{title}<hr><font size="2">note <b><a href="#{@hosturl_files}/#{@stub}/#{location}/endnotes.html#_#{e['nr']}">#{e['nr']}</a></b> referred to from ocn <a href="#{@hosturl_files}/#{@stub}/#{location}/doc.html##{e['ocn']}">#{e['ocn']}</a>:</font> #{matched_endnote}}
               else #elsif cgi['view']=~/index/                                #% idx endnotes
                 @counter_endn_ocn+=1
-                output=%{#{title}<a href="#@hosturl_files/#@stub/#{location}/endnotes.html#_#{e['nr']}">#{e['nr']}</a> [&sect; <a href="#@hosturl_files/#@stub/#{location}/doc.html##{e['ocn']}">#{e['ocn']}</a>], }
+                output=%{#{title}<a href="#{@hosturl_files}/#{@stub}/#{location}/endnotes.html#_#{e['nr']}">#{e['nr']}</a> [&sect; <a href="#{@hosturl_files}/#{@stub}/#{location}/doc.html##{e['ocn']}">#{e['ocn']}</a>], }
               end
               @counters_endn=if @counter_endn_doc > 0
                 if checked_stats =~/\S/
@@ -937,7 +938,7 @@ module SiSU_CGI_sql
                     over=''
                     false
                   end
-                    %{<font size="2" color="#666666">Found in the endnotes of #@counter_endn_doc documents, and at #{over} #@counter_endn_ocn locations within.</font><br />}
+                    %{<font size="2" color="#666666">Found in the endnotes of #{@counter_endn_doc} documents, and at #{over} #{@counter_endn_ocn} locations within.</font><br />}
                   else ''
                   end
                 end
diff --git a/lib/sisu/v1/cgi_sqlite.rb b/lib/sisu/v1/cgi_sqlite.rb
index 34cb67dc..9a2be6dd 100644
--- a/lib/sisu/v1/cgi_sqlite.rb
+++ b/lib/sisu/v1/cgi_sqlite.rb
@@ -148,8 +148,8 @@ module  SiSU_CGI_sqlite
             elsif @q =~/\S+/;  unescaped_search=CGI.unescape(@q)
             end
             search_construct=[]
-            unescaped_search.gsub!(/\s*(AND|OR)\s*/,"%' \) \\1 #@l LIKE \( '%")
-            unescaped_search.gsub!(/(.+)/,"#@l LIKE \( '%\\1%' \)")
+            unescaped_search.gsub!(/\s*(AND|OR)\s*/,"%' \) \\1 #{@l} LIKE \( '%")
+            unescaped_search.gsub!(/(.+)/,"#{@l} LIKE \( '%\\1%' \)")
             search_construct << unescaped_search
             search_construct=search_construct.join(' ')
             search[:search]                    << search_construct
diff --git a/lib/sisu/v1/constants.rb b/lib/sisu/v1/constants.rb
index 5c93d543..b2fdf5a1 100644
--- a/lib/sisu/v1/constants.rb
+++ b/lib/sisu/v1/constants.rb
@@ -167,6 +167,6 @@ check:
  ‹ › ∗ 
 '〔lv1〕','〔lv2〕','〔lv3〕','〔lv4〕','〔lv5〕','〔lv6〕','〔lv7〕','〔lv8〕','〔lv9〕'
 '〔 Ѳ1〕','〔 Ѳ2〕','〔 Ѳ3〕','〔 Ѳ4〕','〔 Ѳ5〕','〔Ѳ6〕','〔Ѳ7〕','〔Ѳ8〕','〔Ѳ9〕'
-◁▷ 
+◁▷
 
 ◀this is text or an image▶ http://
diff --git a/lib/sisu/v1/css.rb b/lib/sisu/v1/css.rb
index ced72d17..60ebf35c 100644
--- a/lib/sisu/v1/css.rb
+++ b/lib/sisu/v1/css.rb
@@ -104,8 +104,8 @@ WOK
 /* SiSU harvest css default stylesheet */
   body {
     color: black;
-    background: "#ffffff";
-    background-color: "#ffffff";
+    background: #ffffff;
+    background-color: #ffffff;
   }
   a:link {
     color: #003399;
@@ -120,7 +120,7 @@ WOK
     background-color: #f9f9aa;
   }
   a:hover img {
-    background-color: "#ffffff";
+    background-color: #ffffff;
   }
   a:active {
     color: #003399;
@@ -229,13 +229,13 @@ WOK
   }
 WOK
     end
-    def html                                      #stylesheet for css html pages == html.css
+    def html                                      #stylesheet for css html pages== html.css
 <<WOK
 /* SiSU css default stylesheet */
   body {
     color: black;
-    background: "#ffffff";
-    background-color: "#ffffff";
+    background: #ffffff;
+    background-color: #ffffff;
   }
 /*
     table {
@@ -245,7 +245,7 @@ WOK
     tr {
       display: block;
     }
-    th, td {
+    th,td {
       display: inline;
       vertical-align: top;
     }
@@ -269,7 +269,7 @@ WOK
   }
 */
   a:hover img {
-    background-color: "#ffffff";
+    background-color: #ffffff;
   }
   a:active {
     color: #003399;
@@ -429,6 +429,7 @@ WOK
     font-family: inconsolata, andale mono, courier new, courier, monospace;
     font-size: 90%;
     text-align: left;
+    background-color: #eeeeee;
   }
 
   p.caption {
diff --git a/lib/sisu/v1/dal_doc_str.rb b/lib/sisu/v1/dal_doc_str.rb
index 2e135243..bed3115c 100644
--- a/lib/sisu/v1/dal_doc_str.rb
+++ b/lib/sisu/v1/dal_doc_str.rb
@@ -101,6 +101,7 @@ module SiSU_document_structure
         @para.gsub!(/^:?B~\s+/,"#{Mx[:lv_o]}2:#{Mx[:lv_c]}")
         @para.gsub!(/^:?A~(\S+)/,"#{Mx[:lv_o]}1:\\1#{Mx[:lv_c]}")
         @para.gsub!(/^:?A~\s+/,"#{Mx[:lv_o]}1:#{Mx[:lv_c]}")
+        @para.gsub!(/^:?A~\s*$/,"#{Mx[:lv_o]}1:#{Mx[:lv_c]} @title @author")
         @para=if @para =~/^@(?:level|markup):\s/
           @para.gsub!(/3/,'6')
           @para.gsub!(/2/,'5')
diff --git a/lib/sisu/v1/dal_images.rb b/lib/sisu/v1/dal_images.rb
index 1882aea5..2e3e3fdd 100644
--- a/lib/sisu/v1/dal_images.rb
+++ b/lib/sisu/v1/dal_images.rb
@@ -22,7 +22,7 @@
 
    This program is distributed in the hope that it will be useful, but WITHOUT
    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+   FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
    more details.
 
    You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v1/dal_substitutions_and_insertions.rb b/lib/sisu/v1/dal_substitutions_and_insertions.rb
index cadae8a7..1ffb22d4 100644
--- a/lib/sisu/v1/dal_substitutions_and_insertions.rb
+++ b/lib/sisu/v1/dal_substitutions_and_insertions.rb
@@ -79,29 +79,55 @@ module SiSU_substitute_and_insert
           @skin.select
           ins=SiSU_Viz::Inserts.new
           case para
-          when /^\s*<:insert1>\s*$/
-            para=[]
-            ins.insert1.split(/\n\n/).each{|x| para << x }
-          when /^\s*<:insert2>\s*$/
-            para=[]
-            ins.insert2.split(/\n\n/).each{|x| para << x }
-          when /^\s*<:insert3>\s*$/
-            para=[]
-            ins.insert3.split(/\n\n/).each{|x| para << x << "\n"}
-            para=ins.insert3
-          when /^\s*<:insert4>\s*$/
-            para=[]
-            ins.insert4.split(/\n\n/).each{|x| para << x << "\n"}
-            para=ins.insert4
-          when /^\s*<:insert5>\s*$/
-            para=[]
-            ins.insert5.split(/\n\n/).each{|x| para << x << "\n"}
-          when /^\s*<:insert6>\s*$/
-            para=[]
-            ins.insert6.split(/\n\n/).each{|x| para << x << "\n"}
-          when /^\s*<:insert7>\s*$/
-            para=[]
-            ins.insert7.split(/\n\n/).each{|x| para << x << "\n"}
+          when /^\s*<:(insert1)>\s*$/
+            i=$1
+            if defined? ins.insert1
+              para=[]
+              ins.insert1.split(/\n\n/).each{|x| para << x }
+            else p "skin #{i} not found in #{@skin.select}"
+            end
+          when /^\s*<:(insert2)>\s*$/
+            i=$1
+            if defined? ins.insert2
+              para=[]
+              ins.insert2.split(/\n\n/).each{|x| para << x }
+            else p "skin #{i} not found in #{@skin.select}"
+            end
+          when /^\s*<:(insert3)>\s*$/
+            i=$1
+            if defined? ins.insert3
+              para=[]
+              ins.insert3.split(/\n\n/).each{|x| para << x << "\n"}
+            else p "skin #{i} not found in #{@skin.select}"
+            end
+          when /^\s*<:(insert4)>\s*$/
+            i=$1
+            if defined? ins.insert4
+              para=[]
+              ins.insert4.split(/\n\n/).each{|x| para << x << "\n"}
+            else p "skin #{i} not found in #{@skin.select}"
+            end
+          when /^\s*<:(insert5)>\s*$/
+            i=$1
+            if defined? ins.insert5
+              para=[]
+              ins.insert5.split(/\n\n/).each{|x| para << x << "\n"}
+            else p "skin #{i} not found in #{@skin.select}"
+            end
+          when /^\s*<:(insert6)>\s*$/
+            i=$1
+            if defined? ins.insert6
+              para=[]
+              ins.insert6.split(/\n\n/).each{|x| para << x << "\n"}
+            else p "skin #{i} not found in #{@skin.select}"
+            end
+          when /^\s*<:(insert7)>\s*$/
+            i=$1
+            if defined? ins.insert7
+              para=[]
+              ins.insert7.split(/\n\n/).each{|x| para << x << "\n"}
+            else p "skin #{i} not found in #{@skin.select}"
+            end
           end
           para.each{|x| data_expand << x }
         else data_expand << para
@@ -126,4 +152,3 @@ module SiSU_substitute_and_insert
   end
 end
 __END__
-
diff --git a/lib/sisu/v1/dal_syntax.rb b/lib/sisu/v1/dal_syntax.rb
index e917621a..c6bab08f 100644
--- a/lib/sisu/v1/dal_syntax.rb
+++ b/lib/sisu/v1/dal_syntax.rb
@@ -252,18 +252,12 @@ module SiSU_Syntax
         line.gsub!(/~\{(.+?)\}~/m,Mx[:en_a_o] + '\1' + Mx[:en_a_c])
         line.gsub!(/~\[([^*+].+?)\]~/m,Mx[:en_b_o] + '* \1' + Mx[:en_b_c]) #default if markup does not specify
         line.gsub!(/~\[(.+?)\]~/m,Mx[:en_b_o] + '\1' + Mx[:en_b_c])
-        if @md.subtitle and not @md.subtitle.empty?
-          if line =~/(?:by\s+)?(?:@creator|@author)/
-            line.gsub!(/^(#{Mx[:lv_o]}1:\??#{Mx[:lv_c]})\s*@title\s+(?:(by\s+)?(?:@creator|@author))\s*$/,"\\1#{@md.title} - #{@md.subtitle},<br />\\2#{@md.author}")
-          else
-            line.gsub!(/^(#{Mx[:lv_o]}1:\??#{Mx[:lv_c]})\s*@title\s*$/,"\\1 #{@md.title} - #{@md.subtitle}")
-          end
-        else
-          if line =~/(?:by\s+)?(?:@creator|@author)/
-            line.gsub!(/^(#{Mx[:lv_o]}1:\??#{Mx[:lv_c]})\s*@title\s+(?:(by\s+)?(?:@creator|@author))\s*$/,"\\1#{@md.title},<br />\\2#{@md.author}")
-          else
-            line.gsub!(/^(#{Mx[:lv_o]}1:\??#{Mx[:lv_c]})\s*@title\s*$/,"\\1 #{@md.title}")
+        if line =~/^#{Mx[:lv_o]}1:\S*?#{Mx[:lv_c]}/
+          if @md.subtitle and not @md.subtitle.empty? 
+            line.gsub!(/\s*@title\b/," #{@md.title} - #{@md.subtitle}")
+          else line.gsub!(/\s*@title\b/," #{@md.title}")
           end
+          line.gsub!(/\s+(?:@creator|@author)/,",<br />#{@md.author}")
         end
         line.gsub!(/^(1~\??) @title\s*$/,"\\1 #{@md.title} - #{@md.subtitle}")                    #
         line.gsub!(/^(#{Mx[:lv_o]}[23]:\??#{Mx[:lv_c]}) (?:(by\s+)?(?:@creator|@author))\s*$/,"\\1 \\2#{@md.author}")                    #
diff --git a/lib/sisu/v1/db_import.rb b/lib/sisu/v1/db_import.rb
index 7268616b..3ead75f6 100644
--- a/lib/sisu/v1/db_import.rb
+++ b/lib/sisu/v1/db_import.rb
@@ -1,4 +1,4 @@
-#j coding: utf-8
+# coding: utf-8
 =begin
 
  * Name: SiSU
diff --git a/lib/sisu/v1/harvest_authors.rb b/lib/sisu/v1/harvest_authors.rb
index a75c9ce8..e413b1d2 100644
--- a/lib/sisu/v1/harvest_authors.rb
+++ b/lib/sisu/v1/harvest_authors.rb
@@ -79,9 +79,10 @@ module HARVEST_authors
         file_array=[]
         File.open(filename,'r') do |file|
           file.each_line("\n\n") do |line|
-            if line =~/^@\S+?: /
+            if line =~/^@(?:title|subtitle|author|creator|date|original_publication):(?:\s|$)/m
               file_array << line
-            elsif line =~/^(?:\s*\n|%+ )/
+            elsif line =~/^@\S+?:(?:\s|$)/m \
+            or line =~/^(?:\s*\n|%+ )/
             else break
             end
           end
@@ -104,10 +105,10 @@ module HARVEST_authors
       @orig_pub,@title,@subtitle,@fulltitle,@author,@author_format=nil,nil,nil,nil,nil,nil
       @authors=[]
       rgx={}
-      rgx[:author]=/^@(?:author|creator):\s+(.+)/
+      rgx[:author]=/^@(?:author|creator):(?:[ ]+|.+?:author:[ ]+)(.+?)(?:\||\n)/m
       rgx[:title]=/^@title:\s+(.+)/
-      rgx[:subtitle]=/^@subtitle:\s+(.+)/
-      rgx[:date]=/^@date:\s+(\d{4})/
+      rgx[:subtitle]=/^(?:@subtitle:\s+|@title:.+?:subtitle:[ ]+)(.+)/m
+      rgx[:date]=/^@date:(?:[ ]+|.+?:published:[ ]+)(\d{4})/m
       rgx[:orig_pub]=/^@original_publication:\s+(.+)/
       data.each do |para|
         if para=~ rgx[:orig_pub]
@@ -127,10 +128,7 @@ module HARVEST_authors
         end
         break if @title and @subtitle and @author and @date and @orig_pub
       end
-      @fulltitle=if @subtitle
-        @title + ' - ' + @subtitle
-      else @title
-      end
+      @fulltitle=@subtitle ? (@title + ' - ' + @subtitle) : @title
       if @title and @author_format #and @orig_pub (publication details)
         creator=FORMAT::Author.new(@author_format.strip).author_details
         @authors,@authorship=creator[:authors],creator[:authorship]
@@ -144,7 +142,7 @@ module HARVEST_authors
         page="sisu_manifest#{lang}.html"
         idx_array <<= { :filename => filename, :file => file, :orig_pub => @orig_pub, :date => @date, :title => @fulltitle, :author => creator, :page => page }
       else
-        #p "missing author field: #@filename title: #@title; author: #@author_format; idx: #@orig_pub"
+        #p "missing author field: #{@filename} title: #{@title}; author: #{@author_format}; idx: #{@orig_pub}"
       end
       idx_array.flatten!
       idx_array
@@ -191,7 +189,7 @@ module HARVEST_authors
     end
     def html_file_close
       @output[:html].close
-      @output[:html_mnt].close if @output[:html_mnt].class == File
+      @output[:html_mnt].close if @output[:html_mnt].class==File
     end
     def html_print
       def html_songsheet
@@ -239,12 +237,9 @@ WOK
         a=[]
         a << '<p>'
         @alph.each do |x|
-          a << if x =~/[0-9]/; ''
-          else
-            %{<a href="##{x}">#{x}</a>,&nbsp;}
-          end
+          a << (x =~/[0-9]/) ? '' : %{<a href="##{x}">#{x}</a>,&nbsp;}
         end
-        @output[:html_mnt] << a.join if @output[:html_mnt].class == File
+        @output[:html_mnt] << a.join if @output[:html_mnt].class==File
         @output[:html] << a.join
       end
       def html_tail
@@ -261,11 +256,11 @@ WOK
 </body>
 </html>
 WOK
-        @output[:html_mnt] << a if @output[:html_mnt].class == File
+        @output[:html_mnt] << a if @output[:html_mnt].class==File
         @output[:html] << a
       end
       def do_html(html)
-        @output[:html_mnt] << html if @output[:html_mnt].class == File
+        @output[:html_mnt] << html if @output[:html_mnt].class==File
         @output[:html] << html
       end
       def do_string(attrib,string)
@@ -278,7 +273,7 @@ WOK
           while @letter < f
             if @alph.length > 0
               @letter=@alph.shift
-              if @output[:html_mnt].class == File
+              if @output[:html_mnt].class==File
                 @output[:html_mnt] << %{\n<p class="letter"><a name="#{@letter}"></p>#{@letter}</a><p class="book_index_lev1"><a name="#{@letter.downcase}"></a></p>}
               end
               @output[:html] << %{\n<p class="letter"><a name="#{@letter}">#{@letter}</a></p><p class="book_index_lev1"><a name="#{@letter.downcase}"></a></p>}
@@ -293,21 +288,21 @@ WOK
           do_string_name('',a)
           name=a[0].sub(/(.+?)(?:,.+|$)/,'\1').gsub(/\s+/,'_')
           x = %{<p class="author"><a name="#{name}">#{a[0]}</a></p>}
-          if @output[:html_mnt].class == File
+          if @output[:html_mnt].class==File
             @output[:html_mnt] << x
           end
           @output[:html] << x
           works=[]
           a[1][:md].each do |x|
             work=[ "#{x[:date]} #{x[:title]}", %{<p class="publication">#{x[:date]} <a href="../#{x[:file]}/#{x[:page]}">#{x[:title]}</a>, #{x[:author][:authors_s]}</p>} ]
-            works<<=if @output[:html_mnt].class == File
+            works<<=if @output[:html_mnt].class==File
               work.concat([%{<p class="publication">[<a href="#{x[:file]}.sst">src</a>]&nbsp;&nbsp;#{x[:date]} <a href="file://#{@env.path.output}/#{x[:file]}/#{x[:page]}">#{x[:title]}</a>, #{x[:author][:authors_s]} -- [<a href="#{x[:file]}.sst">#{x[:file]}.sst</a>]</p>}])
             else work
             end
           end
           works.sort_by {|x| x[0]}.each do |x|
             @output[:html] << x[1]
-            @output[:html_mnt] << x[2] if @output[:html_mnt].class == File
+            @output[:html_mnt] << x[2] if @output[:html_mnt].class==File
           end
         end
       end
diff --git a/lib/sisu/v1/harvest_topics.rb b/lib/sisu/v1/harvest_topics.rb
index 1ab62a95..f1274b40 100644
--- a/lib/sisu/v1/harvest_topics.rb
+++ b/lib/sisu/v1/harvest_topics.rb
@@ -79,10 +79,10 @@ module HARVEST_topics
         file_array=[]
         File.open(filename,'r') do |file|
           file.each_line("\n\n") do |line|
-            if line =~/^@\S+?: /
-              #line=line.gsub(/\n/,' ')
+            if line =~/^@(?:title|subtitle|author|creator|classify|topic_register|date):(?:\s|$)/m
               file_array << line
-            elsif line =~/^(?:\s*\n|%+ )/
+            elsif line =~/^@\S+?:(?:\s|$)/m \
+            or line =~/^(?:\s*\n|%+ )/
             else break
             end
           end
@@ -105,10 +105,10 @@ module HARVEST_topics
       data,filename,idx_array=@data,@filename,@idx_array
       @idx_lst,@title,@subtitle,@fulltitle,@author,@author_format=nil,nil,nil,nil,nil,nil
       rgx={}
-      rgx[:author]=/^@(?:author|creator):\s+(.+)/
+      rgx[:author]=/^@(?:author|creator):(?:[ ]+|.+?:author:[ ]+)(.+?)(?:\||\n)/m
       rgx[:title]=/^@title:\s+(.+)/
-      rgx[:subtitle]=/^@subtitle:\s+(.+)/
-      rgx[:idx]=/^@topic_register:\s+(.+)/
+      rgx[:subtitle]=/^(?:@subtitle:\s+|@title:.+?:subtitle:[ ]+)(.+)/m
+      rgx[:idx]=/^(?:@topic_register:[ ]+|@classify:.+?:topic_register:[ ]+)(.+?)\n/m
       data.each do |para|
         if para=~ rgx[:idx]
           @idx_list=rgx[:idx].match(para)[1]
@@ -124,10 +124,7 @@ module HARVEST_topics
         end
         break if @title and @subtitle and @author and @idx_lst
       end
-      @fulltitle=if @subtitle
-        @title + ' - ' + @subtitle
-      else @title
-      end
+      @fulltitle=@subtitle ? (@title + ' - ' + @subtitle) : @title
       if @title and @author_format and @idx_list
         creator=FORMAT::Author.new(@author_format.strip).author_details
         @authors,@authorship=creator[:authors],creator[:authorship]
@@ -196,7 +193,7 @@ module HARVEST_topics
                 if @@the_idx_topics[lv0].class==NilClass
                   @@the_idx_topics[lv0]={:md => []}
                 end
-                @lv0=lv0 if lev0.length == 1
+                @lv0=lv0 if lev0.length==1
                 j=@@the_idx_topics[lv0][:md]
                 contents(j,idx) if idx_lst_alt.length - 1 == t
               end
@@ -207,7 +204,7 @@ module HARVEST_topics
                 if @@the_idx_topics[@lv0][lv1].class==NilClass
                   @@the_idx_topics[@lv0][lv1]={:md => []}
                 end
-                @lv1=lv1 if lev1.length == 1
+                @lv1=lv1 if lev1.length==1
                 j=@@the_idx_topics[@lv0][lv1][:md]
                 contents(j,idx) if idx_lst_alt.length - 1 == t
               end
@@ -218,7 +215,7 @@ module HARVEST_topics
                 if @@the_idx_topics[@lv0][@lv1][lv2].class==NilClass
                   @@the_idx_topics[@lv0][@lv1][lv2]={:md => []}
                 end
-                @lv2=lv2 if lev2.length == 1
+                @lv2=lv2 if lev2.length==1
                 j=@@the_idx_topics[@lv0][@lv1][lv2][:md]
                 contents(j,idx) if idx_lst_alt.length - 1 == t
               end
@@ -229,7 +226,7 @@ module HARVEST_topics
                 if @@the_idx_topics[@lv0][@lv1][@lv2][lv3].class==NilClass
                   @@the_idx_topics[@lv0][@lv1][@lv2][lv3]={:md => []}
                 end
-                @lv3=lv3 if lev3.length == 1
+                @lv3=lv3 if lev3.length==1
                 j=@@the_idx_topics[@lv0][@lv1][@lv2][lv3][:md]
                 contents(j,idx) if idx_lst_alt.length - 1 == t
               end
@@ -240,7 +237,7 @@ module HARVEST_topics
                 if @@the_idx_topics[@lv0][@lv1][@lv2][@lv3][lv4].class==NilClass
                   @@the_idx_topics[@lv0][@lv1][@lv2][@lv3][lv4]={:md => []}
                 end
-                @lv4=lv4 if lev4.length == 1
+                @lv4=lv4 if lev4.length==1
                 j=@@the_idx_topics[@lv0][@lv1][@lv2][@lv3][lv4][:md]
                 contents(j,idx) if idx_lst_alt.length - 1 == t
               end
@@ -269,7 +266,7 @@ module HARVEST_topics
     end
     def html_file_close
       @output[:html].close
-      @output[:html_mnt].close if @output[:html_mnt].class == File
+      @output[:html_mnt].close if @output[:html_mnt].class==File
     end
     def html_print
       def html_songsheet
@@ -339,19 +336,19 @@ WOK
 </body>
 </html>
 WOK
-        @output[:html_mnt] << a if @output[:html_mnt].class == File
+        @output[:html_mnt] << a if @output[:html_mnt].class==File
         @output[:html] << a
       end
       def do_html(html)
         @output[:html] << html
       end
       def do_html_maintenance(html)
-        @output[:html_mnt] << html if @output[:html_mnt].class == File
+        @output[:html_mnt] << html if @output[:html_mnt].class==File
       end
       def do_string(attrib,string)
         html=%{<p class="#{attrib}">#{string}</p>}
         do_html(html)
-        do_html_maintenance(html) if @output[:html_mnt].class == File
+        do_html_maintenance(html) if @output[:html_mnt].class==File
       end
       def do_string_default(attrib,string)
         html=%{<p class="#{attrib}">#{string}</p>}
@@ -359,7 +356,7 @@ WOK
       end
       def do_string_maintenance(attrib,string)
         html=%{<p class="#{attrib}">#{string}</p>}
-        do_html_maintenance(html) if @output[:html_mnt].class == File
+        do_html_maintenance(html) if @output[:html_mnt].class==File
       end
       def do_string_name(attrib,string)
         f=/^(\S)/.match(string)[1]
@@ -367,7 +364,7 @@ WOK
           while @letter < f
             if @alph.length > 0
               @letter=@alph.shift
-              if @output[:html_mnt].class == File
+              if @output[:html_mnt].class==File
                 @output[:html_mnt] << %{\n<p class="letter"><a name="#{@letter}">#{@letter}</a></p><p class="book_index_lev1"><a name="#{@letter.downcase}"></a></p>}
               end
               @output[:html] << %{\n<p class="letter"><a name="#{@letter}">#{@letter}</a></p><p class="book_index_lev1"><a name="#{@letter.downcase}"></a></p>}
@@ -378,7 +375,7 @@ WOK
         name=string.strip.gsub(/\s+/,'_')
         html=%{<p class="#{attrib}"><a name="#{name}">#{string}</a></p>}
         do_html(html)
-        do_html_maintenance(html) if @output[:html_mnt].class == File
+        do_html_maintenance(html) if @output[:html_mnt].class==File
       end
       def do_array(lv,array)
         lv+=1
@@ -391,7 +388,7 @@ WOK
         do_string_default(attrib,html)
       end
       def do_hash_md_maintenance(attrib,hash)
-        if @output[:html_mnt].class == File #should not be run for presentation output
+        if @output[:html_mnt].class==File #should not be run for presentation output
           html=%{[<a href="#{hash[:file]}.sst">src</a>]&nbsp;&nbsp;<a href="file://#{@env.path.output}/#{hash[:file]}/#{hash[:page]}">#{hash[:title]}</a> - #{hash[:author]}}
           do_string_maintenance(attrib,html)
         end
@@ -412,10 +409,7 @@ WOK
         if key.length > 0
           key.sort.each do |m|
             attrib="lev#{lv}"
-            if lv == 0
-              do_string_name(attrib,m)
-            else do_string(attrib,m)
-            end
+            lv==0 ? do_string_name(attrib,m) : do_string(attrib,m)
             do_case(lv,hash[m])
           end
         end
@@ -423,16 +417,12 @@ WOK
       def do_case(lv,a)
         y = a.class
         case
-        when y == String
+        when y==String
           attrib="lev#{lv}"
-          if lv == 0
-            do_string_name(attrib,a)
-          else do_string(attrib,a)
-          end
-          #do_string_name(attrib,a)
-        when y == Array
+          lv==0 ? do_string_name(attrib,a) : do_string(attrib,a)
+        when y==Array
           do_array(lv,a)
-        when y == Hash
+        when y==Hash
           do_hash(lv,a)
         end
       end
@@ -482,11 +472,11 @@ WOK
         s=' '*4
         y = a.class
         case
-        when y == String
+        when y==String
           do_string(lv,a)
-        when y == Array
+        when y==Array
           do_array(lv,a)
-        when y == Hash
+        when y==Hash
           do_hash(lv,a)
         end
       end
@@ -533,11 +523,11 @@ WOK
         s=' '*4
         y = a.class
         case
-        when y == String
+        when y==String
           do_string(lv,a)
-        when y == Array
+        when y==Array
           do_array(lv,a)
-        when y == Hash
+        when y==Hash
           do_hash(lv,a)
         end
       end
diff --git a/lib/sisu/v1/help.rb b/lib/sisu/v1/help.rb
index cd5eaf25..101f673b 100644
--- a/lib/sisu/v1/help.rb
+++ b/lib/sisu/v1/help.rb
@@ -269,11 +269,11 @@ WOK
 
  #{@cX.ruby}-M#{@cX.off} #{@cX.green}[filename/wildcard/url]#{@cX.off} maintenance mode, files created for processing are not deleted, and their locations are indicated (also see -V)
 
- #{@cX.ruby}-m#{@cX.off} #{@cX.green}[filename/wildcard/url]#{@cX.off} create (new)metaVerse (used in all subsequent processing). Produce a meta file, the first step in processing, and the file all subsequent processing utilize. (Should usually be run together with other commands to ensure that the lated version of markup source document is used, i.e. add -m flag to other flags required).
+ #{@cX.ruby}-m#{@cX.off} #{@cX.green}[filename/wildcard/url]#{@cX.off} assumed for most other flags, creates new intermediate files for processing (document abstraction) that is used in all subsequent processing of other output. This step is assumed for most processing flags. To skip it see -n
 
  #{@cX.ruby}-N#{@cX.off} #{@cX.green}[filename/wildcard/url]#{@cX.off} document content certificate as md5 digest tree of document produced (as digest.txt), the digest for the document, and digests for each object contained within the document (together with information on software versions that produced it). Try -mNV for verbose digest output to screen
 
- #{@cX.ruby}-n#{@cX.off} #{@cX.green}[filename/wildcard/url]#{@cX.off} skip meta-markup (building of "metaverse"), this skips the equivalent of -m
+ #{@cX.ruby}-n#{@cX.off} #{@cX.green}[filename/wildcard/url]#{@cX.off} skip the creation of intermediate processing files (document abstraction) if they already exist, this skips the equivalent of -m which is otherwise assumed by most processing flags.  
 
  #{@cX.ruby}-p#{@cX.off} #{@cX.green}[filename/wildcard]#{@cX.off} produces LaTeX pdf (portrait & landscape). Default paper size is set in config file, or document header, or provided with additional command line parameter, e.g. --papersize='a4' preset sizes include: 'A4', U.S. 'letter' and 'legal' and book sizes 'A5' and 'B5' (system defaults to A4).
 
diff --git a/lib/sisu/v1/manpage.rb b/lib/sisu/v1/manpage.rb
index 7129e45a..d3886fc2 100644
--- a/lib/sisu/v1/manpage.rb
+++ b/lib/sisu/v1/manpage.rb
@@ -270,6 +270,9 @@ WOK
           para.gsub!(/#{Mx[:gl_bullet]}\s*/,'* ')                                          # bullet markup, marked down
           para.gsub!(/#{Mx[:fa_superscript_o]}(.+?)#{Mx[:fa_superscript_c]}/,'^\1^')
           para.gsub!(/#{Mx[:fa_subscript_o]}(.+?)#{Mx[:fa_subscript_c]}/,'[\1]')
+          para.gsub!(/#{Mx[:fa_insert_o]}(.+?)#{Mx[:fa_insert_c]}/,'++\1++')
+          para.gsub!(/#{Mx[:fa_strike_o]}(.+?)#{Mx[:fa_strike_c]}/,'--\1--')
+          para.gsub!(/#{Mx[:fa_cite_o]}(.+?)#{Mx[:fa_cite_c]}/,'"\1"')
           para.gsub!(/\A\s*#{Mx[:fa_italics_o]}(.+?)#{Mx[:fa_italics_c]}#{Mx[:br_line]}/m,"#{Mx[:br_line]}.I \\1#{Mx[:br_line]}")
           para.gsub!(/\s*#{Mx[:fa_italics_o]}(.+?)#{Mx[:fa_italics_c]}/m,"#{Mx[:br_line]}.I \\1#{Mx[:br_line]}")
           para.gsub!(/\A\s*#{Mx[:fa_bold_o]}(.+?)#{Mx[:fa_bold_c]}#{Mx[:br_line]}/m,"#{Mx[:br_line]}.BI \\1#{Mx[:br_line]}")
@@ -330,7 +333,7 @@ WOK
           para.gsub!(/<a href=".+?">(.+?)<\/a>/m,'\1')
           para.gsub!(/#{Mx[:mk_o]}name#\S+?#{Mx[:mk_c]}/,'')                                     # remove name links
           para.gsub!(/&nbsp;|#{Mx[:nbsp]}/,' ')                                          # decide on
-          para.gsub!(/(["''])/,"\\\\\\1")                                   # quotation marks need escape
+          #para.gsub!(/(["''])/,"\\\\\\1")                                   #check note claims that quotation marks need escape, however that appears to result in error
           para.gsub!(/(?:^|[^_\\])#{Mx[:lnk_o]}\s*(\S+?\.(?:png|jpg|gif)) .+?#{Mx[:lnk_c]}(?:(?:https?|file|ftp):\/\/\S+|image)/,'    [ \1 ]') #"[ #{dir.url.images_local}\/\\1 ]")
           para.gsub!(/^(?:^|[^_\\])#{Mx[:lnk_o]}\s*\S+?\.(?:png|jpg|gif)\s+.+?"(.*?)"\s*#{Mx[:lnk_c]}\S+/,'[image: "\1"]')
           wordlist=para.scan(/\S+/)
diff --git a/lib/sisu/v1/param.rb b/lib/sisu/v1/param.rb
index 4efdebb5..72593207 100644
--- a/lib/sisu/v1/param.rb
+++ b/lib/sisu/v1/param.rb
@@ -82,7 +82,7 @@ module SiSU_Param
       @fns=opt.fns.gsub(/\.ssm$/,'.ssm.sst') #revisit CHECK
       Instantiate.new.param_instantiate
       @env=SiSU_Env::Info_env.new(@fns)
-      @pstorefile="#{@env.path.dal}/#@fns.pstore"
+      @pstorefile="#{@env.path.dal}/#{@fns}.pstore"
     end
     def get
       unless @@fns==@fns
@@ -233,13 +233,13 @@ module SiSU_Param
         @flag_auto_heading_num=false
         if @fns =~ /(?:-|ssm\.)?sst$/ #watch
           @env_out_root=@env.path.output
-          @dir_out="#{@env.path.output}/#@fnb"
+          @dir_out="#{@env.path.output}/#{@fnb}"
           @dir_tex=@env.path.tex
           @dir_lout=@env.path.lout
           @@publisher='SiSU http://www.jus.uio.no/sisu'
         end
         @txt_path=@txt_path ||= @env.path.output
-        @stmp=%{#@fns}[/^(.+?)\..*/m,1]
+        @stmp=%{#{@fns}}[/^(.+?)\..*/m,1]
         @fnstex=@fns.gsub(/_/,'\_')
         @flag_separate_endnotes=false
         @flag_separate_endnotes_make=true
@@ -260,10 +260,10 @@ module SiSU_Param
             else ''
             end
             s_a,s_b,s_c=@sisu_version[:version].match(/^([0-9]+)?(?:\.([0-9]+))?(?:\.([0-9]+))?(?:\-\S+)?$/)[1..3]
-            tell=if @markup_version_declared.to_f == @markup_version.to_f
-              SiSU_Screen::Ansi.new(@cmd,"Markup version (#@markup_version)",sv)
+            tell=if @markup_version_declared.to_f==@markup_version.to_f
+              SiSU_Screen::Ansi.new(@cmd,"Markup version (#{@markup_version})",sv)
             else
-              SiSU_Screen::Ansi.new(@cmd,"Markup version declared (#@markup_version_declared), determined (#@markup_version)",sv)
+              SiSU_Screen::Ansi.new(@cmd,"Markup version declared (#{@markup_version_declared}), determined (#{@markup_version})",sv)
             end
             ok=if s_a.to_i > sm_a.to_i
               true
@@ -279,7 +279,7 @@ module SiSU_Param
             if ok
               tell.txt_green if @cmd =~/[vVM]/
             else
-              tell=SiSU_Screen::Ansi.new(@cmd,"Warning: markup version determined (#@markup_version) or markup version declared (#@markup_version_declared) is newer than SiSU version (#{@sisu_version[:version]})")
+              tell=SiSU_Screen::Ansi.new(@cmd,"Warning: markup version determined (#{@markup_version}) or markup version declared (#{@markup_version_declared}) is newer than SiSU version (#{@sisu_version[:version]})")
               tell.warn unless @cmd =~/q/
             end
           else
@@ -294,19 +294,19 @@ module SiSU_Param
         fns_array.each do |para|                                                                                       #% Scan document
           if para !~/^%+\s/ \
           and para =~/<![abcdeghijklmnopqrstuvwxyz]/i # <!f not included
-            raise "Old markup style in file #@fns, current version #{@sisu_version[:project]} #{@sisu_version[:version]} #{@sisu_version[:date_stamp]} #{@sisu_version[:date]}:\n\t\t#{para}\n\n"
+            raise "Old markup style in file #{@fns}, current version #{@sisu_version[:project]} #{@sisu_version[:version]} #{@sisu_version[:date_stamp]} #{@sisu_version[:date]}:\n\t\t#{para}\n\n"
           end
           @code_flag=case para
           when /^code\{\s*$/; true
           when /^\}code\s*$/; false
           else @code_flag
           end
-          regx_header=/^(?:@\S+?:[+-]?\s|0~\S+)/
+          regx_header=/^@\S+?:[+-]?\s/
           if para =~regx_header \
           and not @code_flag #or para=~/^(?:1|:?A)~/
             case para
-            when /^(?:@ocn:|0~ocn)\s+(.+?)$/m; @ocn=$1                                                                 #% processing
-            when /^(?:@title:|0~title)\s+(.+?)$/m                                                                      #% metainfo DC
+            when /^@ocn:\s+(.+?)$/m; @ocn=$1                                                                 #% processing
+            when /^@title:\s+(.+?)$/m                                                                      #% metainfo DC
               @title=$1.strip
               @full_title=@title.dup
               @html_title=@title.gsub(/(<p>|<p \/>|<br>|<br \/>)/,'')
@@ -315,41 +315,46 @@ module SiSU_Param
               @html_title.chomp!(' ')
               tell=SiSU_Screen::Ansi.new(@cmd,'Parameters',@html_title)
               tell.txt_grey unless @cmd =~/q/
-            when /^(?:@subtitle:|0~subtitle)\s+(.+?)$/m                                                                #% metainfo
+            when /^@subtitle:\s+(.+?)$/m                                                                #% metainfo
               @subtitle=$1.strip
               @full_title="#{@title} - #{@subtitle}"
               @subtitle_tex=@subtitle
-            when /^(?:@(?:creator|author)-?:|0~(?:creator|author)-?)\s+(.+?)$/                                         #% metainfo DC
+            when /^@creator:(?:[ ]+|.+?:author:[ ]+)(.+?)(?:[|]|$)/m    #when /^@(?:creator|author):(?:[ ]+|.+?:author:[ ]+)(.+?)(?:[|]|$)/m
+              names=name_format($1)
+              @authorship=@author=names[:name_str]
+              @authors=names[:name_a_h]
+            when /^@author:\s+(.+?)$/
               names=name_format($1)
               @authorship=@author=names[:name_str]
               @authors=names[:name_a_h]
             when /^@(?:creator|author)\.title:\s+(.+?)$/; @author_title=$1                                             # Prof. Dr. etc.
             when /^@(?:creator|author)\.nationality:\s+(.+?)$/; @author_nationality=$1
-            when /^(?:@(?:translator|translated_by):|0~(?:translator|translated_by))\s+(.+?)$/m                        #% metainfo
+            when /^@(?:translator|translated_by):\s+(.+?)$/m                        #% metainfo
               names=name_format($1)
               @translator=names[:name_str]
-            when /^(?:@(?:illustrator|illustrated_by):|0~(?:illustrator|illustrated_by))\s+(.+?)$/m                    #% metainfo
+            when /^@(?:illustrator|illustrated_by):\s+(.+?)$/m                    #% metainfo
               names=name_format($1)
               @illustrator=names[:name_str]
-            when /^(?:@prepared_by:|0~prepared_by)\s+(.+?)$/m                                                          #% metainfo
+            when /^@prepared_by:\s+(.+?)$/m                                                          #% metainfo
               names=name_format($1)
               @prepared_by=names[:name_str]
-            when /^(?:@digitized_by:|0~digitized_by)\s+(.+?)$/m                                                        #% metainfo DC
+            when /^@digitized_by:\s+(.+?)$/m                                                        #% metainfo DC
               names=name_format($1)
               @digitized_by=names[:name_str]
-            when /^(?:@subject:|0~subject)\s+(.+?)$/m; @subject=$1                                                     #% metainfo DC
-            when /^(?:@description:|0~description)\s+(.+?)$/m; @description=$1                                         #% metainfo DC & rss feed
-            when /^(?:@contributor:|0~contributor)\s+(.+?)$/m                                                          #% metainfo DC
+            when /^@subject:\s+(.+?)$/m; @subject=$1                                                     #% metainfo DC
+            when /^@description:\s+(.+?)$/m; @description=$1                                         #% metainfo DC & rss feed
+            when /^@contributor:\s+(.+?)$/m                                                          #% metainfo DC
               names=name_format($1)
               @contributor=names[:name_str]
-            when /^(?:@publisher:|0~publisher)\s+(.+?)$/m; @publisher=$1                                               #% metainfo DC
+            when /^@publisher:\s+(.+?)$/m; @publisher=$1                                               #% metainfo DC
             when /^@original_publication:\s+(.+?)$/m; @original_publication=$1
             when /^@original_publication\.date:\s+(.+?)$/; @original_publication_date=$1
             when /^@original_publication\.nationality:\s+(.+?)$/; @original_publication_nationality=$1
             when /^@original_publication\.institution:\s+(.+?)$/; @original_publication_institution=$1
             when /^@writing_focus\.nationality:\s+(.+?)$/; @writing_focus=$1                                           # e.g. Finland (where and article on Finnish law)
-            when /^(?:@|0~)date.+?$/m                                                                                  #% metainfo DC
-              if para =~/(?:@date:|0~date)\s+(.+?)$/m
+            when /^@date:(?:[ ]+|.+?:published:[ ]+)(\d{4})/m                                                   #% metainfo DC
+            #when /^@date.+?$/m                                                                                  #% metainfo DC
+              if para =~/@date:\s+(.+?)$/m
                 @date=$1.strip                                                                                         #% original publication date unless the substantive text is updated/modified, then date of update
                 if @date !~regx_date \
                 and not @date.empty?
@@ -358,7 +363,7 @@ module SiSU_Param
                 end
                 @date_scheme='scheme="ISO-8601"' if @date =~/\d{4}-\d{2}-\d{2}/
               end
-              if para =~/(?:@date\.added_to_site:|0~date\.added_to_site)\s+(.+?)$/m
+              if para =~/@date\.added_to_site:\s+(.+?)$/m
                 @date_added_to_site=$1.strip
                 if @date_added_to_site !~regx_date \
                 and not @date_added_to_site.empty?
@@ -367,7 +372,7 @@ module SiSU_Param
                 end
                 @date_scheme='scheme="ISO-8601"' if @date_added_to_site =~/\d{4}-\d{2}-\d{2}/
               end
-              if para =~/(?:@date\.created:|0~date\.created)\s*(.+?)$/m
+              if para =~/@date\.created:\s*(.+?)$/m
                 date=$1.strip
                 if date !~regx_date \
                 and not date.empty?
@@ -377,7 +382,7 @@ module SiSU_Param
                 @date_created=date
                 @date_created_scheme='scheme="ISO-8601"' if date =~/\d{4}-\d{2}-\d{2}/
               end
-              if para =~/(?:@date\.issued:|0~date\.issued)\s*(.+?)$/m
+              if para =~/@date\.issued:\s*(.+?)$/m
                 date=$1.strip
                 if date !~regx_date \
                 and not date.empty?
@@ -387,7 +392,7 @@ module SiSU_Param
                 @date_issued=date
                 @date_issued_scheme='scheme="ISO-8601"' if date =~/\d{4}-\d{2}-\d{2}/
               end
-              if para =~/(?:@date\.available:|0~date\.available)\s*(.+?)$/m
+              if para =~/@date\.available:\s*(.+?)$/m
                 date=$1.strip
                 if date !~regx_date \
                 and not date.empty?
@@ -397,7 +402,7 @@ module SiSU_Param
                 @date_available=date
                 @date_available_scheme='scheme="ISO-8601"' if date =~/\d{4}-\d{2}-\d{2}/
               end
-              if para =~/^(?:@date\.valid:|0~date\.valid)\s*(.+?)$/m
+              if para =~/^@date\.valid:\s*(.+?)$/m
                 date=$1.strip
                 if date !~regx_date \
                 and not date.empty?
@@ -407,7 +412,7 @@ module SiSU_Param
                 @date_valid=date
                 @date_valid_scheme='scheme="ISO-8601"' if date =~/\d{4}-\d{2}-\d{2}/
               end
-              if para =~/^(?:@date\.modified:|0~date\.modified)\s*(.+?)$/m                                             #% of interest rss feed & sitemap
+              if para =~/^@date\.modified:\s*(.+?)$/m                                             #% of interest rss feed & sitemap
                 date=$1.strip
                 if date !~regx_date \
                 and not date.empty?
@@ -417,7 +422,7 @@ module SiSU_Param
                 @date_modified=date
                 @date_modified_scheme='scheme="ISO-8601"' if date =~/\d{4}-\d{2}-\d{2}/
               end
-              if para =~/^(?:@date\.translated:|0~date\.translated)\s*(.+?)$/m
+              if para =~/^@date\.translated:\s*(.+?)$/m
                 date=$1.strip
                 if date !~regx_date \
                 and not date.empty?
@@ -427,33 +432,33 @@ module SiSU_Param
                 @date_translated=date
                 @date_translated_scheme='scheme="ISO-8601"' if date =~/\d{4}-\d{2}-\d{2}/
               end
-            when /^(?:@type:|0~type)\s+(.+?)$/m; @type=$1                                                              #% metainfo DC
-            when /^(?:@format:|0~format)\s+(.+?)$/m; @format=$1                                                        #% metainfo DC
-            #when /^(?:@identifier:|0~identifier)\s+(.+?)$/m; @identifier=$1                                           #% metainfo DC
-            when /^(?:@source:|0~source)\s+(.+?)$/m; @source=$1                                                        #% metainfo DC
-            when /^(?:@language(?:\.document)?:|0~language(?:\.document)?)\s+(.+?)$/m                                  #% metainfo DC
+            when /^@type:\s+(.+?)$/m; @type=$1                                                              #% metainfo DC
+            when /^@format:\s+(.+?)$/m; @format=$1                                                        #% metainfo DC
+            #when /^@identifier:\s+(.+?)$/m; @identifier=$1                                           #% metainfo DC
+            when /^@source:\s+(.+?)$/m; @source=$1                                                        #% metainfo DC
+            when /^@language(?:\.document)?:\s+(.+?)$/m                                  #% metainfo DC
               x=$1.strip
               lang=SiSU_Env::Standardise_language.new(x.dup)
               @language[:code]=lang.code
               @language[:name]=lang.title
-            when /^(?:@language\.original:|0~language\.original)\s+(.+?)$/m                                            #% metainfo DC
+            when /^@language\.original:\s+(.+?)$/m                                            #% metainfo DC
               x=$1.strip
               lang=SiSU_Env::Standardise_language.new(x.dup)
               @language_original[:name]=lang.title
-            when /^(?:@relation:|0~relation)\s+(.+?)$/m; @relation=$1                                                  #% metainfo DC
-            when /^(?:@coverage:|0~coverage)\s+(.+?)$/m; @coverage=$1                                                  #% metainfo DC
-            when /^(?:@rights:|0~rights)\s+(.+?)$/m; @rights=$1.gsub(/<(?:\/\s*)?br(?:\s*\/)?>/,Mx[:br_line])          #% metainfo DC copyright, public domain, copyleft, creative commons, etc.
-            when /^(?:@papersize:|0~papersize)\s+(.+?)$/m                                                              #% metainfo DC
+            when /^@relation:\s+(.+?)$/m; @relation=$1                                                  #% metainfo DC
+            when /^@coverage:\s+(.+?)$/m; @coverage=$1                                                  #% metainfo DC
+            when /^@rights:\s+(.+?)$/m; @rights=$1.gsub(/<(?:\/\s*)?br(?:\s*\/)?>/,Mx[:br_line])          #% metainfo DC copyright, public domain, copyleft, creative commons, etc.
+            when /^@papersize:\s+(.+?)$/m                                                              #% metainfo DC
               l=$1
               if @mod.inspect !~/--papersize[=-]\S+/
                 l=determine_papersize(l.dup)
                 @papersize=l
               end
-            when /^(?:@keywords?:|0~keywords?)\s+(.+?)$/m; @keywords=$1                                                #% metainfo DC
-            when /^(?:@comments?:|0~comments?)\s+(.+?)$/m; @comments=$1.gsub(/<(?:\/\s*)?br(?:\s*\/)?>/,Mx[:br_line])  #% metainfo DC
-            when /^(?:@abstract:|0~abstract)\s+(.+?)$/m; @abstract=$1.gsub(/<(?:\/\s*)?br(?:\s*\/)?>/,Mx[:br_line])    #% metainfo DC
-            when /^(?:@tags?:|0~tags?)\s+\S/m                                                                          #% metainfo
-              tags=para.match(/^(?:@tags?:|0~tags?)\s+(.+)\Z/m)[1]
+            when /^@keywords?:\s+(.+?)$/m; @keywords=$1                                                #% metainfo DC
+            when /^@comments?:\s+(.+?)$/m; @comments=$1.gsub(/<(?:\/\s*)?br(?:\s*\/)?>/,Mx[:br_line])  #% metainfo DC
+            when /^@abstract:\s+(.+?)$/m; @abstract=$1.gsub(/<(?:\/\s*)?br(?:\s*\/)?>/,Mx[:br_line])    #% metainfo DC
+            when /^@tags?:\s+\S/m                                                                          #% metainfo
+              tags=para.match(/^@tags?:\s+(.+)\Z/m)[1]
               tags.split(/,|$/).each do |tag|
                 tag.strip!
                 @tags << tag
@@ -462,18 +467,50 @@ module SiSU_Param
                 tag_a=tag_a.split(/:/).join('][')
                 @tag_a << tag_a
               end
-            when /^(?:@catalogue:|0~catalogue)\s+(.+)?$/m                                                              #% metainfo
+            when /^@catalogue:\s+(.+)?$/m                                                              #% metainfo
               m=$1
               @cls_pg=m.match(/pg=(\S+)/)[1] if m =~/pg=/
               @cls_isbn=m.match(/isbn=(\S+)/)[1] if m =~/isbn=/
               @cls_dewey=m.match(/dewey=(\S+)/)[1] if m =~/dewey=/
               @cls_loc=m.match(/loc=(\S+)/)[1] if m =~/loc=/
-            when /^(?:@class(?:ify)?_loc:|0~class(?:ify)?_loc)\s+(.+?)$/m; @cls_loc=$1                                 #% metainfo
-            when /^(?:@class(?:ify)?_dewey:|0~class(?:ify)?_dewey)\s+(.+?)$/m; @cls_dewey=$1                           #% metainfo
-            when /^(?:@class(?:ify)?_pg:|0~class(?:ify)?_pg)\s+(.+?)$/m; @cls_pg=$1                                    #% metainfo
-            when /^(?:@(?:class(?:ify)?_)?isbn:|0~(?:class(?:ify)?_)?isbn)\s+(\S+?)$/m; @cls_isbn=$1                   #% metainfo
-            when /^(?:@images?:|0~images?)\s+(.+?)$/m; @image=$1                                                       #% processing
-            when /^(?:@(?:toc|structure):|0~(?:toc|structure))\s+(.+?)\Z/m                                             #% processing
+            when /^@class(?:ify)?_loc:\s+(.+?)$/m; @cls_loc=$1                                 #% metainfo
+            when /^@class(?:ify)?_dewey:\s+(.+?)$/m; @cls_dewey=$1                           #% metainfo
+            when /^@class(?:ify)?_pg:\s+(.+?)$/m; @cls_pg=$1                                    #% metainfo
+            when /^@(?:class(?:ify)?_)?isbn:\s+(\S+?)$/m; @cls_isbn=$1                   #% metainfo
+            when /^@images?:\s+(.+?)$/m; @image=$1                                                       #% processing
+
+            when /^@make:/m                                                                     #% metainfo DC
+
+              if para=~ /^@make:.+?:breaks:[ ]+(.+?)\n/m
+                #p $1 #FIX
+                #@pagenew=
+                #@pagebreak=
+              end
+              if para=~ /^@make:.+?:headings:[ ]+(.+?)\n/m
+                s=$1
+                lv=[]
+                s=(s =~/;/) ? (s.split(/;\s*/)) : [ s ]
+                @toc=s
+                lv1=s[0] ||='1~ '
+                @lv1=/^#{lv1}/
+                lv2=s[1] ||='2~ '
+                @lv2=/^#{lv2}/
+                lv3=s[2] ||='3~ '
+                @lv3=/^#{lv3}/
+                lv4=s[3] ||='4~ '
+                @lv4=/^#{lv4}/
+                lv5=s[4] ||='5~ '
+                @lv5=/^#{lv5}/
+                lv6=s[5] ||='6~ '
+                @lv6=/^#{lv6}/
+              end
+              if para=~ /^@make:.+?:num_top:[ ]+(.+?)\n/m
+                @num_top=$1
+              end
+              if para=~ /^@make:.+?:skin:[ ]+(.+?)\n/m
+                @doc_skin=$1
+              end
+            when /^@(?:toc|structure):\s+(.+?)\Z/m                                             #% processing
               doc_toc_str=$1
               @toc=doc_toc_str.split(/;\s*/)
               @toc=[ @toc ] if @toc == String
@@ -490,8 +527,8 @@ module SiSU_Param
               @lv5=/^#{lv5}/
               lv6=@toc[5] ||='6~ '
               @lv6=/^#{lv6}/
-            when /^(?:@(?:level|page|markup):|0~(?:level|page|markup))\s+(.+?)$/m                                      #% processing revisit..., use syntax 0~level new=1,2,3; break=4
-              if para =~/(?:@|0~)(?:markup|level|page):?\s+(.+?)\Z/m
+            when /^@(?:level|page|markup):\s+(.+?)$/m                                      #% processing revisit..., use syntax 0~level new=1,2,3; break=4
+              if para =~/@(?:markup|level|page):?\s+(.+?)\Z/m
                 page_break_str=$1
                 pagebreaks=page_break_str.split(/;\s*/)
                 #pagebreaks=[ pagebreaks ] if pagebreaks == String
@@ -508,11 +545,11 @@ module SiSU_Param
                 @toc_lev_limit=toc_lev_limit if toc_lev_limit
                 @flag_auto_heading_num=true if para =~/num_top/
               end
-              if para =~/^(?:@markup:|0~markup)\s+(.+?)$/m                                                             #%use of markup depreciated for num_top
+              if para =~/^@markup:\s+(.+?)$/m                                                             #%use of markup depreciated for num_top
                 @markup=$1
                 @flag_auto_heading_num=true if para =~/num_top/
               end
-            when /^(?:@bold:|0~bold)\s+(.+?)$/m                                                                        #% processing
+            when /^@bold:\s+(.+?)$/m                                                                        #% processing
               m=$1.strip
               x=case m
               when /\/i$/; 'i'
@@ -526,7 +563,7 @@ module SiSU_Param
               else                          /#{rgx}/
               end
               @make_bold
-            when /^(?:@(?:italics?|itali[sz]e):|0~(?:italics?|itali[sz]e))\s+(.+?)$/m                                  #% processing Dublin Core - dublin core within
+            when /^@(?:italics?|itali[sz]e):\s+(.+?)$/m                                  #% processing Dublin Core - dublin core within
               m=$1.strip
               x=case m
               when /\/i$/; 'i'
@@ -540,11 +577,11 @@ module SiSU_Param
               else                            /#{rgx}/
               end
               @make_italic
-            when /^(?:@(?:vocabulary|wordlist):|0~(?:vocabulary|wordlist))\s+(.+?)$/m                                  #% processing
+            when /^@(?:vocabulary|wordlist):\s+(.+?)$/m                                  #% processing
                 @vocabulary=$1                                                                                         #not actually used by concordance
-            when /^(?:@skin:|0~skin)\s+(.+?)$/; @doc_skin=$1.strip                                                     #% processing
-            when /^(?:@(?:css|stylesheet):|0~(?:css|stylesheet))\s+(.+?)$/; @doc_css=$1.strip                          #% processing
-            when /^(?:@links:|0~links)\s+(.+?)\Z/m                                                                     #% processing
+            when /^@skin:\s+(.+?)$/; @doc_skin=$1.strip                                                     #% processing
+            when /^@(?:css|stylesheet):\s+(.+?)$/; @doc_css=$1.strip                          #% processing
+            when /^@links:\s+(.+?)\Z/m                                                                     #% processing
               doc_links_str=$1
               @lnk=[]
               if doc_links_str=~/\{.+?\}(?:(?:https?|file|ftp):\/|\.\.)\/\S+(?:\s|$)/
@@ -568,16 +605,18 @@ module SiSU_Param
                   end
                 end
               end
-            when /^(?:@prefix(?:_[ab])?:|0~prefix(?:_[ab])?)\s/                                                        #% metainfo
+            when /^@prefix(?:_[ab])?:\s/                                                        #% metainfo
               if para =~/prefix_a:?\s+/
-                @prefix_a=para[/(?:@prefix_a:|0~prefix_a)\s+(.+?)$/im,1]
+                @prefix_a=para[/@prefix_a:\s+(.+?)$/im,1]
               end
               if para =~/prefix(?:_b)?:?\s+/
-                @prefix_b=para[/(?:@prefix(?:_b)?:|0~prefix(?:_b)?)\s+(.+?)$/im,1]
+                @prefix_b=para[/@prefix(?:_b)?:\s+(.+?)$/im,1]
               end
-            when /^(?:@suffix:|0~suffix)\s+(.+?)$/m; @suffix=$1                                                        #% metainfo
-            when /^(?:@information:|0~information)\s+(.+?)$/m; @information=$1                                         #% metainfo
-            when /^(?:@topic_register:|0~topic_register)\s+(.+?)$/m; @topic_register=$1                                #% metainfo, similar syntax to book index, leave out the ={} i.e. use equivalent of ={(.+?)}
+            when /^@suffix:\s+(.+?)$/m; @suffix=$1                                                        #% metainfo
+            when /^@information:\s+(.+?)$/m; @information=$1                                         #% metainfo
+            when /^(?:@topic_register:[ ]+|@classify:.+?:topic_register:[ ]+)(.+?)\n/m            #% metainfo, similar syntax to book index, leave out the ={} i.e. use equivalent of ={(.+?)}
+            #when /^@topic_register:\s+(.+?)$/m; @topic_register=$1                                #% metainfo, similar syntax to book index, leave out the ={} i.e. use equivalent of ={(.+?)}
+              @topic_register=$1
               u=@topic_register.scan(/[^;]+/)
               v=[]
               u.each do |l|
@@ -588,30 +627,30 @@ module SiSU_Param
                 @topic_register_array << m
               end
               @topic_register_array.sort!
-            when /^(?:@contact:|0~contact)\s+(.+?)$/m; @contact=$1                                                     #% metainfo
-            when /^(?:@original_publication:|0~original_publication)\s+(.+?)$/m; @original_publication=$1              #% details of original publication
-            when /^(?:@icon:|0~icon)\s+(.+?)$/m; @icon=$1                                                              #% processing
-            when /^(?:@promo:|0~promo)\s+(.+?)$/m
+            when /^@contact:\s+(.+?)$/m; @contact=$1                                                     #% metainfo
+            when /^@original_publication:\s+(.+?)$/m; @original_publication=$1              #% details of original publication
+            when /^@icon:\s+(.+?)$/m; @icon=$1                                                              #% processing
+            when /^@promo:\s+(.+?)$/m
               @flag_promo=true
               @promo=$1.split(/[,;]\s*/)
-            when /^(?:@ad:|0~ad)\s+(\S+)?\s+(\S+\.png)?\s+(.+?!)\s+(\d+)\s*$/m                                         #% processing
+            when /^@ad:\s+(\S+)?\s+(\S+\.png)?\s+(.+?!)\s+(\d+)\s*$/m                                         #% processing
               @ad_url,@ad_png,@ad_alt,@ad_began=$1,$2,$3,$4
-            when /0~ad\.home\s+(.+)?\s*$/m                                                                             #% processing
-              ad_home_str=$1
-              @ad_home=ad_home_str.split(/\s+!/)
-            when /^(?:@sta?mp(?:ed)?:|0~sta?mp(?:ed)?)\s+(.+?)$/m; @stmp= $1.downcase!                                 #% processing
-            when /^(?:@(?:rcs|cvs):|0~(?:rcs|cvs))\+?\s+/                                                              #% processing
-              m=/(?:@(?:rcs|cvs):|0~(?:rcs|cvs))\+?\s+/ #note the + sign to turn on use of rcs or cvs id
+#           when /0~ad\.home\s+(.+)?\s*$/m                                                                             #% processing
+#             ad_home_str=$1
+#             @ad_home=ad_home_str.split(/\s+!/)
+            when /^@sta?mp(?:ed)?:\s+(.+?)$/m; @stmp= $1.downcase!                                 #% processing
+            when /^@(?:rcs|cvs):\+?\s+/                                                              #% processing
+              m=/@(?:rcs|cvs):\+?\s+/ #note the + sign to turn on use of rcs or cvs id
               ver=para[/#{m}(.+)/,1] #RCS or CVS ID tag # eg. # $Id$
               contains=/[\$]Id:\s+(\S+),v\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+Exp\s+(?:\S+\s+)?[\$]/ # reason for [$] which is apparently unnecessary is that rcs or cvs will otherwise expand id!
               if contains.match(ver)
                 filename,vnumber,date,time,operator=contains.match(ver).captures
                 @sc_filename,@sc_number,@sc_date,@sc_time=filename,vnumber,date,time
               end
-              @sc_info=true if para[/(?:@(?:rcs|cvs):|0~(?:rcs|cvs))\+/]
+              @sc_info=true if para[/@(?:rcs|cvs):\+/]
             when /^@base_program:\s+(.+?)$/; @base_program=$1                                                          #% processing
               #% break - break, not necessary to process headers further :-) but necessary to extract endnotes etc. ;-(
-            when /^(?:@man:|0~man)\s+(.+?)\Z/m                                                                         #% man pages
+            when /^@man:\s+(.+?)\Z/m                                                                         #% man pages
               maninfo_str=$1
               maninfo=maninfo_str.split(/;\s*/m)
               maninfo.each do |x|
diff --git a/lib/sisu/v1/sst_from_kdissert.rb b/lib/sisu/v1/sst_from_kdissert.rb
index 53840fcd..8f22c5f5 100644
--- a/lib/sisu/v1/sst_from_kdissert.rb
+++ b/lib/sisu/v1/sst_from_kdissert.rb
@@ -74,7 +74,7 @@ module SiSU_Kdissert
       sisu_head=<<WOK
 % SiSU #{@ver[:version]} auto-conversion from Kdissert file [check necessary]
 
-@title: #@title
+@title: #{@title}
 
 @prefix: Kdissert document map, converted to SiSU markup
 
@@ -128,7 +128,7 @@ WOK
                   txt=root.elements["item[#{idx}]/text"].text.to_s.strip
                 end
                 @el[id]={ :id=>id,:ma=>ma,:ch=>ch,:sum=>sum,:txt=>txt }
-                if ma == '-1'
+                if ma=='-1'
                   @el[id][:lev]=':A'
                   @top=id
                 end
diff --git a/lib/sisu/v1/sst_to_s_xml_dom.rb b/lib/sisu/v1/sst_to_s_xml_dom.rb
index 3db194b2..39ae7bcc 100644
--- a/lib/sisu/v1/sst_to_s_xml_dom.rb
+++ b/lib/sisu/v1/sst_to_s_xml_dom.rb
@@ -22,7 +22,7 @@
 
    This program is distributed in the hope that it will be useful, but WITHOUT
    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+   FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
    more details.
 
    You should have received a copy of the GNU General Public License along with
@@ -214,13 +214,13 @@ WOK
 #{@tab*n2}</object>
 #{@tab*n1}</heading>#{xml_content}
 WOK
-        if lv == 4
+        if lv==4
           @copen[1]=true
           @copen[2]=@copen[3]=false
-        elsif lv == 5
+        elsif lv==5
           @copen[2]=true
           @copen[3]=false
-        elsif lv == 6
+        elsif lv==6
           @copen[3]=true
         end
       end
@@ -264,7 +264,7 @@ WOK
         when 4..6
           6.downto(lv) do |x|
             y=x - 1
-            if @level[x] == true
+            if @level[x]==true
               u=x - 3;
               @xml_contents_close[x]=''
             end
@@ -275,11 +275,11 @@ WOK
           case lv
           when 4
             @@xml[:body] << "#{@tab*5}</content>\n" if @cont[1]
-            if @copen[3] == true # 6{
+            if @copen[3]==true # 6{
               [3,2,1].each { |v| @@xml[:body] << "#{@tab*n}</contents#{v}>\n" }
-            elsif @copen[2] == true # 5{
+            elsif @copen[2]==true # 5{
               [2,1].each { |v| @@xml[:body] << "#{@tab*n}</contents#{v}>\n" }
-            elsif @copen[1] == true # 4{
+            elsif @copen[1]==true # 4{
               [1].each { |v| @@xml[:body] << "#{@tab*n}</contents#{v}>\n" }
             end
             @cont[1]=true
@@ -288,9 +288,9 @@ WOK
             or @cont[1]
               @@xml[:body] << "#{@tab*5}</content>\n"
             end
-            if @copen[3] == true  #6{
+            if @copen[3]==true  #6{
               [3,2].each { |v| @@xml[:body] << "#{@tab*n}</contents#{v}>\n" }
-            elsif @copen[2] == true #5{
+            elsif @copen[2]==true #5{
               [2].each { |v| @@xml[:body] << "#{@tab*n}</contents#{v}>\n" }
             end
             @cont[2]=true
@@ -479,7 +479,7 @@ WOK
         @content_flag=true
         6.downto(4) do |x|
           y=x - 1; v=x - 3
-          if @level[x] == true
+          if @level[x]==true
             if @content_flag==true
               @@xml[:body] << "#{@tab*5}</content>\n#{@tab*y}</contents#{v}>\n"
               @content_flag=false
@@ -490,9 +490,8 @@ WOK
         end
         3.downto(1) do |x|
           y=x - 1
-          @@xml[:body] << "#{@tab*y}</heading#{x}>\n" if @level[x] == true
+          @@xml[:body] << "#{@tab*y}</heading#{x}>\n" if @level[x]==true
         end
-        #6.downto(1) { |x| y=x - 1; @@xml[:body] << "#{@tab*y}</level #{x}>\n" if @level[x] == true }
       end
       def pre
         rdf=SiSU_XML_tags::RDF.new(@md)
@@ -559,7 +558,7 @@ WOK
         @sisu=new_file_data.scan(/.+/)
         SiSU_Env::SiSU_file.new(@md).mkdir
         filename_sxm=SiSU_Env::SiSU_file.new(@md,@md.fn[:sxd]).mkfile_pwd
-        if filename_sxm.class == File
+        if filename_sxm.class==File
           @sisu.each {|para| filename_sxm.puts para}
           filename_sxm.close
         else puts 'file not created, is directory writable?'
diff --git a/lib/sisu/v1/sst_to_s_xml_node.rb b/lib/sisu/v1/sst_to_s_xml_node.rb
index 09e9f740..3cbd1156 100644
--- a/lib/sisu/v1/sst_to_s_xml_node.rb
+++ b/lib/sisu/v1/sst_to_s_xml_node.rb
@@ -22,7 +22,7 @@
 
    This program is distributed in the hope that it will be useful, but WITHOUT
    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+   FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
    more details.
 
    You should have received a copy of the GNU General Public License along with
@@ -203,10 +203,10 @@ WOK
           @@parent[:ocn]
         end
         def prt_node
-          parent.node.each_with_index { |a,n| puts "n.#{n} a.#{a}" unless n == 0 } #x == node
+          parent.node.each_with_index { |a,n| puts "n.#{n} a.#{a}" unless n==0 } #x==node
         end
         def prt_ocn
-          parent.ocn.each_with_index { |a,n| puts "n.#{n} a.#{a}"  unless n == 0 } #x == node
+          parent.ocn.each_with_index { |a,n| puts "n.#{n} a.#{a}"  unless n==0 } #x==node
         end
         self
       end
@@ -233,10 +233,10 @@ WOK
         end
         if lv.inspect =~/^[1-6]/; @@current=lv
         end
-        if o.node == 1 \
-        or lv == 1
+        if o.node==1 \
+        or lv==1
           @@parent[:node][o.node]=0
-        elsif @@current == lv \
+        elsif @@current==lv \
         and @@current !=nil
           if @node[:no][lv-1] != nil
             @@parent[:node][o.node]=@node[:no][lv-1]
@@ -246,14 +246,14 @@ WOK
             @@parent[:node][o.node]=@node[:no][lv-3]
           else puts 'error'
           end
-        elsif lv == nil
-          if o.ocn.class == Fixnum \
+        elsif lv==nil
+          if o.ocn.class==Fixnum \
           and @@current
             @@parent[:node][o.node]=@node[:no][@@current]
           end
         else puts 'error'
         end
-        if @@current == lv \
+        if @@current==lv \
         and @@current !=nil
           if @node[:ocn][lv-1] != nil
             @@parent[:ocn][o.ocn]=@node[:ocn][lv-1]
@@ -263,8 +263,8 @@ WOK
             @@parent[:ocn][o.ocn]=@node[:ocn][lv-3]
           else puts 'error'
           end
-        elsif lv == nil
-          if o.ocn.class == Fixnum \
+        elsif lv==nil
+          if o.ocn.class==Fixnum \
           and @@current
             @@parent[:ocn][o.ocn]=@node[:ocn][@@current]
           end
@@ -274,7 +274,7 @@ WOK
       #def node_structure(o='',para='',lv='',hname='') #extracted endnotes
       #  if o.ocn
       #    lv=lv.to_i
-      #    lv=nil if lv == 0
+      #    lv=nil if lv==0
       #    build_relationships(o,lv)
       #  end
       #end
@@ -284,7 +284,7 @@ WOK
           lv=lv.to_i
           n=lv - 1
           n3=lv + 2
-          lv=nil if lv == 0
+          lv=nil if lv==0
           embedded_endnotes(para)
           if para[@regx]
             paragraph="#{para[@regx,2]}"
@@ -533,13 +533,12 @@ WOK
         end
         6.downto(4) do |x|
           y=x - 1; v=x - 3
-          @@xml[:body] << "#{@tab*5}</content>\n#{@tab*y}</contents#{v}>\n" if @level[x] == true
+          @@xml[:body] << "#{@tab*5}</content>\n#{@tab*y}</contents#{v}>\n" if @level[x]==true
         end
         3.downto(1) do |x|
           y=x - 1
-          @@xml[:body] << "#{@tab*y}</heading#{x}>\n" if @level[x] == true
+          @@xml[:body] << "#{@tab*y}</heading#{x}>\n" if @level[x]==true
         end
-        #6.downto(1) { |x| y=x - 1; @@xml[:body] << "#{@tab*y}</level #{x}>\n" if @level[x] == true }
       end
       def pre
         rdf=SiSU_XML_tags::RDF.new(@md)
@@ -591,7 +590,7 @@ WOK
         @sisu=new_file_data.scan(/.+/)
         SiSU_Env::SiSU_file.new(@md).mkdir
         filename_sxm=SiSU_Env::SiSU_file.new(@md,@md.fn[:sxn]).mkfile_pwd
-        if filename_sxm.class == File
+        if filename_sxm.class==File
           @sisu.each {|para| filename_sxm.puts para}
           filename_sxm.close
         else puts 'file not created, is directory writable?'
diff --git a/lib/sisu/v1/sysenv.rb b/lib/sisu/v1/sysenv.rb
index 945cf07c..1adb3509 100644
--- a/lib/sisu/v1/sysenv.rb
+++ b/lib/sisu/v1/sysenv.rb
@@ -211,11 +211,11 @@ module SiSU_Env
     @@default_dir=DEFAULT_DIR
     m=/.+\/(?:src\/)?(\S+)/m # m=/.+?\/(?:src\/)?([^\/]+)$/im # m=/.+\/(\S+)/m
     stub_pwd=@@pwd[m,1]
-    @@rc_path=["#@@pwd/_sisu","#@@home/.sisu",@@sisu_etc]
+    @@rc_path=["#@@pwd/_sisu","#@@home/.sisu","#@@sisu_etc/#{SiSU_version_dir}"]
     @@yamlrc_path=unless stub_pwd =~/^sisupod$/
-      ["#@@pwd/_sisu","#@@home/.sisu",@@sisu_etc]
+      ["#@@pwd/_sisu","#@@home/.sisu","#@@sisu_etc/#{SiSU_version_dir}"]
     else #security policy: prevent reading of sisurc.yml in sisupod
-      ["#@@home/.sisu",@@sisu_etc]
+      ["#@@home/.sisu","#@@sisu_etc/#{SiSU_version_dir}"]
     end
     @@ad_path=unless stub_pwd =~/^sisupod$/
       ["#@@pwd/_sisu/skin/yml","#@@home/.sisu/skin/yml","#{@@sisu_etc}/skin/yml"]
@@ -2019,7 +2019,6 @@ WOK
     end
     def i18n
       def language                                                              # language settings
-##
         m=/.+\/\S+?\~(\S+)/
         pwd=Dir.pwd
         conf=if defined? @rc['default']['language']; @rc['default']['language']
@@ -2075,7 +2074,7 @@ WOK
     end
     def odf_structure
       rm_rf("#{path.processing}/odf")
-      system("unzip -q #{path.share}/odf/odt.zip -d      #{path.processing}")
+      system("unzip -q #{path.share}/#{SiSU_version_dir}/odf/odt.zip -d      #{path.processing}")
     end
     def sisupod_gen(fns_pod)
       pwd=Dir.pwd
@@ -2642,11 +2641,13 @@ WOK
   class Info_version <Info_env
     include Singleton
     require 'rbconfig'
+    @@lib_path=nil
     def get_version
       @version={}
       @pwd=ENV['PWD']
-      yst_etc="#{defaults[:sisu_etc]}/version1.yml"
-      lib_path=`echo $RUBYLIB`.split(':')
+      yst_etc="#{defaults[:sisu_etc]}/#{SiSU_version_dir}/version.yml"
+      lib_path=@@lib_path ? @@lib_path : `echo $RUBYLIB`.split(':')
+      @@lib_path ||=lib_path
       if File.exist?(yst_etc); @version=YAML::load(File::open(yst_etc)) #unless @@noyaml
       end
       @version
diff --git a/man/man1/sisu.1 b/man/man1/sisu.1
index 7cb09654..03d2cad5 100644
--- a/man/man1/sisu.1
+++ b/man/man1/sisu.1
@@ -306,9 +306,10 @@ indicated. (also see \-V)
 
 .TP
 .B \-m [filename/wildcard/url]
-assumed for most other flags, creates new meta\-markup file, (the metaverse )
-that is used in all subsequent processing of other output. This step is assumed
-for most processing flags. To skip it see \-n
+
+assumed for most other flags, creates new intermediate files for processing
+(document abstraction) that is used in all subsequent processing of other
+output. This step is assumed for most processing flags. To skip it see \-n
 
 .TP
 .B \-N [filename/wildcard/url]
@@ -319,8 +320,9 @@ that produced it) (digest.txt). \-NV for verbose digest output to screen.
 
 .TP
 .B \-n [filename/wildcard/url]
-skip meta\-markup (building of \"metaverse\"), this skips the equivalent of
-\-m which is otherwise assumed by most processing flags.
+skip the creation of intermediate processing files (document abstraction) if
+they already exist, this skips the equivalent of -m which is otherwise assumed
+by most processing flags.
 
 .TP
 .B \-o [filename/wildcard/url]