From 589d36be342120f660d86144b9545000254b9a2b Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sat, 5 Mar 2011 22:45:59 -0500 Subject: sha256 (3.0.2) --- data/doc/sisu/CHANGELOG_v3 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index 871a9c6e..19a5ffc5 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -16,9 +16,9 @@ v3 branch once stable will supersede & replace current stable v2 branch %% 3.0.2.orig.tar.gz (2011-03-05:09/6) http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.2-1 http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.2.orig.tar.gz - sisu_3.0.2.orig.tar.gz - sisu_3.0.2-1.dsc - sisu_3.0.2-1.debian.tar.gz + 5211dcb37ab8aeb0889e3faaf567367f40f3b121a60cc6fd01fd78fe5adcd00d 1918497 sisu_3.0.2.orig.tar.gz + b680fc9409d25149928a2b2067b60b610d0500ed93799e7d35f1b62642621f49 1216 sisu_3.0.2-1.dsc + b09754d0dcefd0cfeb0e1b641e291d79f5a61dc9dad8138826d262f5d07f7c3a 280734 sisu_3.0.2-1.debian.tar.gz v3, target ruby1.9.2, ruby1.9.2p180 is ok note: there are issues with sisu and early versions of ruby1.9.2 -- cgit v1.2.3 From 9dea2a81d4a8115a9c7ec49422a1150f208bff0d Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 10 Mar 2011 08:23:05 -0500 Subject: v2, v3: 3.0.3 version & changelog "opened" --- data/doc/sisu/CHANGELOG_v2 | 6 ++++++ data/doc/sisu/CHANGELOG_v3 | 6 ++++++ data/sisu/v2/v/version.yml | 6 +++--- data/sisu/v3/v/version.yml | 6 +++--- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2 index 9866e098..bfb8728f 100644 --- a/data/doc/sisu/CHANGELOG_v2 +++ b/data/doc/sisu/CHANGELOG_v2 @@ -12,6 +12,12 @@ Reverse Chronological: %% STABLE Branch +%% 2.8.2.orig.tar.gz (2011-03-10:10/4) +http://www.jus.uio.no/sisu/pkg/src/sisu_2.8.2.orig.tar.gz + sisu_2.8.2.orig.tar.gz + sisu_2.8.2-1.dsc + sisu_2.8.2-1.diff.gz + %% 2.8.1.orig.tar.gz (2011-03-05:09/6) http://www.jus.uio.no/sisu/pkg/src/sisu_2.8.1.orig.tar.gz sisu_2.8.1.orig.tar.gz diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index 19a5ffc5..dd41da65 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -13,6 +13,12 @@ Reverse Chronological: %% Development branch UNSTABLE v3 branch once stable will supersede & replace current stable v2 branch +%% 3.0.3.orig.tar.gz (2011-03-10:10/4) +http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.3.orig.tar.gz + sisu_3.0.3.orig.tar.gz + sisu_3.0.3-1.dsc + sisu_3.0.3-1.debian.tar.gz + %% 3.0.2.orig.tar.gz (2011-03-05:09/6) http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.2-1 http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.2.orig.tar.gz diff --git a/data/sisu/v2/v/version.yml b/data/sisu/v2/v/version.yml index 8766ef99..a3fdf0dc 100644 --- a/data/sisu/v2/v/version.yml +++ b/data/sisu/v2/v/version.yml @@ -1,5 +1,5 @@ --- -:version: 2.8.1 -:date_stamp: 2011w09/2 -:date: "2011-03-01" +:version: 2.8.2 +:date_stamp: 2011w10/4 +:date: "2011-03-10" :project: SiSU diff --git a/data/sisu/v3/v/version.yml b/data/sisu/v3/v/version.yml index 463b8e59..cb913787 100644 --- a/data/sisu/v3/v/version.yml +++ b/data/sisu/v3/v/version.yml @@ -1,5 +1,5 @@ --- -:version: 3.0.2-beta-rb1.9.2p180 -:date_stamp: 2011w09/6 -:date: "2011-03-05" +:version: 3.0.3-beta-rb1.9.2p180 +:date_stamp: 2011w10/4 +:date: "2011-03-10" :project: SiSU -- cgit v1.2.3 From 78170753d8682c8ea9ae5f75232951d5b8043803 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 10 Mar 2011 08:26:36 -0500 Subject: v2, v3: texpdf, url (regex) pattern match fix --- data/doc/sisu/CHANGELOG_v2 | 2 ++ data/doc/sisu/CHANGELOG_v3 | 2 ++ lib/sisu/v2/texpdf_format.rb | 4 ++-- lib/sisu/v3/texpdf_format.rb | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2 index bfb8728f..cecd65f0 100644 --- a/data/doc/sisu/CHANGELOG_v2 +++ b/data/doc/sisu/CHANGELOG_v2 @@ -18,6 +18,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.8.2.orig.tar.gz sisu_2.8.2-1.dsc sisu_2.8.2-1.diff.gz + * texpdf: url (regex) pattern match fix (/https?/) + %% 2.8.1.orig.tar.gz (2011-03-05:09/6) http://www.jus.uio.no/sisu/pkg/src/sisu_2.8.1.orig.tar.gz sisu_2.8.1.orig.tar.gz diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index dd41da65..be20de8c 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -19,6 +19,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.3.orig.tar.gz sisu_3.0.3-1.dsc sisu_3.0.3-1.debian.tar.gz + * texpdf: url (regex) pattern match fix (/https?/) + %% 3.0.2.orig.tar.gz (2011-03-05:09/6) http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.2-1 http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.2.orig.tar.gz diff --git a/lib/sisu/v2/texpdf_format.rb b/lib/sisu/v2/texpdf_format.rb index 732a903e..19e53d3b 100644 --- a/lib/sisu/v2/texpdf_format.rb +++ b/lib/sisu/v2/texpdf_format.rb @@ -7,7 +7,7 @@ * Author: Ralph Amissah - * Copyright: (C) 1997 - 2010, Ralph Amissah, All Rights Reserved. + * Copyright: (C) 1997 - 2011, Ralph Amissah, All Rights Reserved. * License: GPL 3 or later: @@ -970,7 +970,7 @@ WOK para_array=[] str=if word word.each do |w| # _ - / # | : ! ^ ~ - if w !~/http:/ \ + if w !~/https?:/ \ and w=~/\/\S+?\// \ and w.length > 6 w.gsub!(/([_.\/])/,'\1\-') diff --git a/lib/sisu/v3/texpdf_format.rb b/lib/sisu/v3/texpdf_format.rb index a1fb3e72..114c3cb6 100644 --- a/lib/sisu/v3/texpdf_format.rb +++ b/lib/sisu/v3/texpdf_format.rb @@ -972,7 +972,7 @@ WOK para_array=[] str=if word word.each do |w| # _ - / # | : ! ^ ~ - if w !~/http:/ \ + if w !~/https?:/ \ and w=~/\/\S+?\// \ and w.length > 6 w.gsub!(/([_.\/])/,'\1\-') -- cgit v1.2.3 From 755acef8c7673081e9fb946d789d394afaee68ee Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 10 Mar 2011 08:43:44 -0500 Subject: v2, v3: dal_syntax + downstream output, email regex revised * revised pattern match for email address, (removes occasional interference with urls having embedded email addresses) (dal_syntax and affected downstream output modules) --- data/doc/sisu/CHANGELOG_v2 | 4 ++++ data/doc/sisu/CHANGELOG_v3 | 4 ++++ lib/sisu/v2/dal_syntax.rb | 6 +++--- lib/sisu/v2/epub_tune.rb | 7 ++----- lib/sisu/v2/html_tune.rb | 7 ++----- lib/sisu/v2/odf.rb | 10 +++++----- lib/sisu/v2/shared_xml.rb | 2 ++ lib/sisu/v2/texpdf_format.rb | 2 ++ lib/sisu/v3/dal_syntax.rb | 4 ++-- lib/sisu/v3/epub_tune.rb | 5 +---- lib/sisu/v3/html_tune.rb | 5 +---- lib/sisu/v3/odf.rb | 12 ++++++------ lib/sisu/v3/shared_xml.rb | 2 ++ lib/sisu/v3/texpdf_format.rb | 2 ++ 14 files changed, 38 insertions(+), 34 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2 index cecd65f0..23c482e3 100644 --- a/data/doc/sisu/CHANGELOG_v2 +++ b/data/doc/sisu/CHANGELOG_v2 @@ -18,6 +18,10 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.8.2.orig.tar.gz sisu_2.8.2-1.dsc sisu_2.8.2-1.diff.gz + * dal_syntax and affected downstream output modules, revised pattern match + for mail, (removes occasional interference with urls having embedded email + addresses) + * texpdf: url (regex) pattern match fix (/https?/) %% 2.8.1.orig.tar.gz (2011-03-05:09/6) diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index be20de8c..97d15bf3 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -19,6 +19,10 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.3.orig.tar.gz sisu_3.0.3-1.dsc sisu_3.0.3-1.debian.tar.gz + * dal_syntax and affected downstream output modules, revised pattern match + for mail, (removes occasional interference with urls having embedded email + addresses) + * texpdf: url (regex) pattern match fix (/https?/) %% 3.0.2.orig.tar.gz (2011-03-05:09/6) diff --git a/lib/sisu/v2/dal_syntax.rb b/lib/sisu/v2/dal_syntax.rb index 47c7f8d0..55556371 100644 --- a/lib/sisu/v2/dal_syntax.rb +++ b/lib/sisu/v2/dal_syntax.rb @@ -7,7 +7,7 @@ * Author: Ralph Amissah - * Copyright: (C) 1997 - 2010, Ralph Amissah, All Rights Reserved. + * Copyright: (C) 1997 - 2011, Ralph Amissah, All Rights Reserved. * License: GPL 3 or later: @@ -327,7 +327,7 @@ module SiSU_Syntax else dob.obj.gsub!(/^\s*(?:(by\s+)?(?:@creator|@author))\s*$/,'\1') end end - dob.obj.gsub!(/<(https?:\/\/\S+?)>/,'< \1 >') #catch problem markup + dob.obj.gsub!(/<(https?:\/\/\S+?)>/,'< \1 >') #catch problem markup dob.obj.gsub!(/<:=(\S+?)>/,'{ c_\1.png 14x14 }http://www.jus.uio.no/sisu') #adjustment 2005w30 dob.obj.gsub!(//,'<:\1>') #escaped special character dob.obj.gsub!(/ /,"#{Mx[:nbsp]}") #escaped special character @@ -398,6 +398,7 @@ module SiSU_Syntax "#{Mx[:lnk_o]}\\1#{Mx[:lnk_c]}#{Mx[:url_o]}\\2#{Mx[:url_c]}\\3") #any remaining linked text or image dob.obj.gsub!(/\{\s*(.+?)\s*\}(#{Mx[:url_o]}\S+?#{Mx[:url_c]})/, "#{Mx[:lnk_o]}\\1#{Mx[:lnk_c]}\\2") #any remaining linked text or image + dob.obj.gsub!(/(^|\s)([a-zA-Z0-9._-]+\@\S+?\.[a-zA-Z0-9._-]+)/,"\\1#{Mx[:url_o]}\\2#{Mx[:url_c]}") dob.obj.gsub!(/(^|[ ])\{\s*(.+?)\s*\}(\S+?)([;,.]?)(?=\s|[#{Mx[:br_line]}#{Mx[:br_paragraph]}#{Mx[:br_nl]}#{Mx[:en_a_o]}#{Mx[:en_b_o]}]|$)/, "\\1#{Mx[:lnk_o]}\\2#{Mx[:lnk_c]}\\3\\4") #any remaining linked text or image dob.obj.gsub!(/\{\s*(.+?)\s*\}#(\S+?)([;,.]?)(?=\s|[#{Mx[:br_line]}#{Mx[:br_paragraph]}#{Mx[:br_nl]}#{Mx[:en_a_o]}#{Mx[:en_b_o]}]|$)/, @@ -409,7 +410,6 @@ module SiSU_Syntax elsif dob.is=='table' dob=fontface(dob) elsif dob.is =='code' -#p dob.obj dob.obj.gsub!(/#{Mx[:meta_o]}(\S+?)#{Mx[:meta_c]}\s*/,'@\1: ') dob.obj.gsub!(/([<>])/,'_\1') dob.obj.gsub!(/_<:(\S+?)_>/,'<:\1>') #convert <:\S+> back, clumsy diff --git a/lib/sisu/v2/epub_tune.rb b/lib/sisu/v2/epub_tune.rb index 10583936..9c9223a0 100644 --- a/lib/sisu/v2/epub_tune.rb +++ b/lib/sisu/v2/epub_tune.rb @@ -7,7 +7,7 @@ * Author: Ralph Amissah - * Copyright: (C) 1997 - 2010, Ralph Amissah, All Rights Reserved. + * Copyright: (C) 1997 - 2011, Ralph Amissah, All Rights Reserved. * License: GPL 3 or later: @@ -349,11 +349,8 @@ module SiSU_EPUB_Tune dob.obj.gsub!(/!new/,%{ new}) dob.obj.gsub!(/<:h(.{1,7}?)>/,'\1') dob.obj.gsub!(/<:to(\d{1,7}?)>/,'to { \1 } ') - if dob.obj =~/\b\S+\@\S+?\.\S+/ \ - and dob.obj !~/(\"\S+\@\S+?\.\S+\"|>\S+\@\S+?\.\S+?<)/ - dob.obj.gsub!(/([a-zA-Z0-9._-]+\@\S+?\.[a-zA-Z0-9._-]+)/,'<\1>') - end dob.obj.gsub!(/#{Mx[:url_o]}_(\S+?)#{Mx[:url_c]}/,'\1') #http ftp matches escaped, no decoration + dob.obj.gsub!(/#{Mx[:url_o]}([a-zA-Z0-9._-]+\@\S+?\.[a-zA-Z0-9._-]+)#{Mx[:url_c]}/,%{#{@brace_url.xml_open}\\1#{@brace_url.xml_close}}) dob.obj.gsub!(/#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/,%{#{@brace_url.xml_open}\\1#{@brace_url.xml_close}}) #http ftp matches with decoration if dob.obj =~/..\/\S+/ \ and dob.obj !~/(\"..\/\S+?\"|>\s*..\/\S+<)/ diff --git a/lib/sisu/v2/html_tune.rb b/lib/sisu/v2/html_tune.rb index 9d3dce0b..99ce1b0f 100644 --- a/lib/sisu/v2/html_tune.rb +++ b/lib/sisu/v2/html_tune.rb @@ -7,7 +7,7 @@ * Author: Ralph Amissah - * Copyright: (C) 1997 - 2010, Ralph Amissah, All Rights Reserved. + * Copyright: (C) 1997 - 2011, Ralph Amissah, All Rights Reserved. * License: GPL 3 or later: @@ -321,11 +321,8 @@ module SiSU_HTML_Tune dob.obj.gsub!(/!new/,%{ new}) dob.obj.gsub!(/<:h(.{1,7}?)>/,'\1') dob.obj.gsub!(/<:to(\d{1,7}?)>/,'to { \1 } ') - if dob.obj =~/\b\S+\@\S+?\.\S+/ \ - and dob.obj !~/(\"\S+\@\S+?\.\S+\"|>\S+\@\S+?\.\S+?<)/ - dob.obj.gsub!(/([a-zA-Z0-9._-]+\@\S+?\.[a-zA-Z0-9._-]+)/,'<\1>') - end dob.obj.gsub!(/#{Mx[:url_o]}_(\S+?)#{Mx[:url_c]}/,'\1') #http ftp matches escaped, no decoration + dob.obj.gsub!(/#{Mx[:url_o]}([a-zA-Z0-9._-]+\@\S+?\.[a-zA-Z0-9._-]+)#{Mx[:url_c]}/,%{#{@brace_url.xml_open}\\1#{@brace_url.xml_close}}) dob.obj.gsub!(/#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/,%{#{@brace_url.xml_open}\\1#{@brace_url.xml_close}}) #http ftp matches with decoration if dob.obj =~/..\/\S+/ \ and dob.obj !~/(\"..\/\S+?\"|>\s*..\/\S+<)/ diff --git a/lib/sisu/v2/odf.rb b/lib/sisu/v2/odf.rb index 2e2a88b4..b6ec4c1b 100644 --- a/lib/sisu/v2/odf.rb +++ b/lib/sisu/v2/odf.rb @@ -7,7 +7,7 @@ * Author: Ralph Amissah - * Copyright: (C) 1997 - 2010, Ralph Amissah, All Rights Reserved. + * Copyright: (C) 1997 - 2011, Ralph Amissah, All Rights Reserved. * License: GPL 3 or later: @@ -291,10 +291,10 @@ module SiSU_ODF def normal(dob) #P1 - P3 dob.obj.gsub!(/#{Mx[:url_o]}_(\S+?)#{Mx[:url_c]}/, '\1') #http ftp matches escaped, no decoration + dob.obj.gsub!(/#{Mx[:url_o]}([a-zA-Z0-9._-]+\@\S+?\.[a-zA-Z0-9._-]+)#{Mx[:url_c]}/, + %{#{@brace_url.xml_open}\\1#{@brace_url.xml_close}}) dob.obj.gsub!(/#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/, %{#{@brace_url.xml_open}\\1#{@brace_url.xml_close}}) #http ftp matches with decoration - dob.obj.gsub!(/([a-zA-Z0-9._-]+@[a-zA-Z0-9._-]+)/, - %{#{@brace_url.xml_open}\\1#{@brace_url.xml_close}}) if dob.obj !~/https?:\/\// # improve upon, document crash where url contains '@' symbol dob.obj= if dob.is=='para' and dob.indent.to_s =~/[0-9]/ # and t_o.bullet_==true %{#{dob.obj}} else %{#{dob.obj}} @@ -372,10 +372,10 @@ module SiSU_ODF parray=[] dob.obj.gsub!(/#{Mx[:url_o]}_(\S+?)#{Mx[:url_c]}/, '\1') #http ftp matches escaped, no decoration + dob.obj.gsub!(/#{Mx[:url_o]}([a-zA-Z0-9._-]+\@\S+?\.[a-zA-Z0-9._-]+)#{Mx[:url_c]}/, + %{#{@brace_url.xml_open}\\1#{@brace_url.xml_close}}) dob.obj.gsub!(/#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/, %{#{@brace_url.xml_open}\\1#{@brace_url.xml_close}}) #http ftp matches with decoration - dob.obj.gsub!(/([a-zA-Z0-9._-]+@[a-zA-Z0-9._-]+)/, - %{#{@brace_url.xml_open}\\1#{@brace_url.xml_close}}) if dob.obj !~/https?:\/\// # improve upon, document crash where url contains '@' symbol dob.obj.split(/#{Mx[:br_line]}|#{Mx[:br_nl]}/).each do |parablock| parablock=group_clean(parablock) parablock.gsub!(/<text:a xlink:type="simple" xlink:href="(.+?)">/m,'') diff --git a/lib/sisu/v2/shared_xml.rb b/lib/sisu/v2/shared_xml.rb index 2fcab17e..e82f51bf 100644 --- a/lib/sisu/v2/shared_xml.rb +++ b/lib/sisu/v2/shared_xml.rb @@ -398,6 +398,8 @@ module SiSU_XML_munge if dob.of=='group' dob.obj.gsub!(/#{Mx[:gl_bullet]}/,'● ') end + dob.obj.gsub!(/#{Mx[:url_o]}([a-zA-Z0-9._-]+\@\S+?\.[a-zA-Z0-9._-]+)#{Mx[:url_c]}/, + %{#{@brace_url.xml_open}\\1#{@brace_url.xml_close}}) dob.obj.gsub!(/#{Dx[:url_o]}/,"#{Dx[:url_o_xml]}") dob.obj.gsub!(/#{Dx[:url_c]}/,"#{Dx[:url_c_xml]}") dob.obj.gsub!(/ |#{Mx[:nbsp]}/m,' ') diff --git a/lib/sisu/v2/texpdf_format.rb b/lib/sisu/v2/texpdf_format.rb index 19e53d3b..dbf0d095 100644 --- a/lib/sisu/v2/texpdf_format.rb +++ b/lib/sisu/v2/texpdf_format.rb @@ -65,6 +65,8 @@ module SiSU_TeX_Pdf @brace_url=SiSU_Viz::Skin.new.url_decoration end def bare_urls + @dob.obj.gsub!(/#{Mx[:url_o]}([a-zA-Z0-9._-]+\@\S+?\.[a-zA-Z0-9._-]+)#{Mx[:url_c]}/, + "#{@brace_url.tex_open}\\1#{@brace_url.tex_close}") @dob.tmp.gsub!(/(^|[^\\])_/m,'\1\_') #watch may not work @dob.tmp.gsub!(/(^|[^#{Mx[:lnk_c]}])#{Mx[:url_o]}_?(?:\\?_)?(\S+?)#{Mx[:url_c]}/m, "\\1#{@brace_url.tex_open}\\begin{scriptsize}\\url{\\2}\\end{scriptsize}#{@brace_url.tex_close}") diff --git a/lib/sisu/v3/dal_syntax.rb b/lib/sisu/v3/dal_syntax.rb index 2de931f6..61253561 100644 --- a/lib/sisu/v3/dal_syntax.rb +++ b/lib/sisu/v3/dal_syntax.rb @@ -333,7 +333,7 @@ module SiSU_Syntax end end end - dob.obj.gsub!(/<(https?:\/\/\S+?)>/,'< \1 >') #catch problem markup + dob.obj.gsub!(/<(https?:\/\/\S+?)>/,'< \1 >') #catch problem markup dob.obj.gsub!(/<:=(\S+?)>/,'{ c_\1.png 14x14 }http://www.jus.uio.no/sisu') #adjustment 2005w30 dob.obj.gsub!(//,'<:\1>') #escaped special character dob.obj.gsub!(/ /,"#{Mx[:nbsp]}") #escaped special character @@ -404,6 +404,7 @@ module SiSU_Syntax "#{Mx[:lnk_o]}\\1#{Mx[:lnk_c]}#{Mx[:url_o]}\\2#{Mx[:url_c]}\\3") #any remaining linked text or image dob.obj.gsub!(/\{\s*(.+?)\s*\}(#{Mx[:url_o]}\S+?#{Mx[:url_c]})/, "#{Mx[:lnk_o]}\\1#{Mx[:lnk_c]}\\2") #any remaining linked text or image + dob.obj.gsub!(/(^|\s)([a-zA-Z0-9._-]+\@\S+?\.[a-zA-Z0-9._-]+)/,"\\1#{Mx[:url_o]}\\2#{Mx[:url_c]}") dob.obj.gsub!(/(^|[ ])\{\s*(.+?)\s*\}(\S+?)([;,.]?)(?=\s|[#{Mx[:br_line]}#{Mx[:br_paragraph]}#{Mx[:br_nl]}#{Mx[:en_a_o]}#{Mx[:en_b_o]}]|$)/, "\\1#{Mx[:lnk_o]}\\2#{Mx[:lnk_c]}\\3\\4") #any remaining linked text or image dob.obj.gsub!(/\{\s*(.+?)\s*\}#(\S+?)([;,.]?)(?=\s|[#{Mx[:br_line]}#{Mx[:br_paragraph]}#{Mx[:br_nl]}#{Mx[:en_a_o]}#{Mx[:en_b_o]}]|$)/, @@ -415,7 +416,6 @@ module SiSU_Syntax elsif dob.is=='table' dob=fontface(dob) elsif dob.is =='code' -#p dob.obj dob.obj.gsub!(/#{Mx[:meta_o]}(\S+?)#{Mx[:meta_c]}\s*/,'@\1: ') dob.obj.gsub!(/([<>])/,'_\1') dob.obj.gsub!(/_<:(\S+?)_>/,'<:\1>') #convert <:\S+> back, clumsy diff --git a/lib/sisu/v3/epub_tune.rb b/lib/sisu/v3/epub_tune.rb index 746a112e..19453fc8 100644 --- a/lib/sisu/v3/epub_tune.rb +++ b/lib/sisu/v3/epub_tune.rb @@ -347,11 +347,8 @@ module SiSU_EPUB_Tune dob.obj.gsub!(/!new/,%{ new}) dob.obj.gsub!(/<:h(.{1,7}?)>/,'\1') dob.obj.gsub!(/<:to(\d{1,7}?)>/,'to { \1 } ') - if dob.obj =~/\b\S+\@\S+?\.\S+/ \ - and dob.obj !~/(\"\S+\@\S+?\.\S+\"|>\S+\@\S+?\.\S+?<)/ - dob.obj.gsub!(/([a-zA-Z0-9._-]+\@\S+?\.[a-zA-Z0-9._-]+)/,'<\1>') - end dob.obj.gsub!(/#{Mx[:url_o]}_(\S+?)#{Mx[:url_c]}/,'\1') #http ftp matches escaped, no decoration + dob.obj.gsub!(/#{Mx[:url_o]}([a-zA-Z0-9._-]+\@\S+?\.[a-zA-Z0-9._-]+)#{Mx[:url_c]}/,%{#{@brace_url.xml_open}\\1#{@brace_url.xml_close}}) dob.obj.gsub!(/#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/,%{#{@brace_url.xml_open}\\1#{@brace_url.xml_close}}) #http ftp matches with decoration if dob.obj =~/..\/\S+/ \ and dob.obj !~/(\"..\/\S+?\"|>\s*..\/\S+<)/ diff --git a/lib/sisu/v3/html_tune.rb b/lib/sisu/v3/html_tune.rb index 18b4576b..5bbcdf6c 100644 --- a/lib/sisu/v3/html_tune.rb +++ b/lib/sisu/v3/html_tune.rb @@ -319,11 +319,8 @@ module SiSU_HTML_Tune dob.obj.gsub!(/!new/,%{ new}) dob.obj.gsub!(/<:h(.{1,7}?)>/,'\1') dob.obj.gsub!(/<:to(\d{1,7}?)>/,'to { \1 } ') - if dob.obj =~/\b\S+\@\S+?\.\S+/ \ - and dob.obj !~/(\"\S+\@\S+?\.\S+\"|>\S+\@\S+?\.\S+?<)/ - dob.obj.gsub!(/([a-zA-Z0-9._-]+\@\S+?\.[a-zA-Z0-9._-]+)/,'<\1>') - end dob.obj.gsub!(/#{Mx[:url_o]}_(\S+?)#{Mx[:url_c]}/,'\1') #http ftp matches escaped, no decoration + dob.obj.gsub!(/#{Mx[:url_o]}([a-zA-Z0-9._-]+\@\S+?\.[a-zA-Z0-9._-]+)#{Mx[:url_c]}/,%{#{@brace_url.xml_open}\\1#{@brace_url.xml_close}}) dob.obj.gsub!(/#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/,%{#{@brace_url.xml_open}\\1#{@brace_url.xml_close}}) #http ftp matches with decoration if dob.obj =~/#{Xx[:html_relative2]}\/\S+/ \ and dob.obj !~/(\"#{Xx[:html_relative2]}\/\S+?\"|>\s*#{Xx[:html_relative2]}\/\S+<)/ diff --git a/lib/sisu/v3/odf.rb b/lib/sisu/v3/odf.rb index 204f0e50..c14a6c91 100644 --- a/lib/sisu/v3/odf.rb +++ b/lib/sisu/v3/odf.rb @@ -294,10 +294,10 @@ module SiSU_ODF def normal(dob,p_num='') #P1 - P3 dob.obj.gsub!(/#{Mx[:url_o]}_(\S+?)#{Mx[:url_c]}/, '\1') #http ftp matches escaped, no decoration + dob.obj.gsub!(/#{Mx[:url_o]}([a-zA-Z0-9._-]+\@\S+?\.[a-zA-Z0-9._-]+)#{Mx[:url_c]}/, + %{#{@brace_url.xml_open}\\1#{@brace_url.xml_close}}) dob.obj.gsub!(/#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/, %{#{@brace_url.xml_open}\\1#{@brace_url.xml_close}}) #http ftp matches with decoration - dob.obj.gsub!(/([a-zA-Z0-9._-]+@[a-zA-Z0-9._-]+)/, - %{#{@brace_url.xml_open}\\1#{@brace_url.xml_close}}) if dob.obj !~/https?:\/\// # improve upon, document crash where url contains '@' symbol dob.obj= if dob.is=='para' and dob.indent.to_s =~/[0-9]/ # and t_o.bullet_==true %{#{dob.obj}#{p_num}} else %{#{dob.obj}#{p_num}} @@ -377,10 +377,10 @@ module SiSU_ODF parray=[] dob.obj.gsub!(/#{Mx[:url_o]}_(\S+?)#{Mx[:url_c]}/, '\1') #http ftp matches escaped, no decoration + dob.obj.gsub!(/#{Mx[:url_o]}([a-zA-Z0-9._-]+\@\S+?\.[a-zA-Z0-9._-]+)#{Mx[:url_c]}/, + %{#{@brace_url.xml_open}\\1#{@brace_url.xml_close}}) dob.obj.gsub!(/#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/, %{#{@brace_url.xml_open}\\1#{@brace_url.xml_close}}) #http ftp matches with decoration - dob.obj.gsub!(/([a-zA-Z0-9._-]+@[a-zA-Z0-9._-]+)/, - %{#{@brace_url.xml_open}\\1#{@brace_url.xml_close}}) if dob.obj !~/https?:\/\// # improve upon, document crash where url contains '@' symbol dob.obj.split(/#{Mx[:br_line]}|#{Mx[:br_nl]}/).each do |parablock| parablock=group_clean(parablock) parablock.gsub!(/<text:a xlink:type="simple" xlink:href="(.+?)">/m,'') @@ -400,10 +400,10 @@ module SiSU_ODF parray=[] dob.obj.gsub!(/#{Mx[:url_o]}_(\S+?)#{Mx[:url_c]}/, '\1') #http ftp matches escaped, no decoration + dob.obj.gsub!(/#{Mx[:url_o]}([a-zA-Z0-9._-]+\@\S+?\.[a-zA-Z0-9._-]+)#{Mx[:url_c]}/, + %{#{@brace_url.xml_open}\\1#{@brace_url.xml_close}}) dob.obj.gsub!(/#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/, %{#{@brace_url.xml_open}\\1#{@brace_url.xml_close}}) #http ftp matches with decoration - dob.obj.gsub!(/([a-zA-Z0-9._-]+@[a-zA-Z0-9._-]+)/, - %{#{@brace_url.xml_open}\\1#{@brace_url.xml_close}}) if dob.obj !~/https?:\/\// # improve upon, document crash where url contains '@' symbol dob.obj.split(/#{Mx[:br_line]}|#{Mx[:br_nl]}/).each do |parablock| parablock=group_clean(parablock) parablock.gsub!(/<text:a xlink:type="simple" xlink:href="(.+?)">/m,'') diff --git a/lib/sisu/v3/shared_xml.rb b/lib/sisu/v3/shared_xml.rb index 06b89395..daf59a4c 100644 --- a/lib/sisu/v3/shared_xml.rb +++ b/lib/sisu/v3/shared_xml.rb @@ -398,6 +398,8 @@ module SiSU_XML_munge if dob.of=='block' dob.obj.gsub!(/#{Mx[:gl_bullet]}/,'● ') end + dob.obj.gsub!(/#{Mx[:url_o]}([a-zA-Z0-9._-]+\@\S+?\.[a-zA-Z0-9._-]+)#{Mx[:url_c]}/, + %{#{@brace_url.xml_open}\\1#{@brace_url.xml_close}}) dob.obj.gsub!(/#{Dx[:url_o]}/,"#{Dx[:url_o_xml]}") dob.obj.gsub!(/#{Dx[:url_c]}/,"#{Dx[:url_c_xml]}") dob.obj.gsub!(/ |#{Mx[:nbsp]}/m,' ') diff --git a/lib/sisu/v3/texpdf_format.rb b/lib/sisu/v3/texpdf_format.rb index 114c3cb6..a91095e8 100644 --- a/lib/sisu/v3/texpdf_format.rb +++ b/lib/sisu/v3/texpdf_format.rb @@ -65,6 +65,8 @@ module SiSU_TeX_Pdf @brace_url=SiSU_Viz::Skin.new.url_decoration end def bare_urls + @dob.obj.gsub!(/#{Mx[:url_o]}([a-zA-Z0-9._-]+\@\S+?\.[a-zA-Z0-9._-]+)#{Mx[:url_c]}/, + "#{@brace_url.tex_open}\\1#{@brace_url.tex_close}") @dob.tmp.gsub!(/(^|[^\\])_/m,'\1\_') #watch may not work @dob.tmp.gsub!(/(^|[^#{Mx[:lnk_c]}])#{Mx[:url_o]}_?(?:\\?_)?(\S+?)#{Mx[:url_c]}/m, "\\1#{@brace_url.tex_open}\\begin{scriptsize}\\url{\\2}\\end{scriptsize}#{@brace_url.tex_close}") -- cgit v1.2.3 From 259351d439d016ddb46e2dcb3356cfb9738d7bde Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 10 Mar 2011 08:46:46 -0500 Subject: v2, v3: dal_syntax: (internal document) link matching, a fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [Debian-live, live-manual (Jose Luis Zabalza, Ben Armstrong, reported bug in Spanish translation markup (that crashed the pdf generator). Bug in markup subsequently identified as "versátil,#{iso-hybrid}#, se" which the interpreter identified as an internal document link to a comma (instead of as being monospace markup), markup should have been "versátil, #{iso-hybrid}#, se" this fix prevents that incorrect match, (but the markup remains faulty and the monospace markup is not identified as such without the corrected spacing). Unfortunate "grave" results for what is a pretty insignificant data entry typo (there are no doubt other such situations).] --- data/doc/sisu/CHANGELOG_v2 | 12 ++++++++++++ data/doc/sisu/CHANGELOG_v3 | 12 ++++++++++++ lib/sisu/v2/dal_syntax.rb | 2 +- lib/sisu/v3/dal_syntax.rb | 2 +- 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2 index 23c482e3..cdd738a6 100644 --- a/data/doc/sisu/CHANGELOG_v2 +++ b/data/doc/sisu/CHANGELOG_v2 @@ -22,6 +22,18 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.8.2.orig.tar.gz for mail, (removes occasional interference with urls having embedded email addresses) + * dal_syntax: (internal document) link matching, a fix + + [Debian-live, live-manual (Jose Luis Zabalza, Ben Armstrong, reported bug in + Spanish translation markup (that crashed the pdf generator). Bug in markup + subsequently identified as "versátil,#{iso-hybrid}#, se" which the interpreter + identified as an internal document link to a comma (instead of as being + monospace markup), markup should have been "versátil, #{iso-hybrid}#, se" this + fix prevents that incorrect match, (but the markup remains faulty and the + monospace markup is not identified as such without the corrected spacing). + Unfortunate "grave" results for what is a pretty insignificant data entry + typo (there are no doubt other such situations).] + * texpdf: url (regex) pattern match fix (/https?/) %% 2.8.1.orig.tar.gz (2011-03-05:09/6) diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index 97d15bf3..9814094d 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -23,6 +23,18 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.3.orig.tar.gz for mail, (removes occasional interference with urls having embedded email addresses) + * dal_syntax: (internal document) link matching, a fix + + [Debian-live, live-manual (Jose Luis Zabalza, Ben Armstrong, reported bug in + Spanish translation markup (that crashed the pdf generator). Bug in markup + subsequently identified as "versátil,#{iso-hybrid}#, se" which the interpreter + identified as an internal document link to a comma (instead of as being + monospace markup), markup should have been "versátil, #{iso-hybrid}#, se" this + fix prevents that incorrect match, (but the markup remains faulty and the + monospace markup is not identified as such without the corrected spacing). + Unfortunate "grave" results for what is a pretty insignificant data entry + typo (there are no doubt other such situations).] + * texpdf: url (regex) pattern match fix (/https?/) %% 3.0.2.orig.tar.gz (2011-03-05:09/6) diff --git a/lib/sisu/v2/dal_syntax.rb b/lib/sisu/v2/dal_syntax.rb index 55556371..76287464 100644 --- a/lib/sisu/v2/dal_syntax.rb +++ b/lib/sisu/v2/dal_syntax.rb @@ -401,7 +401,7 @@ module SiSU_Syntax dob.obj.gsub!(/(^|\s)([a-zA-Z0-9._-]+\@\S+?\.[a-zA-Z0-9._-]+)/,"\\1#{Mx[:url_o]}\\2#{Mx[:url_c]}") dob.obj.gsub!(/(^|[ ])\{\s*(.+?)\s*\}(\S+?)([;,.]?)(?=\s|[#{Mx[:br_line]}#{Mx[:br_paragraph]}#{Mx[:br_nl]}#{Mx[:en_a_o]}#{Mx[:en_b_o]}]|$)/, "\\1#{Mx[:lnk_o]}\\2#{Mx[:lnk_c]}\\3\\4") #any remaining linked text or image - dob.obj.gsub!(/\{\s*(.+?)\s*\}#(\S+?)([;,.]?)(?=\s|[#{Mx[:br_line]}#{Mx[:br_paragraph]}#{Mx[:br_nl]}#{Mx[:en_a_o]}#{Mx[:en_b_o]}]|$)/, + dob.obj.gsub!(/\{\s*(.+?)\s*\}#([a-zA-Z0-9][a-zA-Z0-9_-]*)([;,.]?)(?=\s|[#{Mx[:br_line]}#{Mx[:br_paragraph]}#{Mx[:br_nl]}#{Mx[:en_a_o]}#{Mx[:en_b_o]}]|$)/, "#{Mx[:lnk_o]}\\1#{Mx[:lnk_c]}#{Mx[:rel_o]}\\2#{Mx[:rel_c]}\\3") #any remaining linked text or image, check need dob.obj.gsub!(/\{\s*(.+?)\s*\}(#{Mx[:rel_o]}\S+?#{Mx[:rel_c]})/, "#{Mx[:lnk_o]}\\1#{Mx[:lnk_c]}\\2") #any remaining linked text or image, check need diff --git a/lib/sisu/v3/dal_syntax.rb b/lib/sisu/v3/dal_syntax.rb index 61253561..2f6353bc 100644 --- a/lib/sisu/v3/dal_syntax.rb +++ b/lib/sisu/v3/dal_syntax.rb @@ -407,7 +407,7 @@ module SiSU_Syntax dob.obj.gsub!(/(^|\s)([a-zA-Z0-9._-]+\@\S+?\.[a-zA-Z0-9._-]+)/,"\\1#{Mx[:url_o]}\\2#{Mx[:url_c]}") dob.obj.gsub!(/(^|[ ])\{\s*(.+?)\s*\}(\S+?)([;,.]?)(?=\s|[#{Mx[:br_line]}#{Mx[:br_paragraph]}#{Mx[:br_nl]}#{Mx[:en_a_o]}#{Mx[:en_b_o]}]|$)/, "\\1#{Mx[:lnk_o]}\\2#{Mx[:lnk_c]}\\3\\4") #any remaining linked text or image - dob.obj.gsub!(/\{\s*(.+?)\s*\}#(\S+?)([;,.]?)(?=\s|[#{Mx[:br_line]}#{Mx[:br_paragraph]}#{Mx[:br_nl]}#{Mx[:en_a_o]}#{Mx[:en_b_o]}]|$)/, + dob.obj.gsub!(/\{\s*(.+?)\s*\}#([a-zA-Z0-9][a-zA-Z0-9_-]*)([;,.]?)(?=\s|[#{Mx[:br_line]}#{Mx[:br_paragraph]}#{Mx[:br_nl]}#{Mx[:en_a_o]}#{Mx[:en_b_o]}]|$)/, "#{Mx[:lnk_o]}\\1#{Mx[:lnk_c]}#{Mx[:rel_o]}\\2#{Mx[:rel_c]}\\3") #any remaining linked text or image, check need dob.obj.gsub!(/\{\s*(.+?)\s*\}(#{Mx[:rel_o]}\S+?#{Mx[:rel_c]})/, "#{Mx[:lnk_o]}\\1#{Mx[:lnk_c]}\\2") #any remaining linked text or image, check need -- cgit v1.2.3 From 63251bd46a2936a44b112c9f863c665f6bfe72b2 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 10 Mar 2011 08:50:17 -0500 Subject: v2, v3: dal_substitutions_and_insertions: sisu header matching in codeblock, fix --- data/doc/sisu/CHANGELOG_v2 | 3 +++ data/doc/sisu/CHANGELOG_v3 | 3 +++ lib/sisu/v2/dal_substitutions_and_insertions.rb | 6 +++--- lib/sisu/v3/dal_substitutions_and_insertions.rb | 4 ++-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2 index cdd738a6..a5928f1f 100644 --- a/data/doc/sisu/CHANGELOG_v2 +++ b/data/doc/sisu/CHANGELOG_v2 @@ -34,6 +34,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.8.2.orig.tar.gz Unfortunate "grave" results for what is a pretty insignificant data entry typo (there are no doubt other such situations).] + * dal_substitutions_and_insertions: regex for sisu header matching (in sisu + markup code blocks), a fix + * texpdf: url (regex) pattern match fix (/https?/) %% 2.8.1.orig.tar.gz (2011-03-05:09/6) diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index 9814094d..933e3585 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -35,6 +35,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.3.orig.tar.gz Unfortunate "grave" results for what is a pretty insignificant data entry typo (there are no doubt other such situations).] + * dal_substitutions_and_insertions: regex for sisu header matching (in sisu + markup code blocks), a fix + * texpdf: url (regex) pattern match fix (/https?/) %% 3.0.2.orig.tar.gz (2011-03-05:09/6) diff --git a/lib/sisu/v2/dal_substitutions_and_insertions.rb b/lib/sisu/v2/dal_substitutions_and_insertions.rb index e1326232..c598b990 100644 --- a/lib/sisu/v2/dal_substitutions_and_insertions.rb +++ b/lib/sisu/v2/dal_substitutions_and_insertions.rb @@ -7,7 +7,7 @@ * Author: Ralph Amissah - * Copyright: (C) 1997 - 2010, Ralph Amissah, All Rights Reserved. + * Copyright: (C) 1997 - 2011, Ralph Amissah, All Rights Reserved. * License: GPL 3 or later: @@ -144,8 +144,8 @@ module SiSU_substitute_and_insert para.gsub!(/^(:?A~)\s*$/,'\1~ @title @author') #conditional header para.gsub!(/^((?:[1-9]|:?[A-C])~\S*)\s*$/,'\1~ [Note: heading marker::required title missing]~#') #conditional header for incorporated document 2004w12 if para =~/^@\S+?:/ - para.gsub!(/^@(\S+?):\s+/,"#{Mx[:meta_o]}\\1#{Mx[:meta_c]}") - para.gsub!(/^@(\S+?):([+-])\s+/,"#{Mx[:meta_o]}\\1\\2#{Mx[:meta_c]}") + para.gsub!(/^@(\S+?):(\s+|$)/,"#{Mx[:meta_o]}\\1#{Mx[:meta_c]}\\2") + para.gsub!(/^@(\S+?):([+-])(\s+|$)/,"#{Mx[:meta_o]}\\1\\2#{Mx[:meta_c]}\\3") end end end diff --git a/lib/sisu/v3/dal_substitutions_and_insertions.rb b/lib/sisu/v3/dal_substitutions_and_insertions.rb index 84b58756..cf3309ec 100644 --- a/lib/sisu/v3/dal_substitutions_and_insertions.rb +++ b/lib/sisu/v3/dal_substitutions_and_insertions.rb @@ -144,8 +144,8 @@ module SiSU_substitute_and_insert para.gsub!(/^(:?A~)\s*$/,'\1~ @title @author') #conditional header para.gsub!(/^((?:[1-9]|:?[A-C])~\S*)\s*$/,'\1~ [Note: heading marker::required title missing]~#') #conditional header for incorporated document 2004w12 if para =~/^@\S+?:/ - para.gsub!(/^@(\S+?):\s+/,"#{Mx[:meta_o]}\\1#{Mx[:meta_c]}") - para.gsub!(/^@(\S+?):([+-])\s+/,"#{Mx[:meta_o]}\\1\\2#{Mx[:meta_c]}") + para.gsub!(/^@(\S+?):(\s+|$)/,"#{Mx[:meta_o]}\\1#{Mx[:meta_c]}\\2") + para.gsub!(/^@(\S+?):([+-])(\s+|$)/,"#{Mx[:meta_o]}\\1\\2#{Mx[:meta_c]}\\3") end end end -- cgit v1.2.3 From cbcf26cd1fcb5dd3f839a8b5de8caf441d957b5f Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 10 Mar 2011 08:53:34 -0500 Subject: v2, v3: dal_doc_str: fix, looks like typo in regex --- data/doc/sisu/CHANGELOG_v2 | 2 ++ data/doc/sisu/CHANGELOG_v3 | 2 ++ lib/sisu/v2/dal_doc_str.rb | 2 +- lib/sisu/v3/dal_doc_str.rb | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2 index a5928f1f..56452604 100644 --- a/data/doc/sisu/CHANGELOG_v2 +++ b/data/doc/sisu/CHANGELOG_v2 @@ -37,6 +37,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.8.2.orig.tar.gz * dal_substitutions_and_insertions: regex for sisu header matching (in sisu markup code blocks), a fix + * dal_doc_str: fix, looks like typo in regex + * texpdf: url (regex) pattern match fix (/https?/) %% 2.8.1.orig.tar.gz (2011-03-05:09/6) diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index 933e3585..5327e85e 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -38,6 +38,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.3.orig.tar.gz * dal_substitutions_and_insertions: regex for sisu header matching (in sisu markup code blocks), a fix + * dal_doc_str: fix, looks like typo in regex + * texpdf: url (regex) pattern match fix (/https?/) %% 3.0.2.orig.tar.gz (2011-03-05:09/6) diff --git a/lib/sisu/v2/dal_doc_str.rb b/lib/sisu/v2/dal_doc_str.rb index bca3cf7d..56bf205f 100644 --- a/lib/sisu/v2/dal_doc_str.rb +++ b/lib/sisu/v2/dal_doc_str.rb @@ -330,7 +330,7 @@ module SiSU_document_structure_extract sub_array=t_o.dup + "#{Mx[:br_nl]}" @line_mode=sub_array.scan(/.+/) @line_mode=[] - sub_array.scan(/.+/) {|w| @line_mode << w if w =~/[\Ss]+/} + sub_array.scan(/.+/) {|w| @line_mode << w if w =~/[\S]+/} t_o=SiSU_document_structure_extract::Build.new(@md,@line_mode).build_lines('code').join @tuned_code << t_o t_o=nil diff --git a/lib/sisu/v3/dal_doc_str.rb b/lib/sisu/v3/dal_doc_str.rb index 365973eb..6ce77057 100644 --- a/lib/sisu/v3/dal_doc_str.rb +++ b/lib/sisu/v3/dal_doc_str.rb @@ -335,7 +335,7 @@ module SiSU_document_structure_extract sub_array=t_o.dup + "#{Mx[:br_nl]}" @line_mode=sub_array.scan(/.+/) @line_mode=[] - sub_array.scan(/.+/) {|w| @line_mode << w if w =~/[\Ss]+/} + sub_array.scan(/.+/) {|w| @line_mode << w if w =~/[\S]+/} t_o=SiSU_document_structure_extract::Build.new(@md,@line_mode).build_lines('code').join @tuned_code << t_o t_o=nil -- cgit v1.2.3 From 93308a6a6decab0ca708bdd893d2c5eecdf5fb2f Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 10 Mar 2011 08:59:09 -0500 Subject: v3 (v2): manpage, param, urls: manpage output presentation fixes * manpage: lowercase .br; correct newlines before .nf and after .fi; no escape of hyphens; remove redundant links; endnotes array requires flatten; screen info on output path) * param: manpage header .br and no escape of hyphens * urls: correct output path for manpage --- data/doc/sisu/CHANGELOG_v2 | 3 +++ data/doc/sisu/CHANGELOG_v3 | 7 +++++++ lib/sisu/v2/manpage.rb | 26 ++++++++------------------ lib/sisu/v2/param.rb | 12 +++++------- lib/sisu/v3/manpage.rb | 35 +++++++++++++---------------------- lib/sisu/v3/param.rb | 10 ++++------ lib/sisu/v3/urls.rb | 2 +- 7 files changed, 41 insertions(+), 54 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2 index 56452604..e27a57d2 100644 --- a/data/doc/sisu/CHANGELOG_v2 +++ b/data/doc/sisu/CHANGELOG_v2 @@ -39,6 +39,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.8.2.orig.tar.gz * dal_doc_str: fix, looks like typo in regex + * manpage output presentation (lowercase .br, correct newlines before .nf and + after .fi; no escape of hyphens) + * texpdf: url (regex) pattern match fix (/https?/) %% 2.8.1.orig.tar.gz (2011-03-05:09/6) diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index 5327e85e..17cd83a3 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -40,6 +40,13 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.3.orig.tar.gz * dal_doc_str: fix, looks like typo in regex + * manpage output presentation fixes + * manpage: (lowercase .br; correct newlines before .nf and + after .fi; no escape of hyphens; remove redundant links; endnotes array + requires flatten; screen info on output path) + * param: manpage header .br and no escape of hyphens + * urls: correct output path for manpage + * texpdf: url (regex) pattern match fix (/https?/) %% 3.0.2.orig.tar.gz (2011-03-05:09/6) diff --git a/lib/sisu/v2/manpage.rb b/lib/sisu/v2/manpage.rb index 18670e2a..a040f1a0 100644 --- a/lib/sisu/v2/manpage.rb +++ b/lib/sisu/v2/manpage.rb @@ -152,7 +152,7 @@ GSUB ) end @@endnotes[:para] << wrap - @@endnotes[:end] << wrap << "\n.BR" + @@endnotes[:end] << wrap << "\n.br" @@endnotes end end @@ -176,16 +176,6 @@ Other versions of this document: .TP manifest: <#{vz.url_root_http}/#{@md.fnb}/#{@md.fn[:manifest]}> .TP -html: <#{vz.url_root_http}/#{@md.fnb}/#{@md.fn[:toc]}> -.TP -epub: <#{vz.url_root_http}/epub/#{@md.fnb}.epub> -.TP -pdf: <#{vz.url_root_http}/#{@md.fnb}/#{@md.fn[:pdf_p]}> -.TP -pdf: <#{vz.url_root_http}/#{@md.fnb}/#{@md.fn[:pdf_l]}> -.\" .TP -.\" manpage: #{vz.url_root_http}/#{@md.fnb}/#{@md.fn[:manpage]} -.TP at: <#{vz.url_site}> .TP #{sc} @@ -231,16 +221,16 @@ WOK times=wrapped.length times=78 if times > 78 @manpage[:body] << case lv - when 1; '.SH ' << @br << wrapped.upcase << @br << '.BR' - when 2..3; '.SH ' << @br << wrapped.upcase << @br << '.BR' - when 4; '.SH ' << @br << wrapped.upcase << @br << '.BR' - when 5..6; '.SH ' << @br << wrapped.upcase << @br + when 1; '.SH ' << wrapped.upcase << @br << '.br' + when 2..3; '.SH ' << wrapped.upcase << @br << '.br' + when 4; '.SH ' << wrapped.upcase << @br << '.br' + when 5..6; '.SH ' << wrapped.upcase << @br end else @manpage[:body] << if wrapped =~/^\.BI\s/ # main text, contents, body KEEP '.TP' << @br << wrapped.gsub!(/^\.BI\s/,'.B ') # sleight ... simpler output else - '.BR' << @br << wrapped + '.br' << @br << wrapped end end if @@endnotes[:para] \ @@ -308,12 +298,12 @@ WOK if dob.is =='code' dob.obj.gsub!(/(^|[^}])_([<>])/m,'\1\2') # _> _< dob.obj.gsub!(/(^|[^}])_([<>])/m,'\1\2') # _<_< - dob.obj.gsub!(/\A(.+)?\Z/m,"\n\n.nf\n\n\\1\n\n.fi\n\n") #dob.obj.gsub!(/\A/,"\n\n.nf\n\n"); #dob.obj.gsub!(/\Z/,"\n\n.fi\n\n") #bug, .fi repeats + dob.obj.gsub!(/\A(.+)?\Z/m,".nf\n\n\\1\n\n.fi") end else dob.obj.gsub!(/(?:#{Mx[:br_line]}|#{Mx[:br_nl]})\s*/,"\n\n") #unless para =~/#{Mx[:lv_o]}\d:/ #watch introduces a bug end - dob.obj.gsub!(/(?:#{Mx[:br_line]}|#{Mx[:br_nl]})+\s*/,"\n\n.BR\n\n") # watch + dob.obj.gsub!(/(?:#{Mx[:br_line]}|#{Mx[:br_nl]})+\s*/,"\n\n.br\n\n") # watch blit=dob.obj.scan(/\[[^\]]+\]|[^\[]+/) blit_array=[] blit.each do |x| diff --git a/lib/sisu/v2/param.rb b/lib/sisu/v2/param.rb index 207154b0..655177a7 100644 --- a/lib/sisu/v2/param.rb +++ b/lib/sisu/v2/param.rb @@ -7,7 +7,7 @@ * Author: Ralph Amissah - * Copyright: (C) 1997 - 2010, Ralph Amissah, All Rights Reserved. + * Copyright: (C) 1997 - 2011, Ralph Amissah, All Rights Reserved. * License: GPL 3 or later: @@ -732,16 +732,14 @@ module SiSU_Param end end if manpage['name'] - manpage['name']=manpage['name'].join("\n.BR\n") - manpage['name'].gsub!(/(-)/m,"\\\\\\1") - manpage['name'].gsub!(/\A/,"\n.SH NAME\n") + manpage['name']=manpage['name'].join("\n.br\n") + manpage['name'].gsub!(/\A/,"\n.br\n.SH NAME\n.br\n") else manpage['name']='man page "name/whatis" information not provided, set in header @man: name=[whatis information]' end if manpage['synopsis'] - manpage['synopsis']=manpage['synopsis'].join("\n\n.BR\n") - manpage['synopsis'].gsub!(/(-)/m,"\\\\\\1") - manpage['synopsis'].gsub!(/\A/,"\n.SH SYNOPSIS\n") + manpage['synopsis']=manpage['synopsis'].join("\n\n.br\n") + manpage['synopsis'].gsub!(/\A/,"\n.br\n.SH SYNOPSIS\n.br\n") else manpage['synopsis']='' end diff --git a/lib/sisu/v3/manpage.rb b/lib/sisu/v3/manpage.rb index e4cb6906..362d9cda 100644 --- a/lib/sisu/v3/manpage.rb +++ b/lib/sisu/v3/manpage.rb @@ -84,10 +84,10 @@ module SiSU_Manpage @env=SiSU_Env::Info_env.new(@opt.fns) path=@env.path.output_tell tool=(@opt.cmd =~/[MVv]/) \ - ? "#{@env.program.text_editor} #{path}/man/#{@md.fn[:manpage]}" \ + ? "#{@env.program.text_editor} #{@md.file.output_path.manpage}/#{@md.file.base_filename.manpage}" \ : '' SiSU_Screen::Ansi.new(@opt.cmd,'Manpage',tool).green_hi_blue unless @opt.cmd =~/q/ - SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@env.path.output_tell}/man/#{@md.fn[:manpage]}").flow if @opt.cmd =~/[MV]/ + SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@md.file.output_path.manpage}/#{@md.file.base_filename.manpage}").flow if @opt.cmd =~/[MV]/ @dal_array=SiSU_DAL::Source.new(@opt).get # dal file drawn here SiSU_Manpage::Source::Scroll.new(@md,@dal_array).songsheet SiSU_Env::Info_skin.new(@md).select #watch @@ -118,7 +118,7 @@ module SiSU_Manpage def extract_endnotes(para='') notes=para.scan(/(?:#{Mx[:en_a_o]}|#{Mx[:en_b_o]})([\d*+]+\s+.+?)\s*(?:#{Mx[:en_a_c]}|#{Mx[:en_b_c]})/m) @n=[] - notes.each do |n| #high cost to deal with
appropriately within manpage, consider + notes.flatten.each do |n| #high cost to deal with
appropriately within manpage, consider n=n.dup.to_s if n =~/#{Mx[:br_line]}/ fix = n.split(/\s*#{Mx[:br_line]}+\s*/) #watch #added @@ -151,7 +151,7 @@ GSUB ) end @@endnotes[:para] << wrap - @@endnotes[:end] << wrap << "\n.BR" + @@endnotes[:end] << wrap << "\n.br" @@endnotes end end @@ -175,16 +175,6 @@ Other versions of this document: .TP manifest: <#{vz.url_root_http}/#{@md.fnb}/#{@md.fn[:manifest]}> .TP -html: <#{vz.url_root_http}/#{@md.fnb}/#{@md.fn[:toc]}> -.TP -epub: <#{vz.url_root_http}/epub/#{@md.fnb}.epub> -.TP -pdf: <#{vz.url_root_http}/#{@md.fnb}/#{@md.fn[:pdf_p]}> -.TP -pdf: <#{vz.url_root_http}/#{@md.fnb}/#{@md.fn[:pdf_l]}> -.\" .TP -.\" manpage: #{vz.url_root_http}/#{@md.fnb}/#{@md.fn[:manpage]} -.TP at: <#{vz.url_site}> .TP #{sc} @@ -230,16 +220,16 @@ WOK times=wrapped.length times=78 if times > 78 @manpage[:body] << case lv - when 1; '.SH ' << @br << wrapped.upcase << @br << '.BR' - when 2..3; '.SH ' << @br << wrapped.upcase << @br << '.BR' - when 4; '.SH ' << @br << wrapped.upcase << @br << '.BR' - when 5..6; '.SH ' << @br << wrapped.upcase << @br + when 1; '.SH ' << wrapped.upcase << @br << '.br' + when 2..3; '.SH ' << wrapped.upcase << @br << '.br' + when 4; '.SH ' << wrapped.upcase << @br << '.br' + when 5..6; '.SH ' << wrapped.upcase << @br end else @manpage[:body] << if wrapped =~/^\.BI\s/ # main text, contents, body KEEP '.TP' << @br << wrapped.gsub!(/^\.BI\s/,'.B ') # sleight ... simpler output else - '.BR' << @br << wrapped + '.br' << @br << wrapped end end if @@endnotes[:para] \ @@ -296,7 +286,8 @@ WOK dob.obj.gsub!(/#{Mx[:gl_o]}#126#{Mx[:gl_c]}/,'~') dob.obj.gsub!(/#{Mx[:gl_o]}#169#{Mx[:gl_c]}/,'©') else - dob.obj.gsub!(/(?:#{Mx[:br_line]}|#{Mx[:br_nl]})+\s*/,"\n") # watch + dob.obj.gsub!(/(?:#{Mx[:br_line]}|#{Mx[:br_nl]})\s*/,"\n\n") # watch + #dob.obj.gsub!(/(?:#{Mx[:br_line]}|#{Mx[:br_nl]})+\s*/,"\n") # watch end dob.obj.gsub!(/(^| |#{Mx[:nbsp]}|\s|\*)\\\*/,'\1\\\\\*') #man page requires dob.obj.gsub!(/┆/,'|') @@ -307,12 +298,12 @@ WOK if dob.is =='code' dob.obj.gsub!(/(^|[^}])_([<>])/m,'\1\2') # _> _< dob.obj.gsub!(/(^|[^}])_([<>])/m,'\1\2') # _<_< - dob.obj.gsub!(/\A(.+)?\Z/m,"\n\n.nf\n\n\\1\n\n.fi\n\n") #dob.obj.gsub!(/\A/,"\n\n.nf\n\n"); #dob.obj.gsub!(/\Z/,"\n\n.fi\n\n") #bug, .fi repeats + dob.obj.gsub!(/\A(.+)?\Z/m,".nf\n\n\\1\n\n.fi") end else dob.obj.gsub!(/(?:#{Mx[:br_line]}|#{Mx[:br_nl]})\s*/,"\n\n") #unless para =~/#{Mx[:lv_o]}\d:/ #watch introduces a bug end - dob.obj.gsub!(/(?:#{Mx[:br_line]}|#{Mx[:br_nl]})+\s*/,"\n\n.BR\n\n") # watch + dob.obj.gsub!(/(?:#{Mx[:br_line]}|#{Mx[:br_nl]})+\s*/,"\n\n.br\n\n") # watch blit=dob.obj.scan(/\[[^\]]+\]|[^\[]+/) blit_array=[] blit.each do |x| diff --git a/lib/sisu/v3/param.rb b/lib/sisu/v3/param.rb index 9dfbc70f..8ae87010 100644 --- a/lib/sisu/v3/param.rb +++ b/lib/sisu/v3/param.rb @@ -743,16 +743,14 @@ module SiSU_Param end end if manpage['name'] - manpage['name']=manpage['name'].join("\n.BR\n") - manpage['name'].gsub!(/(-)/m,"\\\\\\1") - manpage['name'].gsub!(/\A/,"\n.SH NAME\n") + manpage['name']=manpage['name'].join("\n.br\n") + manpage['name'].gsub!(/\A/,"\n.br\n.SH NAME\n.br\n") else manpage['name']='man page "name/whatis" information not provided, set in header @man: name=[whatis information]' end if manpage['synopsis'] - manpage['synopsis']=manpage['synopsis'].join("\n\n.BR\n") - manpage['synopsis'].gsub!(/(-)/m,"\\\\\\1") - manpage['synopsis'].gsub!(/\A/,"\n.SH SYNOPSIS\n") + manpage['synopsis']=manpage['synopsis'].join("\n\n.br\n") + manpage['synopsis'].gsub!(/\A/,"\n.br\n.SH SYNOPSIS\n.br\n") else manpage['synopsis']='' end diff --git a/lib/sisu/v3/urls.rb b/lib/sisu/v3/urls.rb index 127a17c2..900d9849 100644 --- a/lib/sisu/v3/urls.rb +++ b/lib/sisu/v3/urls.rb @@ -230,7 +230,7 @@ module SiSU_urls end if x=~/^i/ \ and @opt.cmd =~/i/ - SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.manpage_viewer} #{@env.processing_path.manpage}/#{@fnb}.1").result + SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.manpage_viewer} #{@md.file.output_path.manpage}/#{@md.file.base_filename.manpage}").result end if x=~/^N/ \ and @opt.cmd =~/N/ -- cgit v1.2.3 From e4ca6d0451ec7497b55af5ae30540dd4a1e724ca Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 10 Mar 2011 09:01:39 -0500 Subject: v2, v3: help (markup): correct path to markup-samples --- data/doc/sisu/CHANGELOG_v2 | 2 ++ data/doc/sisu/CHANGELOG_v3 | 2 ++ lib/sisu/v2/help.rb | 25 +++++-------------------- lib/sisu/v3/help.rb | 19 ++----------------- 4 files changed, 11 insertions(+), 37 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2 index e27a57d2..330a1cbc 100644 --- a/data/doc/sisu/CHANGELOG_v2 +++ b/data/doc/sisu/CHANGELOG_v2 @@ -44,6 +44,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.8.2.orig.tar.gz * texpdf: url (regex) pattern match fix (/https?/) + * help (markup): correct path to markup-samples + %% 2.8.1.orig.tar.gz (2011-03-05:09/6) http://www.jus.uio.no/sisu/pkg/src/sisu_2.8.1.orig.tar.gz sisu_2.8.1.orig.tar.gz diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index 17cd83a3..bd0cca64 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -49,6 +49,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.3.orig.tar.gz * texpdf: url (regex) pattern match fix (/https?/) + * help (markup): correct path to markup-samples + %% 3.0.2.orig.tar.gz (2011-03-05:09/6) http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.2-1 http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.2.orig.tar.gz diff --git a/lib/sisu/v2/help.rb b/lib/sisu/v2/help.rb index b07ab6ed..85bb898c 100644 --- a/lib/sisu/v2/help.rb +++ b/lib/sisu/v2/help.rb @@ -7,7 +7,7 @@ * Author: Ralph Amissah - * Copyright: (C) 1997 - 2010, Ralph Amissah, All Rights Reserved. + * Copyright: (C) 1997 - 2011, Ralph Amissah, All Rights Reserved. * License: GPL 3 or later: @@ -1426,7 +1426,7 @@ WOK sisu --help example sample marked up documents are provided in directory: - #{@cX.green}sisu-examples/sample/document_samples_sisu_markup/#{@cX.off} + #{@cX.green}/usr/share/doc/sisu/markup-samples#{@cX.off} and online #{@cX.green}www.jus.uio.no/sisu#{@cX.off} WOK @@ -1672,22 +1672,7 @@ WOK def hyperestraier out_dir='(' + `ls #{@env.path.webserv}`.split("\n").join('|') + ')' print < Date: Thu, 10 Mar 2011 09:05:55 -0500 Subject: documentation more link fixes (remove redundant), remove repeated skin --- data/doc/sisu/CHANGELOG_v2 | 2 ++ data/doc/sisu/CHANGELOG_v3 | 2 ++ .../sisu_manual/_sisu/skin/dir/skin_sisu.rb | 1 - data/doc/sisu/markup-samples/sisu_manual/sisu.ssm | 2 +- .../markup-samples/sisu_manual/sisu_download.ssi | 4 --- .../sisu/markup-samples/sisu_manual/sisu_help.sst | 16 ----------- .../sisu_manual/sisu_help_sources.sst | 32 +++------------------- .../sisu/markup-samples/sisu_manual/sisu_howto.sst | 14 +++++----- .../sisu_manual/sisu_hyperestraier.ssi | 2 +- .../markup-samples/sisu_manual/sisu_markup.sst | 28 +++++++++---------- .../markup-samples/sisu_manual/sisu_quickstart.sst | 2 +- 11 files changed, 31 insertions(+), 74 deletions(-) delete mode 120000 data/doc/sisu/markup-samples/sisu_manual/_sisu/skin/dir/skin_sisu.rb diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2 index 330a1cbc..3751d9dc 100644 --- a/data/doc/sisu/CHANGELOG_v2 +++ b/data/doc/sisu/CHANGELOG_v2 @@ -46,6 +46,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.8.2.orig.tar.gz * help (markup): correct path to markup-samples + * documentation more link fixes + %% 2.8.1.orig.tar.gz (2011-03-05:09/6) http://www.jus.uio.no/sisu/pkg/src/sisu_2.8.1.orig.tar.gz sisu_2.8.1.orig.tar.gz diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index bd0cca64..e60a8ec3 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -51,6 +51,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.3.orig.tar.gz * help (markup): correct path to markup-samples + * documentation more link fixes + %% 3.0.2.orig.tar.gz (2011-03-05:09/6) http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.2-1 http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.2.orig.tar.gz diff --git a/data/doc/sisu/markup-samples/sisu_manual/_sisu/skin/dir/skin_sisu.rb b/data/doc/sisu/markup-samples/sisu_manual/_sisu/skin/dir/skin_sisu.rb deleted file mode 120000 index 77ee1e13..00000000 --- a/data/doc/sisu/markup-samples/sisu_manual/_sisu/skin/dir/skin_sisu.rb +++ /dev/null @@ -1 +0,0 @@ -../doc/skin_sisu.rb \ No newline at end of file diff --git a/data/doc/sisu/markup-samples/sisu_manual/sisu.ssm b/data/doc/sisu/markup-samples/sisu_manual/sisu.ssm index 64debc90..c26aeabd 100644 --- a/data/doc/sisu/markup-samples/sisu_manual/sisu.ssm +++ b/data/doc/sisu/markup-samples/sisu_manual/sisu.ssm @@ -19,7 +19,7 @@ :created: 2002-08-28 :issued: 2002-08-28 :available: 2002-08-28 - :modified: 2011-03-04 + :modified: 2011-03-09 @make: :num_top: 1 diff --git a/data/doc/sisu/markup-samples/sisu_manual/sisu_download.ssi b/data/doc/sisu/markup-samples/sisu_manual/sisu_download.ssi index 2dc2462c..e028a3cf 100644 --- a/data/doc/sisu/markup-samples/sisu_manual/sisu_download.ssi +++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_download.ssi @@ -116,8 +116,6 @@ 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. @@ -131,5 +129,3 @@ _* {~^ sisu-markup-samples_2.0.3.orig-2.noarch.rpm }http://www.jus.uio.no/sisu/p 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/markup-samples/sisu_manual/sisu_help.sst b/data/doc/sisu/markup-samples/sisu_manual/sisu_help.sst index 4f273f4a..6c824da8 100644 --- a/data/doc/sisu/markup-samples/sisu_manual/sisu_help.sst +++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_help.sst @@ -72,10 +72,6 @@ If SiSU is installed on your system usual man commands should be available, try: _1 man sisu -_1 man sisu_markup - -_1 man sisu_commands - Most SiSU man pages are generated directly from sisu documents that are used to prepare the sisu manual, the sources files for which are located within the SiSU tarball at: _1 ./data/doc/sisu/markup-samples/sisu_manual @@ -117,15 +113,3 @@ _1 sisu (on its own provides version and some help information) Apart from real-time information on your current configuration the SiSU manual and man pages are likely to contain more up-to-date information than the sisu interactive help (for example on commands and markup). NOTE: Running the command sisu (alone without any flags, filenames or wildcards) brings up the interactive help, as does any sisu command that is not recognised. Enter to escape. - -2~ Help Sources - -For lists of alternative help sources, see: - -!_ man page - -_1 man sisu_help_sources - -!_ man2html - -_1 /usr/share/doc/sisu/html/sisu.1.html diff --git a/data/doc/sisu/markup-samples/sisu_manual/sisu_help_sources.sst b/data/doc/sisu/markup-samples/sisu_manual/sisu_help_sources.sst index 2cf2ba10..69a905f2 100644 --- a/data/doc/sisu/markup-samples/sisu_manual/sisu_help_sources.sst +++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_help_sources.sst @@ -47,32 +47,8 @@ 1~help_sources Help Sources -For a summary of alternative ways to get help on SiSU try one of the following: - -!_ man page - -_1 man sisu_help - -!_ man2html - -_1 http://www.jus.uio.no/sisu/man/sisu_help.1.html - -!_ sisu generated output - links to html - -_1 http://sisudoc.org/sisu/sisu_help/index.html - -!_ help sources lists - -Alternative sources for this help sources page listed here: - -_1 man sisu_help_sources - -_1 http://sisudoc.org/sisu/sisu_help_sources/index.html - 2~ man pages -3~ man - _1 man sisu _1 man sisu-concordance @@ -127,13 +103,13 @@ file:///usr/share/doc/sisu/html/sisu.1.html _1 file:///usr/share/doc/sisu/html/sisu.1.html -_1 file:///usr/share/doc/sisu/html/sisu_pdf.7.html +_1 /usr/share/doc/sisu/html/sisu_pdf.7.html -_1 file:///usr/share/doc/sisu/html/sisu_postgresql.7.html +_1 /usr/share/doc/sisu/html/sisu_postgresql.7.html -_1 file:///usr/share/doc/sisu/html/sisu_sqlite.7.html +_1 /usr/share/doc/sisu/html/sisu_sqlite.7.html -_1 file:///usr/share/doc/sisu/html/sisu_webrick.1.html +_1 /usr/share/doc/sisu/html/sisu_webrick.1.html 3~ www.jus.uio.no/sisu diff --git a/data/doc/sisu/markup-samples/sisu_manual/sisu_howto.sst b/data/doc/sisu/markup-samples/sisu_manual/sisu_howto.sst index 34a4eab1..9464ce64 100644 --- a/data/doc/sisu/markup-samples/sisu_manual/sisu_howto.sst +++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_howto.sst @@ -590,7 +590,7 @@ There are a few examples provided, on untarring the source tarball: _1 conf/sisu/skin/doc/ -_1 data/sisu-examples/sample/document_samples_sisu_markup/_sisu/skin/doc +_1 data/doc/sisu/markup-samples/samples/_sisu/skin/doc/ and on installation under: @@ -842,7 +842,7 @@ _1 ruby ./sisu-install -T 2~ Dependencies -Once installed see 'man 8 sisu' for some information on additional programs that sisu makes use of, and that you may need or wish to install. (this will depend on such factors as whether you want to generate pdf, whether you will be using SiSU with or without a database, ...) 'man sisu_markup-samples' may also be of interest if the sisu-markup-samples package has also been installed. +Once installed see 'man 8 sisu' for some information on additional programs that sisu makes use of, and that you may need or wish to install. (this will depend on such factors as whether you want to generate pdf, whether you will be using SiSU with or without a database, ...) 'man sisu-markup-samples' may also be of interest if the sisu-markup-samples package has also been installed. The information in man 8 may not be most up to date, and it is possible that more useful information can be gleaned from the following notes taken from the Debian control file (end edited), gives an idea of additional packages that SiSU can make use of if available, (the use/requirement of some of which are interdependent for specific actions by SiSU). @@ -1018,7 +1018,7 @@ the first document). After installation of sisu-complete, move to the document samples directory -_1 cd /usr/share/doc/sisu/v2/sisu_markup_samples/samples +_1 cd /usr/share/doc/sisu/markup-samples/samples and run @@ -1169,15 +1169,15 @@ _1 sisu --help headers Sample marked up document are provided with the download tarball in the directory: -_1 ./data/doc/sisu/sisu_markup_samples/dfsg +_1 ./data/doc/sisu/markup-samples/ These are installed on the system usually at: -_1 /usr/share/doc/sisu/markup-samples/samples +_1 /usr/share/doc/sisu/markup-samples/ More markup samples are available in the package sisu-markup-samples, which if installed should be available at: -_1 /usr/share/doc/sisu/markup-samples-non-free/samples +_1 /usr/share/doc/sisu/markup-samples-non-free/ Many more are available online off: @@ -1235,7 +1235,7 @@ _1 http://www.jus.uio.no/sisu/SiSU/changelog_markup_samples.html After installation of sisu-complete, move to the document samples directory, -_1 cd /usr/share/doc/sisu/v2/sisu_markup_samples/samples +_1 cd /usr/share/doc/sisu/markup-samples/samples [this is not where you would normally work but provides sample documents for testing, you may prefer instead to copy the contents of that directory to a local diff --git a/data/doc/sisu/markup-samples/sisu_manual/sisu_hyperestraier.ssi b/data/doc/sisu/markup-samples/sisu_manual/sisu_hyperestraier.ssi index d1a902e7..8cef8faa 100644 --- a/data/doc/sisu/markup-samples/sisu_manual/sisu_hyperestraier.ssi +++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_hyperestraier.ssi @@ -38,7 +38,7 @@ on sisu_hyperestraier: _1 man sisu_hyperestraier -_1 /usr/share/doc/sisu/sisu_markup/sisu_hyperestraier/index.html +_1 /usr/share/doc/sisu/sisu-markup/sisu_hyperestraier/index.html NOTE: the examples that follow assume that sisu output is placed in the directory /home/ralph/sisu_www diff --git a/data/doc/sisu/markup-samples/sisu_manual/sisu_markup.sst b/data/doc/sisu/markup-samples/sisu_manual/sisu_markup.sst index 90cce5ca..65dc4e91 100644 --- a/data/doc/sisu/markup-samples/sisu_manual/sisu_markup.sst +++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_markup.sst @@ -94,13 +94,11 @@ Online markup examples are available together with the respective outputs produc There is of course this document, which provides a cursory overview of sisu markup and the respective output produced: http://www.jus.uio.no/sisu/sisu_markup/ -Some example marked up files are available as html with syntax highlighting for viewing: http://www.jus.uio.no/sisu/sample/syntax - -an alternative presentation of markup syntax: http://www.jus.uio.no/sisu/sample/on_markup.txt +an alternative presentation of markup syntax: /usr/share/doc/sisu/on_markup.txt.gz 3~ Installed -With SiSU installed sample skins may be found in: /usr/share/doc/sisu/sisu_markup_samples/dfsg (or equivalent directory) and if sisu-markup-samples is installed also under: /usr/share/doc/sisu/sisu_markup_samples/non-free +With SiSU installed sample skins may be found in: /usr/share/doc/sisu/markup-samples (or equivalent directory) and if sisu-markup-samples is installed also under: /usr/share/doc/sisu/markup-samples-non-free 1~headers Markup of Headers @@ -155,19 +153,19 @@ code{ . sisu [-Ddcv] [instruction] . sisu [-CcFLSVvW] . sisu --v2 [operations] - . sisu --v1 [operations] + . sisu --v3 [operations] @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/ + { SiSU Homepage }http://www.sisudoc.org/ + { SiSU Manual }http://www.sisudoc.org/sisu/sisu_manual/ + { Book Samples & Markup Examples }http://www.jus.uio.no/sisu/SiSU/examples.html + { SiSU Download }http://www.jus.uio.no/sisu/SiSU/download.html + { SiSU Changelog }http://www.jus.uio.no/sisu/SiSU/changelog.html + { SiSU Git repo }http://git.sisudoc.org/?p=code/sisu.git;a=summary + { SiSU List Archives }http://lists.sisudoc.org/pipermail/sisu/ + { SiSU @ Debian }http://packages.qa.debian.org/s/sisu.html + { SiSU Project @ Debian }http://qa.debian.org/developer.php?login=sisu@lists.sisudoc.org + { SiSU @ Wikipedia }http://en.wikipedia.org/wiki/SiSU }code diff --git a/data/doc/sisu/markup-samples/sisu_manual/sisu_quickstart.sst b/data/doc/sisu/markup-samples/sisu_manual/sisu_quickstart.sst index 6557a0cd..1d4b2ce1 100644 --- a/data/doc/sisu/markup-samples/sisu_manual/sisu_quickstart.sst +++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_quickstart.sst @@ -193,7 +193,7 @@ or change directory to the appropriate one: -cd /usr/share/doc/sisu/sisu_markup_samples/dfsg +cd /usr/share/doc/sisu/markup-samples/samples 3~ basic text, plaintext, html, XML, ODF, EPUB -- cgit v1.2.3 From 57ad1a1e1e5c31669eedd8c319f9ba5feb1aab6f Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 10 Mar 2011 09:07:26 -0500 Subject: manpage: sisu.1 and html regenerated --- data/doc/sisu/html/sisu.1.html | 4780 ++++++++++++++++++++++++---------------- man/man1/sisu.1 | 2452 ++++++++++----------- 2 files changed, 4024 insertions(+), 3208 deletions(-) diff --git a/data/doc/sisu/html/sisu.1.html b/data/doc/sisu/html/sisu.1.html index 1a598784..357adb3b 100644 --- a/data/doc/sisu/html/sisu.1.html +++ b/data/doc/sisu/html/sisu.1.html @@ -7,280 +7,310 @@ Table of Contents

+

Name

-sisu - documents: markup, structuring, publishing in multiple standard -formats, and search +
+sisu - documents: markup, structuring, publishing in multiple standard formats, +and search
+

Synopsis

-sisu [-abcDdFehIiMmNnopqRrSsTtUuVvwXxYyZz0-9] -[filename/wildcard] -

sisu [-Ddcv] [instruction] [filename/wildcard] -

sisu -[-CcFLSVvW] -

sisu --v2 [operations] -

sisu --v3 [operations] -

sisu3 [operations] -SISU - MANUAL, RALPH AMISSAH -

WHAT IS SISU? -

1. INTRODUCTION - WHAT IS SISU? -

SiSU is a framework for document structuring, publishing (in multiple -open standard formats) and search, comprising of: (a) a lightweight document +
+sisu [-abcDdFehIiMmNnopqRrSsTtUuVvwXxYyZz0-9] [filename/wildcard] +


+sisu [-Ddcv] [instruction] [filename/wildcard] +


+sisu [-CcFLSVvW] +


+sisu --v2 [operations] +


+sisu --v3 [operations] +


+sisu3 [operations] +

Sisu - Manual,

+RALPH AMISSAH
+ +

+

What is Sisu?

+
+ +

+

1. Introduction - What is Sisu?

+
+ +


+SiSU is a framework for document structuring, publishing (in multiple open +standard formats) and search, comprising of: (a) a lightweight document structure and presentation markup syntax; and (b) an accompanying engine for generating standard document format outputs from documents prepared in sisu markup syntax, which is able to produce multiple standard outputs (including the population of sql databases) that (can) share a common numbering system for the citation of text within a document. -

SiSU is developed under -an open source, software libre license (GPL3). Its use case for development -is work with medium to large document sets and cope with evolving document -formats/ representation technologies. Documents are prepared once, and generated -as need be to update the technical presentation or add additional output -formats. Various output formats (including search related output) share -a common mechanism for cross-output-format citation. -

SiSU both defines a -markup syntax and provides an engine that produces open standards format -outputs from documents prepared with SiSU markup. From a single lightly -prepared document sisu custom builds several standard output formats which -share a common (text object) numbering system for citation of content within -a document (that also has implications for search). The sisu engine works -with an abstraction of the document’s structure and content from which it -is possible to generate different forms of representation of the document. -Significantly SiSU markup is more sparse than html and outputs which include -html, EPUB, LaTeX, landscape and portrait pdfs, Open Document Format (ODF), -all of which can be added to and updated. SiSU is also able to populate -SQL type databases at an object level, which means that searches can be -made with that degree of granularity. -

Source document preparation and -output generation is a two step process: (i) document source is prepared, -that is, marked up in sisu markup syntax and (ii) the desired output subsequently -generated by running the sisu engine against document source. Output representations -if updated (in the sisu engine) can be generated by re-running the engine -against the prepared source. Using SiSU markup applied to a document, SiSU -custom builds (to take advantage of the strengths of different ways of -representing documents) various standard open output formats including -plain text, HTML, XHTML, XML, EPUB, OpenDocument, LaTeX or PDF files, and -populate an SQL database with objects[^1] (equating generally to paragraph-sized -chunks) so searches may be performed and matches returned with that degree -of granularity ( e.g. your search criteria is met by these documents and -at these locations within each document). Document output formats share -a common object numbering system for locating content. This is particularly -suitable for "published" works (finalized texts as opposed to works that -are frequently changed or updated) for which it provides a fixed means -of reference of content. -

In preparing a SiSU document you optionally provide -semantic information related to the document in a document header, and -in marking up the substantive text provide information on the structure -of the document, primarily indicating heading levels and footnotes. You -also provide information on basic text attributes where used. The rest is -automatic, sisu from this information custom builds[^2] the different forms -of output requested. -

SiSU works with an abstraction of the document based -on its structure which is comprised of its headings[^3] and objects[^4], -which enables SiSU to represent the document in many different ways, and -to take advantage of the strengths of different ways of presenting documents. -The objects are numbered, and these numbers can be used to provide a common -basis for citing material within a document across the different output -format types. This is significant as page numbers are not well suited to -the digital age, in web publishing, changing a browser’s default font or -using a different browser can mean that text will appear on a different -page; and publishing in different formats, html, landscape and portrait -pdf etc. again page numbers are not useful to cite text. Dealing with documents -at an object level together with object numbering also has implications -for search that SiSU is able to take advantage of. -

One of the challenges -of maintaining documents is to keep them in a format that allows use of -them independently of proprietary platforms. Consider issues related to -dealing with legacy proprietary formats today and what guarantee you have -that old proprietary formats will remain (or can be read without proprietary -software/equipment) in 15 years time, or the way the way in which html -has evolved over its relatively short span of existence. SiSU provides the -flexibility of producing documents in multiple non-proprietary open formats -including html, pdf[^5] ODF,[^6] and EPUB.[^7] Whilst SiSU relies on software, -the markup is uncomplicated and minimalistic which guarantees that future -engines can be written to run against it. It is also easily converted to -other formats, which means documents prepared in SiSU can be migrated to -other document formats. Further security is provided by the fact that the -software itself, SiSU is available under GPL3 a licence that guarantees -that the source code will always be open, and free as in libre, which means -that that code base can be used, updated and further developed as required -under the terms of its license. Another challenge is to keep up with a moving -target. SiSU permits new forms of output to be added as they become important, -(Open Document Format text was added in 2006 when it became an ISO standard -for office applications and the archival of documents), EPUB was introduced -in 2009; and allows the technical representations existing output to be -updated (html has evolved and the related module has been updated repeatedly -over the years, presumably when the World Wide Web Consortium (w3c) finalises -html 5 which is currently under development, the html module will again -be updated allowing all existing documents to be regenerated as html 5). - -

The document formats are written to the file-system and available for -indexing by independent indexing tools, whether off the web like Google -and Yahoo or on the site like Lucene and Hyperestraier. -

SiSU also provides -other features such as concordance files and document content certificates, -and the working against an abstraction of document structure has further -possibilities for the research and development of other document representations, -the availability of objects is useful for example for topic maps and thesauri, -together with the flexibility of SiSU offers great possibilities. -

SiSU -is primarily for published works, which can take advantage of the citation -system to reliably reference its documents. SiSU works well in a complementary -manner with such collaborative technologies as Wikis, which can take advantage -of and be used to discuss the substance of content prepared in SiSU -

+


+SiSU is developed under an open source, software libre license (GPL3). Its +use case for development is work with medium to large document sets and +cope with evolving document formats/ representation technologies. Documents +are prepared once, and generated as need be to update the technical presentation +or add additional output formats. Various output formats (including search +related output) share a common mechanism for cross-output-format citation. + +


+SiSU both defines a markup syntax and provides an engine that produces +open standards format outputs from documents prepared with SiSU markup. +From a single lightly prepared document sisu custom builds several standard +output formats which share a common (text object) numbering system for +citation of content within a document (that also has implications for search). +The sisu engine works with an abstraction of the document’s structure and +content from which it is possible to generate different forms of representation +of the document. Significantly SiSU markup is more sparse than html and +outputs which include html, EPUB, LaTeX, landscape and portrait pdfs, Open +Document Format (ODF), all of which can be added to and updated. SiSU is +also able to populate SQL type databases at an object level, which means +that searches can be made with that degree of granularity. +


+Source document preparation and output generation is a two step process: +(i) document source is prepared, that is, marked up in sisu markup syntax +and (ii) the desired output subsequently generated by running the sisu +engine against document source. Output representations if updated (in the +sisu engine) can be generated by re-running the engine against the prepared +source. Using SiSU markup applied to a document, SiSU custom builds (to +take advantage of the strengths of different ways of representing documents) +various standard open output formats including plain text, HTML, XHTML, +XML, EPUB, OpenDocument, LaTeX or PDF files, and populate an SQL database +with objects[^1] (equating generally to paragraph-sized chunks) so searches +may be performed and matches returned with that degree of granularity ( +e.g. your search criteria is met by these documents and at these locations +within each document). Document output formats share a common object numbering +system for locating content. This is particularly suitable for "published" +works (finalized texts as opposed to works that are frequently changed +or updated) for which it provides a fixed means of reference of content. + +


+In preparing a SiSU document you optionally provide semantic information +related to the document in a document header, and in marking up the substantive +text provide information on the structure of the document, primarily indicating +heading levels and footnotes. You also provide information on basic text +attributes where used. The rest is automatic, sisu from this information +custom builds[^2] the different forms of output requested. +


+SiSU works with an abstraction of the document based on its structure which +is comprised of its headings[^3] and objects[^4], which enables SiSU to represent +the document in many different ways, and to take advantage of the strengths +of different ways of presenting documents. The objects are numbered, and +these numbers can be used to provide a common basis for citing material +within a document across the different output format types. This is significant +as page numbers are not well suited to the digital age, in web publishing, +changing a browser’s default font or using a different browser can mean +that text will appear on a different page; and publishing in different +formats, html, landscape and portrait pdf etc. again page numbers are not +useful to cite text. Dealing with documents at an object level together +with object numbering also has implications for search that SiSU is able +to take advantage of. +


+One of the challenges of maintaining documents is to keep them in a format +that allows use of them independently of proprietary platforms. Consider +issues related to dealing with legacy proprietary formats today and what +guarantee you have that old proprietary formats will remain (or can be +read without proprietary software/equipment) in 15 years time, or the way +the way in which html has evolved over its relatively short span of existence. +SiSU provides the flexibility of producing documents in multiple non-proprietary +open formats including html, pdf[^5] ODF,[^6] and EPUB.[^7] Whilst SiSU relies +on software, the markup is uncomplicated and minimalistic which guarantees +that future engines can be written to run against it. It is also easily +converted to other formats, which means documents prepared in SiSU can +be migrated to other document formats. Further security is provided by the +fact that the software itself, SiSU is available under GPL3 a licence that +guarantees that the source code will always be open, and free as in libre, +which means that that code base can be used, updated and further developed +as required under the terms of its license. Another challenge is to keep +up with a moving target. SiSU permits new forms of output to be added as +they become important, (Open Document Format text was added in 2006 when +it became an ISO standard for office applications and the archival of documents), +EPUB was introduced in 2009; and allows the technical representations existing +output to be updated (html has evolved and the related module has been +updated repeatedly over the years, presumably when the World Wide Web Consortium +(w3c) finalises html 5 which is currently under development, the html module +will again be updated allowing all existing documents to be regenerated +as html 5). +


+The document formats are written to the file-system and available for indexing +by independent indexing tools, whether off the web like Google and Yahoo +or on the site like Lucene and Hyperestraier. +


+SiSU also provides other features such as concordance files and document +content certificates, and the working against an abstraction of document +structure has further possibilities for the research and development of +other document representations, the availability of objects is useful for +example for topic maps and thesauri, together with the flexibility of SiSU +offers great possibilities. +


+SiSU is primarily for published works, which can take advantage of the +citation system to reliably reference its documents. SiSU works well in +a complementary manner with such collaborative technologies as Wikis, which +can take advantage of and be used to discuss the substance of content prepared +in SiSU +


<http://www.sisudoc.org/ > -

<http://www.jus.uio.no/sisu +


+<http://www.jus.uio.no/sisu > -

2. COMMANDS SUMMARY -

2.1 - -

DESCRIPTION -

SiSU SiSU is a document publishing system, that from a simple -single marked-up document, produces multiple of output formats including: -plaintext, html, xhtml, XML, epub, odt (odf text), LaTeX, pdf, info, and -SQL (PostgreSQL and SQLite), which share numbered text objects ("object -citation numbering") and the same document structure information. For more -see: <http://www.jus.uio.no/sisu +

+

2. Commands Summary

+
+ +

+

2.1 Description

+ +


+SiSU SiSU is a document publishing system, that from a simple single marked-up +document, produces multiple of output formats including: plaintext, html, +xhtml, XML, epub, odt (odf text), LaTeX, pdf, info, and SQL (PostgreSQL +and SQLite), which share numbered text objects ("object citation numbering") +and the same document structure information. For more see: <http://www.jus.uio.no/sisu > -

2.2 DOCUMENT PROCESSING COMMAND FLAGS + +

+

2.2 Document Processing Command Flags

+

-
-a [filename/wildcard] -
-
produces plaintext with Unix linefeeds and without markup, (object numbers -are omitted), has footnotes at end of each paragraph that contains them -[  -A  for  equivalent  dos  (linefeed)  output  file] [see  -e  for  -A endnotes]. (Options -include: --endnotes for endnotes --footnotes for footnotes at the end of each -paragraph --unix for unix linefeed (default) --msdos for msdos linefeed) +
-a [filename/wildcard]
+
produces plaintext +with Unix linefeeds and without markup, (object numbers are omitted), has +footnotes at end of each paragraph that contains them [  -A  for  equivalent + dos  (linefeed)  output  file] [see  -e  for  -A endnotes]. (Options include: --endnotes +for endnotes --footnotes for footnotes at the end of each paragraph --unix +for unix linefeed (default) --msdos for msdos linefeed)

-
-b -[filename/wildcard]
-
see --xhtml +
-b [filename/wildcard] +
+
+

see --xhtml

--color-toggle [filename/wildcard]
-
screen toggle -ansi screen colour on or off depending on default set (unless -c flag is -used: if sisurc colour default is set to ’true’, output to screen will be -with colour, if sisurc colour default is set to ’false’ or is undefined screen -output will be without colour). Alias -c +
screen toggle ansi screen colour +on or off depending on default set (unless -c flag is used: if sisurc colour +default is set to ’true’, output to screen will be with colour, if sisurc +colour default is set to ’false’ or is undefined screen output will be without +colour). Alias -c

-
--concordance [filename/wildcard] -
-
produces concordance (wordmap) a rudimentary index of all the words in -a document. (Concordance files are not generated for documents of over 260,000 -words unless this limit is increased in the file sisurc.yml). Alias -w +
--concordance [filename/wildcard]
+
produces concordance (wordmap) +a rudimentary index of all the words in a document. (Concordance files are +not generated for documents of over 260,000 words unless this limit is +increased in the file sisurc.yml). Alias -w

-
-C -[--init-site]
-
configure/initialise shared output directory files initialize -shared output directory (config files such as css and dtd files are not -updated if they already exist unless modifier is used). -C --init-site configure/initialise -site more extensive than -C on its own, shared output directory files/force -update, existing shared output config files such as css and dtd files are -updated if this modifier is used. +
-C [--init-site]
+
configure/initialise +shared output directory files initialize shared output directory (config +files such as css and dtd files are not updated if they already exist unless +modifier is used). -C --init-site configure/initialise site more extensive than +-C on its own, shared output directory files/force update, existing shared +output config files such as css and dtd files are updated if this modifier +is used.

-CC
-
configure/initialise shared output -directory files initialize shared output directory (config files such as -css and dtd files are not updated if they already exist unless modifier -is used). The equivalent of: -C --init-site configure/initialise site, more -extensive than -C on its own, shared output directory files/force update, -existing shared output config files such as css and dtd files are updated -if -CC is used. -

- -
-c [filename/wildcard]
-
see --color-toggle +
configure/initialise shared output directory files initialize +shared output directory (config files such as css and dtd files are not +updated if they already exist unless modifier is used). The equivalent of: +-C --init-site configure/initialise site, more extensive than -C on its own, +shared output directory files/force update, existing shared output config +files such as css and dtd files are updated if -CC is used.

-
--dal [filename/wildcard/url] +
-c [filename/wildcard]
-
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. - -

Alias -m +

+

see --color-toggle

-
--delete [filename/wildcard]
-
see --zap +
--dal [filename/wildcard/url]
+
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. Alias -m

-
-D [instruction] [filename] +
--delete [filename/wildcard]
-

see --pg +

see --zap

-
-d [--db-[database  type  (sqlite|pg)]] --[instruction] [filename]
-
see --sqlite - +
-D [instruction] [filename]
+
see --pg

-
--epub [filename/wildcard]
-
produces an epub document, [sisu  version  2  only] -(filename.epub). Alias -e +
-d [--db-[database  type  (sqlite|pg)]] +--[instruction] [filename]
+
see --sqlite

-
-e [filename/wildcard]
-
see --epub +
--epub [filename/wildcard]
+
produces +an epub document, [sisu  version  2  only] (filename.epub). Alias -e

-
-F [--webserv=webrick] +
-e [filename/wildcard]
-

see --sample-search-form +

see --epub

-
--git [filename/wildcard]
-
produces or updates markup -source file structure in a git repo (experimental and subject to change). +
-F [--webserv=webrick]
+
see --sample-search-form +

-

Alias -g +

--git [filename/wildcard] +
+
produces or updates markup source file structure in a git repo (experimental +and subject to change). Alias -g

-g [filename/wildcard]
see --git

-
--harvest *.ss[tm]
-
makes two lists -of sisu output based on the sisu markup documents in a directory: list -of author and authors works (year and titles), and; list by topic with -titles and author. Makes use of header metadata fields (author, title, date, -topic_register). Can be used with maintenance (-M) and remote placement (-R) -flags. +
--harvest +*.ss[tm]
+
makes two lists of sisu output based on the sisu markup documents +in a directory: list of author and authors works (year and titles), and; +list by topic with titles and author. Makes use of header metadata fields +(author, title, date, topic_register). Can be used with maintenance (-M) +and remote placement (-R) flags.

--help [topic]
-
provides help on the selected topic, where topics (keywords) -include: list, (com)mands, short(cuts), (mod)ifiers, (env)ironment, markup, -syntax, headers, headings, endnotes, tables, example, customise, skin, -(dir)ectories, path, (lang)uage, db, install, setup, (conf)igure, convert, -termsheet, search, sql, features, license +
provides help on the selected +topic, where topics (keywords) include: list, (com)mands, short(cuts), +(mod)ifiers, (env)ironment, markup, syntax, headers, headings, endnotes, +tables, example, customise, skin, (dir)ectories, path, (lang)uage, db, +install, setup, (conf)igure, convert, termsheet, search, sql, features, + +

license

--html [filename/wildcard]
-
produces -html output, segmented text with table of contents (toc.html and index.html) -and the document in a single file (scroll.html). Alias -h +
produces html output, segmented text +with table of contents (toc.html and index.html) and the document in a single +file (scroll.html). Alias -h

-
-h [filename/wildcard] -
-
-

see --html +

-h [filename/wildcard]
+
see --html

-
-I [filename/wildcard]
-
see --texinfo +
-I [filename/wildcard] +
+
+

see --texinfo

-i [filename/wildcard]
@@ -289,97 +319,97 @@ and the document in a single file (scroll.html). Alias -h
-L
prints license information. +

-
--machine [filename/wildcard/url] -
+
--machine [filename/wildcard/url]
see --dal (document abstraction level/layer) +

-
--maintenance [filename/wildcard/url] -
-
maintenance mode files created for processing preserved and their locations -indicated. (also see -V). Alias -M +
--maintenance [filename/wildcard/url]
+
maintenance mode files created for +processing preserved and their locations indicated. (also see -V). Alias -M +

--manpage [filename/wildcard]
-
produces man -page of file, not suitable for all outputs. Alias -i +
produces man page of file, not suitable for +all outputs. Alias -i

-
-M [filename/wildcard/url] -
-
-

see --maintenance +

-M [filename/wildcard/url]
+
see --maintenance

-
-m [filename/wildcard/url]
-
see --dal (document abstraction -level/layer) +
-m [filename/wildcard/url] +
+
see --dal (document abstraction level/layer)

--no-ocn
-
[with  --html  --pdf  or  --epub] switches off object citation -numbering. Produce output without identifying numbers in margins of html -or LaTeX/pdf output. -

- -
-N [filename/wildcard/url]
-
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. +
[with  --html  --pdf  or  --epub] +switches off object citation numbering. Produce output without identifying +numbers in margins of html or LaTeX/pdf output.

-
-n [filename/wildcard/url]
-
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. +
-N [filename/wildcard/url] +
+
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.

-
--odf [filename/wildcard/url]
-
see --odt +
-n +[filename/wildcard/url]
+
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.

-
--odt [filename/wildcard/url] +
--odf [filename/wildcard/url]
-
output basic document in opendocument file format (opendocument.odt). Alias +
+

see --odt +

-

- -

o +

--odt [filename/wildcard/url]
+
output basic document in opendocument +file format (opendocument.odt). Alias -o

-o [filename/wildcard/url]
see --odt +

--pdf [filename/wildcard]
-
produces -LaTeX pdf (portrait.pdf & landscape.pdf). 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 +
produces LaTeX pdf (portrait.pdf & landscape.pdf). +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

-
--pg [instruction] -[filename]
-
database postgresql ( --pgsql may be used instead) possible instructions, -include: --createdb; --create; --dropall; --import [filename]; --update [filename]; ---remove [filename]; see database section below. Alias -D +
--pg [instruction] [filename]
+
database postgresql ( --pgsql +may be used instead) possible instructions, include: --createdb; --create; +--dropall; --import [filename]; --update [filename]; --remove [filename]; see database +section below. Alias -D

-
--po [language_directory/filename - language_directory]
-
see --po4a +
--po [language_directory/filename  language_directory] +
+
+

see --po4a

-
--po4a [language_directory/filename  language_directory] -
-
produces .pot and po files for the file in the languages specified by the -language directory. SiSU markup is placed in subdirectories named with the -language code, e.g. en/ fr/ es/. The sisu config file must set the output -directory structure to multilingual. v3, experimental +
--po4a [language_directory/filename  language_directory]
+
produces +.pot and po files for the file in the languages specified by the language +directory. SiSU markup is placed in subdirectories named with the language +code, e.g. en/ fr/ es/. The sisu config file must set the output directory +structure to multilingual. v3, experimental

-P [language_directory/filename @@ -661,12 +691,14 @@ combination of -[mMvVq]), will remove the related document output directory.
see --zap

-3. COMMAND LINE MODIFIERS + +

3. Command Line Modifiers

+
+

-
--no-ocn -
+
--no-ocn
[with  --html  --pdf  or  --epub] switches off object citation numbering. Produce output without identifying numbers in margins of html or LaTeX/pdf output. @@ -690,20 +722,24 @@ output without identifying numbers in margins of html or LaTeX/pdf output.

denoted by dagger/plus sign

-4. DATABASE COMMANDS -

dbi - database interface -

-D or --pgsql set for postgresql -d or --sqlite default set for sqlite -d is -modifiable with --db=[database  type  (pgsql  or  sqlite)] +

4. Database Commands

+
+ +


+dbi - database interface +


+-D or --pgsql set for postgresql -d or --sqlite default set for sqlite -d is modifiable +with --db=[database  type  (pgsql  or  sqlite)]

--pg -v --createall
-
initial -step, creates required relations (tables, indexes) in existing postgresql -database (a database should be created manually and given the same name -as working directory, as requested) (rb.dbi) [  -dv  --createall it may be necessary -to run sisu -Dv --createdb initially NOTE: at the present time for postgresql +
initial step, +creates required relations (tables, indexes) in existing postgresql database +(a database should be created manually and given the same name as working +directory, as requested) (rb.dbi) [  -dv  --createall it may be necessary to +run sisu -Dv --createdb initially NOTE: at the present time for postgresql it may be necessary to manually create the database. The command would be ’createdb [database  name]’ where database name would be SiSU_[present  working  directory  name  (without  path)]. Please use only alphanumerics and underscores. @@ -730,10 +766,13 @@ db (rb.dbi) [  -d --remove  sqlite  equivalent]
kills data" and drops (postgresql or sqlite) db, tables & indexes [  -d --dropall  sqlite  equivalent] -

The -v is for verbose output. +


+The -v is for verbose output.

-5. SHORTCUTS, SHORTHAND FOR MULTIPLE FLAGS + +

5. Shortcuts, Shorthand for Multiple Flags

+

@@ -780,190 +819,239 @@ the sisurc.yml file):
-5
-mhewpAobxXDyY --update -

add -v for verbose mode and -c for color, -e.g. sisu -2vc [filename  or -

consider -u for appended url info or -v for verbose +


+add -v for verbose mode and -c for color, e.g. sisu -2vc [filename  or +


-

output +

consider -u for appended url info or -v for verbose output

-5.1 COMMAND LINE WITH FLAGS - BATCH PROCESSING -

In the data directory -run sisu -mh filename or wildcard eg. "sisu -h cisg.sst" or "sisu -h *.{sst,ssm}" -to produce html version of all documents. -

Running sisu (alone without -any flags, filenames or wildcards) brings up the interactive help, as does -any sisu command that is not recognised. Enter to escape. -

6. HELP -

6.1 SISU - -

MANUAL -

The most up to date information on sisu should be contained in -the sisu_manual, available at: -

<http://sisudoc.org/sisu/sisu_manual/ ->
-

The manual can be generated from source, found respectively, either -within the SiSU tarball or installed locally at: -

./data/doc/sisu/markup-samples/sisu_manual
+

5.1 Command Line +with Flags - Batch Processing

-

/usr/share/doc/sisu/markup-samples/sisu_manual
+


+In the data directory run sisu -mh filename or wildcard eg. "sisu -h cisg.sst" +or "sisu -h *.{sst,ssm}" to produce html version of all documents. +


+Running sisu (alone without any flags, filenames or wildcards) brings up +the interactive help, as does any sisu command that is not recognised. Enter +to escape. +

+

6. Help

+
+ +

+

6.1 Sisu Manual

+ +


+The most up to date information on sisu should be contained in the sisu_manual, +available at: +


+ <http://sisudoc.org/sisu/sisu_manual/ +>
+ +


+The manual can be generated from source, found respectively, either within +the SiSU tarball or installed locally at: +


+ ./data/doc/sisu/markup-samples/sisu_manual
-

move to the respective directory and type e.g.: -

sisu sisu_manual.ssm
+


+ /usr/share/doc/sisu/markup-samples/sisu_manual
-

6.2 SISU MAN PAGES -

If SiSU is installed on your system usual man commands -should be available, try: -

man sisu
+


+move to the respective directory and type e.g.: +


+ sisu sisu_manual.ssm
-

man sisu_markup
+

+

6.2 Sisu Man Pages

-

man sisu_commands
+


+If SiSU is installed on your system usual man commands should be available, +try: +


+ man sisu
-

Most SiSU man pages are generated directly from sisu documents that -are used to prepare the sisu manual, the sources files for which are located +


+Most SiSU man pages are generated directly from sisu documents that are +used to prepare the sisu manual, the sources files for which are located within the SiSU tarball at: -

./data/doc/sisu/markup-samples/sisu_manual
+


+ ./data/doc/sisu/markup-samples/sisu_manual
-

Once installed, directory equivalent to: -

/usr/share/doc/sisu/markup-samples/sisu_manual
+


+Once installed, directory equivalent to: +


+ /usr/share/doc/sisu/markup-samples/sisu_manual
-

Available man pages are converted back to html using man2html: -

/usr/share/doc/sisu/html/
+


+Available man pages are converted back to html using man2html: +


+ /usr/share/doc/sisu/html/
-

./data/doc/sisu/html
+


+ ./data/doc/sisu/html
-

An online version of the sisu man page is available here: -

* various -sisu man pages <http://www.jus.uio.no/sisu/man/ +


+An online version of the sisu man page is available here: +


+* various sisu man pages <http://www.jus.uio.no/sisu/man/ > [^8] -

* sisu.1 <http://www.jus.uio.no/sisu/man/sisu.1.html -> -[^9] -

6.3 SISU BUILT-IN INTERACTIVE HELP -

This is particularly useful for -getting the current sisu setup/environment information: -

sisu --help
+


+* sisu.1 <http://www.jus.uio.no/sisu/man/sisu.1.html +> [^9] +

+

6.3 Sisu Built-in Interactive +Help

+ +


+This is particularly useful for getting the current sisu setup/environment +information: +


+ sisu --help
-

sisu --help [subject]
+


+ sisu --help [subject]
-

sisu --help commands
+


+ sisu --help commands
-

sisu --help markup
+


+ sisu --help markup
-

sisu --help env [for  feedback  on  the  way  your  system  is
+


+ sisu --help env [for  feedback  on  the  way  your  system  is
setup  with  regard  to  sisu]
-

sisu -V [environment  information,  same  as  above  command]
+


+ sisu -V [environment  information,  same  as  above  command]
-

sisu (on its own provides version and some help information)
+


+ sisu (on its own provides version and some help information)
-

Apart from real-time information on your current configuration the SiSU +


+Apart from real-time information on your current configuration the SiSU manual and man pages are likely to contain more up-to-date information than the sisu interactive help (for example on commands and markup). -

NOTE: -Running the command sisu (alone without any flags, filenames or wildcards) +


+NOTE: Running the command sisu (alone without any flags, filenames or wildcards) brings up the interactive help, as does any sisu command that is not recognised. Enter to escape. -

6.4 HELP SOURCES -

For lists of alternative help sources, -see: -

man page -

man sisu_help_sources
+

+

7. Introduction to Sisu Markup[^10]

+
-

man2html -

/usr/share/doc/sisu/v2/html/sisu.1.html
+

+

7.1 Summary

-

sisu generated html -

/usr/share/doc/sisu/html/sisu_help_sources/index.html
+


+SiSU source documents are plaintext (UTF-8)[^11] files +


+All paragraphs are separated by an empty line. +


+Markup is comprised of: +


+* at the top of a document, the document header made up of semantic meta-data +about the document and if desired additional processing instructions (such +an instruction to automatically number headings from a particular level +down) +


+* followed by the prepared substantive text of which the most important +single characteristic is the markup of different heading levels, which +define the primary outline of the document structure. Markup of substantive +text includes: +


+ * heading levels defines document structure
-

<http://sisudoc.org/sisu/sisu_help_sources/index.html ->
+


+ * text basic attributes, italics, bold etc.
-

7. INTRODUCTION TO SISU MARKUP[^10] -

7.1 SUMMARY -

SiSU source documents -are plaintext (UTF-8)[^11] files -

All paragraphs are separated by an empty -line. -

Markup is comprised of: -

* at the top of a document, the document -header made up of semantic meta-data about the document and if desired additional -processing instructions (such an instruction to automatically number headings -from a particular level down) -

* followed by the prepared substantive -text of which the most important single characteristic is the markup of -different heading levels, which define the primary outline of the document -structure. Markup of substantive text includes: -

* heading levels defines -document structure
- -

* text basic attributes, italics, bold etc.
- -

* grouped text (objects), which are to be treated differently, such -as code
+


+ * grouped text (objects), which are to be treated differently, such as +code
blocks or poems.
-

* footnotes/endnotes
+


+ * footnotes/endnotes
-

* linked text and images
+


+ * linked text and images
-

* paragraph actions, such as indent, bulleted, numbered-lists, etc.
+


+ * paragraph actions, such as indent, bulleted, numbered-lists, etc.
-

Some interactive help on markup is available, by typing sisu and selecting +


+Some interactive help on markup is available, by typing sisu and selecting

markup or sisu --help markup -

To check the markup in a file: -

sisu --identify -[filename].sst
+


+To check the markup in a file: +


+ sisu --identify [filename].sst
-

For brief descriptive summary of markup history -

sisu --query-history
+


-

or if for a particular version: -

sisu --query-0.38
+

For brief descriptive summary of markup history +


+ sisu --query-history
-

7.2 MARKUP EXAMPLES -

7.2.1 ONLINE -

Online markup examples are available -together with the respective outputs produced from <http://www.jus.uio.no/sisu/SiSU/examples.html -> -or from <http://www.jus.uio.no/sisu/sisu_examples/ -> -

There is of course this -document, which provides a cursory overview of sisu markup and the respective -output produced: <http://www.jus.uio.no/sisu/sisu_markup/ -> -

Some example marked -up files are available as html with syntax highlighting for viewing: <http://www.jus.uio.no/sisu/sample/syntax +


+or if for a particular version: +


+ sisu --query-0.38
+ +

+

7.2 Markup Examples

+ +

+

7.2.1 Online

+ +


+Online markup examples are available together with the respective outputs +produced from <http://www.jus.uio.no/sisu/SiSU/examples.html +> or from <http://www.jus.uio.no/sisu/sisu_examples/ > -

an alternative presentation of markup syntax: <http://www.jus.uio.no/sisu/sample/on_markup.txt +


+There is of course this document, which provides a cursory overview of +sisu markup and the respective output produced: <http://www.jus.uio.no/sisu/sisu_markup/ > -

7.2.2 INSTALLED -

With SiSU installed sample skins may be found in: /usr/share/doc/sisu/sisu_markup_samples/dfsg +


+an alternative presentation of markup syntax: /usr/share/doc/sisu/on_markup.txt.gz + +

+

7.2.2 Installed

+ +


+With SiSU installed sample skins may be found in: /usr/share/doc/sisu/markup-samples (or equivalent directory) and if sisu-markup-samples is installed also under: -

/usr/share/doc/sisu/sisu_markup_samples/non-free -

8. MARKUP OF HEADERS +

/usr/share/doc/sisu/markup-samples-non-free

- Headers contain either: semantic meta-data about a document, which can -be used by any output module of the program, or; processing instructions. +

8. Markup of Headers

+
-

Note: the first line of a document may include information on the markup +


+Headers contain either: semantic meta-data about a document, which can be +used by any output module of the program, or; processing instructions. +

+
+Note: the first line of a document may include information on the markup version used in the form of a comment. Comments are a percentage mark at the start of a paragraph (and as the first character in a line of text) followed by a space and the comment: -


  % this would be a comment
-

8.1 SAMPLE HEADER -

This current document is loaded by a master document -that has a header similar to this one:

+

8.1 Sample Header

+ +


+This current document is loaded by a master document that has a header +similar to this one: 


  % SiSU master 2.0
   @title: SiSU
@@ -977,12 +1065,14 @@ that has a header similar to this one:
       electronic document, electronic citation, data structure,
        citation systems, search
   % used_by: manual
-  @date: :published: 2008-05-22
+  @date:
+   :published: 2008-05-22
    :created: 2002-08-28
    :issued: 2002-08-28
    :available: 2002-08-28
    :modified: 2010-03-03
-  @make: :num_top: 1
+  @make:
+   :num_top: 1
    :breaks: new=C; break=1
    :skin: skin_sisu_manual
    :bold: /Gnu|Debian|Ruby|SiSU/
@@ -993,36 +1083,41 @@ that has a header similar to this one:
        . sisu  [-Ddcv]  [instruction]
        . sisu  [-CcFLSVvW]
        . sisu --v2  [operations]
-       . sisu --v1  [operations]
-  @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/
-
-

8.2 AVAILABLE HEADERS -

Header tags appear at the beginning of a document -and provide meta information on the document (such as the Dublin Core), -or information as to how the document as a whole is to be processed. All -header instructions take the form @headername: or on the next line and -indented by once space :subheadername: All Dublin Core meta tags are available - -

@indentifier: information or instructions -

where the "identifier" is -a tag recognised by the program, and the "information" or "instructions" - -

belong to the tag/indentifier specified -

Note: a header where used should -only be used once; all headers apart from @title: are optional; the @structure: -header is used to describe document structure, and can be useful to know. - -

This is a sample header + . sisu --v3  [operations] + @links: + { SiSU Homepage }http://www.sisudoc.org/ + { SiSU Manual }http://www.sisudoc.org/sisu/sisu_manual/ + { Book Samples & Markup Examples }http://www.jus.uio.no/sisu/SiSU/examples.html + { SiSU Download }http://www.jus.uio.no/sisu/SiSU/download.html + { SiSU Changelog }http://www.jus.uio.no/sisu/SiSU/changelog.html + { SiSU Git repo }http://git.sisudoc.org/?p=code/sisu.git;a=summary + { SiSU List Archives }http://lists.sisudoc.org/pipermail/sisu/ + { SiSU @ Debian }http://packages.qa.debian.org/s/sisu.html + { SiSU Project @ Debian }http://qa.debian.org/developer.php?login=sisu@lists.sisudoc.org + { SiSU @ Wikipedia }http://en.wikipedia.org/wiki/SiSU +

+

8.2 Available Headers

+ +


+Header tags appear at the beginning of a document and provide meta information +on the document (such as the Dublin Core), or information as to how the +document as a whole is to be processed. All header instructions take the +form @headername: or on the next line and indented by once space :subheadername: + +

All Dublin Core meta tags are available +


+@indentifier: information or instructions +


+where the "identifier" is a tag recognised by the program, and the "information" +or "instructions" belong to the tag/indentifier specified +


+Note: a header where used should only be used once; all headers apart from +@title: are optional; the @structure: header is used to describe document +structure, and can be useful to know. +


+ +

This is a sample header 


  % SiSU 2.0  [declared  file-type  identifier  with  markup  version]
@@ -1032,13 +1127,15 @@ header is used to describe document structure, and can be useful to know. :language: English


-

  @creator: :author:  [Lastname,  First  names]
+
  @creator:
+   :author:  [Lastname,  First  names]
    :illustrator:  [Lastname,  First  names]
    :translator:  [Lastname,  First  names]
    :prepared_by:  [Lastname,  First  names]
 

 
 

-
  @date: :published:  [year  or  yyyy-mm-dd]
+
  @date:
+   :published:  [year  or  yyyy-mm-dd]
    :created:  [year  or  yyyy-mm-dd]
    :issued:  [year  or  yyyy-mm-dd]
    :available:  [year  or  yyyy-mm-dd]
@@ -1048,7 +1145,8 @@ header is used to describe document structure, and can be useful to know.
    :translated:  [year  or  yyyy-mm-dd]
 

 
 

-
  @rights: :copyright: Copyright (C)  [Year  and  Holder]
+
  @rights:
+   :copyright: Copyright (C)  [Year  and  Holder]
    :license:  [Use  License  granted]
    :text:  [Year  and  Holder]
    :translation:  [Name,  Year]
@@ -1064,8 +1162,8 @@ header is used to describe document structure, and can be useful to know.
    :abstract:
    :isbn:  [ISBN]
    :loc:  [Library  of  Congress  classification]
-   :dewey:  [Dewey  classification
-  :pg:  [Project  Gutenberg  text  number]
+   :dewey:  [Dewey  classification]
+   :pg:  [Project  Gutenberg  text  number]
 

 
 

 
  @links: { SiSU }http://www.sisudoc.org
@@ -1086,41 +1184,52 @@ generated]
    :italics:  [regular  expression  of  words/phrases  to  italicise]
 

 
 

-
  @original: :language:  [language]
+
  @original:
+   :language:  [language]
 

 
 

-
  @notes: :comment:
+
  @notes:
+   :comment:
    :prefix:  [prefix  is  placed  just  after  table  of  contents]
 

-
 9. MARKUP OF SUBSTANTIVE TEXT
-
 9.1 HEADING LEVELS
-
  Heading levels are
-:A~ ,:B~ ,:C~ ,1~ ,2~ ,3~ ... :A - :C being part / section headings, followed
-by other heading levels, and 1 -6 being headings followed by substantive
-text or sub-headings. :A~ usually the title :A~? conditional level 1 heading
-(used where a stand-alone document may be imported into another)
-
  :A~ [heading
- text] Top level heading [this  usually  has  similar  content  to  the title
- @title:  ] NOTE: the heading levels described here are in 0.38 notation,
-
-
see heading
-
  :B~ [heading  text] Second level heading [this  is  a  heading
- level  divider]
-
  :C~ [heading  text] Third level heading [this  is  a  heading
- level  divider]
-
  1~ [heading  text] Top level heading preceding substantive
-text of document or sub-heading 2, the heading level that would normally
-be marked 1. or 2. or 3. etc. in a document, and the level on which sisu by
-default would break html output into named segments, names are provided
-automatically if none are given (a number), otherwise takes the form 1~my_filename_for_this_segment
-
-
  2~ [heading  text] Second level heading preceding substantive text of
-document or sub-heading 3 , the heading level that would normally be marked
-1.1 or 1.2 or 1.3 or 2.1 etc. in a document.
-
  3~ [heading  text] Third level
-heading preceding substantive text of document, that would normally be
-marked 1.1.1 or 1.1.2 or 1.2.1 or 2.1.1 etc. in a document
 

+
9. Markup of Substantive Text

+

+
+

+
9.1 Heading Levels

+
+
 

+Heading levels are :A~ ,:B~ ,:C~ ,1~ ,2~ ,3~ ... :A - :C being part / section
+headings, followed by other heading levels, and 1 -6 being headings followed
+by substantive text or sub-headings. :A~ usually the title :A~? conditional
+level 1 heading (used where a stand-alone document may be imported into
+another)
+
 

+:A~ [heading  text] Top level heading [this  usually  has  similar  content
+ to  the title  @title:  ] NOTE: the heading levels described here are in 0.38
+notation, see heading
+
 

+:B~ [heading  text] Second level heading [this  is  a  heading  level  divider]
+
+
 

+:C~ [heading  text] Third level heading [this  is  a  heading  level  divider]
+
+
 

+1~ [heading  text] Top level heading preceding substantive text of document
+or sub-heading 2, the heading level that would normally be marked 1. or 2.
+or 3. etc. in a document, and the level on which sisu by default would break
+html output into named segments, names are provided automatically if none
+are given (a number), otherwise takes the form 1~my_filename_for_this_segment
+
+
 

+2~ [heading  text] Second level heading preceding substantive text of document
+or sub-heading 3 , the heading level that would normally be marked 1.1 or
+1.2 or 1.3 or 2.1 etc. in a document.
+
 

+3~ [heading  text] Third level heading preceding substantive text of document,
+that would normally be marked 1.1.1 or 1.1.2 or 1.2.1 or 2.1.1 etc. in a document
+
 
 

 
  1~filename level 1 heading,
   % the primary division such as Chapter that is followed by substantive
@@ -1129,249 +1238,340 @@ text,
 html
   % segments are made)
 

-
 9.2 FONT ATTRIBUTES
-
  markup example:
 

+
9.2 Font Attributes

+
+
 

+markup example:
 
 

 
  normal text,  *{emphasis}*, !{bold text}!, /{italics}/, _{underscore}_,
 "{citation}",
   ^{superscript}^, ,{subscript},, +{inserted text}+, -{strikethrough}-, #{monospace}#
   normal text
+
   *{emphasis}*  [note:  can  be  configured  to  be  represented  by  bold,  italics
  or  underscore]
+
   !{bold text}!
+
   _{underscore}_
+
   /{italics}/
+
   "{citation}"
+
   ^{superscript}^
+
   ,{subscript},
+
   +{inserted text}+
+
   -{strikethrough}-
+
   #{monospace}#
 

-
  resulting output:
-
  normal text, emphasis , bold text , italics , underscore
-, "citation", ^superscript^, [subscript], ++inserted text++, --strikethrough--,
-
-
monospace
-
  normal text
-
  emphasis [note:  can  be  configured  to  be  represented
- by  bold,  italics  or  underscore]
-
  bold text
-
  italics
-
  underscore
-
  "citation"
-
-
  ^superscript^
-
  [subscript]
-
  ++inserted text++
-
  --strikethrough--
-
  monospace
-
-
 9.3 INDENTATION AND BULLETS
-
  markup example:
-

 
 

-
  ordinary paragraph
-  _1 indent paragraph one step
-  _2 indent paragraph two steps
-  _9 indent paragraph nine steps
-

+resulting output:
+
 

+normal text, emphasis , bold text , italics , underscore , "citation",
+^superscript^, [subscript], ++inserted text++, --strikethrough--, monospace
 

-
 resulting output:
-
  ordinary paragraph
-
    indent paragraph one step

-
-
      indent paragraph two steps

+

 
-
                    indent paragraph nine steps

+
normal text
+
 

+emphasis [note:  can  be  configured  to  be  represented  by  bold,  italics  or
+ underscore]
+
 

 
-
  markup example:
-

+
bold text
 
 

-
  _* bullet text
-  _1* bullet text, first indent
-  _2* bullet text, two step indent
-

-
  resulting output:
-
  * bullet text
-
    * bullet text, first indent

 
-
      * bullet text, two step indent

+
italics
+
 

 
-
  Numbered List (not to be confused with headings/titles, (document structure))
+
underscore
+
 

+"citation"
+
 

+^superscript^
+
 

+[subscript]
+
 

+++inserted text++
+
 

+--strikethrough--
+
 

 
-
  markup example:
+
monospace
 

+
9.3 Indentation and Bullets

+
+
 

+markup example:
+
 

+
  ordinary paragraph
+
+  _1 indent paragraph one step
+
+  _2 indent paragraph two steps
+
+  _9 indent paragraph nine steps
+

+
 

+resulting output:
+
 

+
+
ordinary paragraph
+
 

+  indent paragraph one step

+
+
 

+    indent paragraph two steps

+
+
 

+                  indent paragraph nine steps

+
+
 

+markup example:
+
 

+
  _* bullet text
+
+  _1* bullet text, first indent
+
+  _2* bullet text, two step indent
+

+
 

+resulting output:
+
 

+* bullet text
+
 

+  * bullet text, first indent

+
+
 

+    * bullet text, two step indent

+
+
 

+Numbered List (not to be confused with headings/titles, (document structure))
+
+
 

+markup example:
 
 

 
  # numbered list                numbered list 1., 2., 3, etc.
+
   _# numbered list numbered list indented a., b., c., d., etc.
 

-
 9.4 FOOTNOTES / ENDNOTES
-
  Footnotes and endnotes are marked up at the
-location where they would be indicated within a text. They are automatically
-numbered. The output type determines whether footnotes or endnotes will
-
-
be produced
-
  markup example:
 

+
9.4 Footnotes / Endnotes

+
+
 

+Footnotes and endnotes are marked up at the location where they would be
+indicated within a text. They are automatically numbered. The output type
+
+
determines whether footnotes or endnotes will be produced
+
 

+markup example:
 
 

 
  ~{ a footnote or endnote }~
 

-
  resulting output:
-
  [^12]
-
  markup example:
-

+
 

+resulting output:
+
 

+[^12]
+
 

+markup example:
 
 

 
  normal text~{ self contained endnote marker & endnote in one }~ continues
 

-
  resulting output:
-
  normal text[^13] continues
-
  markup example:
-

+
 

+resulting output:
+
 

+normal text[^13] continues
+
 

+markup example:
 
 

 
  normal text ~{* unnumbered asterisk footnote/endnote, insert multiple
 asterisks if required }~ continues
+
   normal text ~{** another unnumbered asterisk footnote/endnote }~ continues
 

-
  resulting output:
-
  normal text [^*] continues
-
  normal text [^**] continues
-
-
  markup example:
-

+
 

+resulting output:
+
 

+normal text [^*] continues
+
 

+normal text [^**] continues
+
 

+markup example:
 
 

 
  normal text ~[*  editors  notes,  numbered  asterisk  footnote/endnote  series
  ]~ continues
+
   normal text ~[+  editors  notes,  numbered  asterisk  footnote/endnote  series
  ]~ continues
 

-
  resulting output:
-
  normal text [^*3] continues
-
  normal text [^+2] continues
-
-
  Alternative endnote pair notation for footnotes/endnotes:
-

+
 

+resulting output:
+
 

+normal text [^*3] continues
+
 

+normal text [^+2] continues
+
 

+Alternative endnote pair notation for footnotes/endnotes:
 
 

 
  % note the endnote marker "~^"
   normal text~^ continues
+
   ^~ endnote text following the paragraph in which the marker occurs
 

-
  the standard and pair notation cannot be mixed in the same document
+
 

+
+
the standard and pair notation cannot be mixed in the same document
 

+
9.5
+Links

 
-
9.5 LINKS
-
 9.5.1 NAKED URLS WITHIN TEXT, DEALING WITH URLS
-
  urls found within
-text are marked up automatically. A url within text is automatically hyperlinked
-to itself and by default decorated with angled braces, unless they are
-contained within a code block (in which case they are passed as normal
-text), or escaped by a preceding underscore (in which case the decoration
-is omitted).
-
  markup example:
 

+
9.5.1 Naked Urls Within Text, Dealing with Urls

+
+
 

+urls found within text are marked up automatically. A url within text is
+automatically hyperlinked to itself and by default decorated with angled
+braces, unless they are contained within a code block (in which case they
+are passed as normal text), or escaped by a preceding underscore (in which
+case the decoration is omitted).
+
 

+markup example:
 
 

 
  normal text http://www.sisudoc.org/ continues
 

-
  resulting output:
-
  normal text <http://www.sisudoc.org/
+
 

+resulting output:
+
 

+normal text <http://www.sisudoc.org/
 > continues
-
  An
+
 

 
-
escaped url without decoration
-
  markup example:
-

+
An escaped url without decoration
+
 

+markup example:
 
 

 
  normal text _http://www.sisudoc.org/ continues
   deb http://www.jus.uio.no/sisu/archive unstable main non-free
 

-
  resulting output:
-
  normal text <_http://www.sisudoc.org/
+
 

+resulting output:
+
 

+normal text <_http://www.sisudoc.org/
 > continues
-
  deb
-<_http://www.jus.uio.no/sisu/archive
+
 

+deb <_http://www.jus.uio.no/sisu/archive
 > unstable main non-free
-
  where a code block
-is used there is neither decoration nor hyperlinking, code blocks are discussed
+
 

+where a code block is used there is neither decoration nor hyperlinking,
 
-
later in this document
-
  resulting output:
-

+
code blocks are discussed later in this document
+
 

+resulting output:
 
 

 
  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
 

-
 9.5.2 LINKING TEXT
-
  To link text or an image to a url the markup is as
-
-
follows
-
  markup example:
 

+
9.5.2 Linking Text

+
+
 

+
+
To link text or an image to a url the markup is as follows
+
 

+markup example:
 
 

 
  about { SiSU }http://url.org markup
 

-
  resulting output:
-
  aboutSiSU <http://www.sisudoc.org/
+
 

+resulting output:
+
 

+aboutSiSU <http://www.sisudoc.org/
 > markup
-
  A shortcut
+
 

 
-
notation is available so the url link may also be provided automatically
+
A shortcut notation is available so the url link may also be provided automatically
 
 
as a footnote
-
  markup example:
-

+
 

+markup example:
 
 

 
  about {~^ SiSU }http://url.org markup
 

-
  resulting output:
-
  about SiSU <http://www.sisudoc.org/
+
 

+resulting output:
+
 

+about SiSU <http://www.sisudoc.org/
 > [^14] markup
-
 9.5.3
-
-
LINKING IMAGES
-
  markup example:
 

+
9.5.3 Linking Images

+
+
 

+markup example:
 
 

 
  { tux.png 64x80 }image
+
   % various url linked images
+
   {tux.png 64x80 "a better way" }http://www.sisudoc.org/
+
+
   {GnuDebianLinuxRubyBetterWay.png 100x101 "Way Better - with Gnu/Linux,
 Debian and Ruby" }http://www.sisudoc.org/
+
+
   {~^ ruby_logo.png "Ruby" }http://www.ruby-lang.org/en/
+
+
 

-
  resulting output:
-
  [ tux.png ]
-
  tux.png 64x80 "Gnu/Linux - a better way"
-<http://www.sisudoc.org/
+
 

+resulting output:
+
 

+[ tux.png ]
+
 

+tux.png 64x80 "Gnu/Linux - a better way" <http://www.sisudoc.org/
 >
-
  [  ruby_logo  (png  missing)  ] [^15]
-
  GnuDebianLinuxRubyBetterWay.png
-100x101 "Way Better - with Gnu/Linux, Debian and Ruby" <http://www.jus.uio.no/sisu/
+
 

+[  ruby_logo  (png  missing)  ] [^15]
+
 

+GnuDebianLinuxRubyBetterWay.png 100x101 "Way Better - with Gnu/Linux, Debian
+and Ruby" <http://www.jus.uio.no/sisu/
 >
+
 

 
-
  linked url footnote shortcut
-

+
linked url footnote shortcut
 
 

 
  {~^  [text  to  link] }http://url.org
   % maps to: {  [text  to  link] }http://url.org ~{ http://url.org }~
   % which produces hyper-linked text within a document/paragraph,
-  with an endnote providing the url for the text location used in the hyperlink
+  % with an endnote providing the url for the text location used in the
+hyperlink
 

-

 
 

 
  text marker *~name
 

-
  note at a heading level the same is automatically achieved by providing
+
 

+note at a heading level the same is automatically achieved by providing
 names to headings 1, 2 and 3 i.e. 2~[name] and 3~[name] or in the case of
 auto-heading numbering, without further intervention.
-
 9.6 GROUPED TEXT
-
 9.6.1
-
-
TABLES
-
  Tables may be prepared in two either of two forms
-
  markup example:
+

+
9.6 Grouped Text

 
 

+
9.6.1
+Tables

+
+
 

+
+
Tables may be prepared in two either of two forms
+
 

+markup example:
 
 

 
  table{ c3; 40; 30; 30;
   This is a table
@@ -1382,14 +1582,17 @@ auto-heading numbering, without further intervention.
   column three of row two, and so on
   }table
 

-
  resulting output:
+
 

+resulting output:
 
   [table  omitted,  see  other  document  formats]

 
-
  a second form may be easier to work with in cases where there is not
+
 

 
-
much information in each column
-
  markup example: [^16]
-

+
a second form may be easier to work with in cases where there is not much
+
+
information in each column
+
 

+markup example: [^16]
 
 

 
  !_ Table 3.1: Contributors to Wikipedia, January 2001 - June 2005
   {table~h 24; 12; 12; 12; 12; 12; 12;}
@@ -1408,24 +1611,29 @@ auto-heading numbering, without further intervention.
   \* Contributed at least ten times; \** at least 5 times in last month;
 \* more than 100 times in last month.
 

-
  resulting output:
-
  Table 3.1: Contributors to Wikipedia, January 2001
-- June 2005
-
   [table  omitted,  see  other  document  formats]

+
 

+resulting output:
+
 

+Table 3.1: Contributors to Wikipedia, January 2001 - June 2005
+
   [table
+ omitted,  see  other  document  formats]

 
-
  * Contributed at least ten times; ** at least 5 times in last month;
-*** more than 100 times in last month.
-
 9.6.2 POEM
-
  basic markup:
+
 

+* Contributed at least ten times; ** at least 5 times in last month; ***
+more than 100 times in last month.
 

+
9.6.2 Poem

+
+
 

+basic markup:
 
 

 
  poem{
     Your poem here
   }poem
   Each verse in a poem is given an object number.
 

-
  markup example:
-

+
 

+markup example:
 
 

 
  poem{
                       ‘Fury said to a
@@ -1474,65 +1682,116 @@ auto-heading numbering, without further intervention.
                          death."’
   }poem
 

-
  resulting output:
+
 

+resulting output:
 
                     ‘Fury said to a

-                     mouse, That he

-                   met in the

-                 house,

-              "Let us

-                both go to

-                  law:  I will

-                    prosecute

-                      YOU.  --Come,

-                         I’ll take no

-                          denial; We

-                       must have a

-                   trial:  For

-                really this

-             morning I’ve

-            nothing

-           to do."

-             Said the

-               mouse to the

-                 cur, "Such

-                   a trial,

-                     dear Sir,

-                           With

-                       no jury

-                    or judge,

-                  would be

-                wasting

-               our

-                breath."

-                 "I’ll be

-                   judge, I’ll

-                     be jury,"

-                           Said

-                      cunning

-                        old Fury:

-                       "I’ll

-                        try the

-                           whole

-                            cause,

-                               and

-                          condemn

-                         you

-                        to

-                         death."’

-
-
 9.6.3 GROUP
-
  basic markup:
+ 

+                   mouse, That he

+ 

+                 met in the

+ 

+               house,

+ 

+            "Let us

+ 

+              both go to

+ 

+                law:  I will

+ 

+                  prosecute

+ 

+                    YOU.  --Come,

+ 

+                       I’ll take no

+ 

+                        denial; We

+ 

+                     must have a

+ 

+                 trial:  For

+ 

+              really this

+ 

+           morning I’ve

+ 

+          nothing

+ 

+         to do."

+ 

+           Said the

+ 

+             mouse to the

+ 

+               cur, "Such

+ 

+                 a trial,

+ 

+                   dear Sir,

+ 

+                         With

+ 

+                     no jury

+ 

+                  or judge,

+ 

+                would be

+ 

+              wasting

+ 

+             our

+ 

+              breath."

+ 

+               "I’ll be

+ 

+                 judge, I’ll

+ 

+                   be jury,"

+ 

+                         Said

+ 

+                    cunning

+ 

+                      old Fury:

+ 

+                     "I’ll

+ 

+                      try the

+ 

+                         whole

+ 

+                          cause,

+ 

+                             and

+ 

+                        condemn

+ 

+                       you

+ 

+                      to

+ 

+                       death."’

+ 

+
 

+
9.6.3 Group

+
+
 

+basic markup:
 
 

 
  group{
+
     Your grouped text here
+
   }group
+
   A group is treated as an object and given a single object number.
 

-
  markup example:
-

+
 

+markup example:
 
 

 
  group{
+
                       ’Fury said to a
                      mouse, That he
                    met in the
@@ -1579,63 +1838,111 @@ auto-heading numbering, without further intervention.
                          death."’
   }group
 

-
  resulting output:
+
 

+resulting output:
 
                     ‘Fury said to a

-                     mouse, That he

-                   met in the

-                 house,

-              "Let us

-                both go to

-                  law:  I will

-                    prosecute

-                      YOU.  --Come,

-                         I’ll take no

-                          denial; We

-                       must have a

-                   trial:  For

-                really this

-             morning I’ve

-            nothing

-           to do."

-             Said the

-               mouse to the

-                 cur, "Such

-                   a trial,

-                     dear Sir,

-                           With

-                       no jury

-                    or judge,

-                  would be

-                wasting

-               our

-                breath."

-                 "I’ll be

-                   judge, I’ll

-                     be jury,"

-                           Said

-                      cunning

-                        old Fury:

-                       "I’ll

-                        try the

-                           whole

-                            cause,

-                               and

-                          condemn

-                         you

-                        to

-                         death."’

-
-
 9.6.4 CODE
-
  Code tags code{ ... }code (used as with other group tags described
-above) are used to escape regular sisu markup, and have been used extensively
+ 

+                   mouse, That he

+ 

+                 met in the

+ 

+               house,

+ 

+            "Let us

+ 

+              both go to

+ 

+                law:  I will

+ 

+                  prosecute

+ 

+                    YOU.  --Come,

+ 

+                       I’ll take no

+ 

+                        denial; We

+ 

+                     must have a

+ 

+                 trial:  For

+ 

+              really this

+ 

+           morning I’ve

+ 

+          nothing

+ 

+         to do."

+ 

+           Said the

+ 

+             mouse to the

+ 

+               cur, "Such

+ 

+                 a trial,

+ 

+                   dear Sir,

+ 

+                         With

+ 

+                     no jury

+ 

+                  or judge,

+ 

+                would be

+ 

+              wasting

+ 

+             our

+ 

+              breath."

+ 

+               "I’ll be

+ 

+                 judge, I’ll

+ 

+                   be jury,"

+ 

+                         Said

+ 

+                    cunning

+ 

+                      old Fury:

+ 

+                     "I’ll

+ 

+                      try the

+ 

+                         whole

+ 

+                          cause,

+ 

+                             and

+ 

+                        condemn

+ 

+                       you

+ 

+                      to

+ 

+                       death."’

+ 

+
+

+
9.6.4 Code

+
+
 

+Code tags code{ ... }code (used as with other group tags described above)
+are used to escape regular sisu markup, and have been used extensively
 within this document to provide examples of SiSU markup. You cannot however
 use code tags to escape code tags. They are however used in the same way
 as group or poem tags.
-
  A code-block is treated as an object and given a
-single object number. [an some  later  time]
-
  use of code tags instead of
-poem compared, resulting output:
-

+
 

+A code-block is treated as an object and given a single object number. [an
+some  later  time]
+
 

+use of code tags instead of poem compared, resulting output:
 
 

 
                      ‘Fury said to a
                      mouse, That he
@@ -1682,9 +1989,9 @@ poem compared, resulting output:
                         to
                          death."’
 

-
  From SiSU 2.7.7 on you can number codeblocks by placing a hash after the
+
 

+From SiSU 2.7.7 on you can number codeblocks by placing a hash after the
 opening code tag code{# as demonstrated here:
-

 
 

 
1  |                      ‘Fury said to a
 2  |                     mouse, That he
@@ -1731,274 +2038,375 @@ opening code tag code{# as demonstrated here:
 43 |                        to
 44 |                         death."’
 

-
 9.7 BOOK INDEX
-
  To make an index append to paragraph the book index term
-relates to it, using an equal sign and curly braces.
-
  Currently two levels
-are provided, a main term and if needed a sub-term. Sub-terms are separated
-from the main term by a colon.
 

+
9.7 Book Index

+
+
 

+To make an index append to paragraph the book index term relates to it,
+using an equal sign and curly braces.
+
 

+Currently two levels are provided, a main term and if needed a sub-term.
+Sub-terms are separated from the main term by a colon.
 
 

 
    Paragraph containing main term and sub-term.
     ={Main term:sub-term}
 

-
  The index syntax starts on a new line, but there should not be an empty
+
 

+The index syntax starts on a new line, but there should not be an empty
 line between paragraph and index markup.
-
  The structure of the resulting
-index would be:
-

+
 

+The structure of the resulting index would be:
 
 

 
    Main term, 1
       sub-term, 1
 

-
  Several terms may relate to a paragraph, they are separated by a semicolon.
+
 

+Several terms may relate to a paragraph, they are separated by a semicolon.
 If the term refers to more than one paragraph, indicate the number of paragraphs.
 
-

 
 

 
    Paragraph containing main term, second term and sub-term.
     ={first term; second term: sub-term}
 

-
  The structure of the resulting index would be:
-

+
 

+The structure of the resulting index would be:
 
 

 
    First term, 1,
     Second term, 1,
       sub-term, 1
 

-
  If multiple sub-terms appear under one paragraph, they are separated under
+
 

+If multiple sub-terms appear under one paragraph, they are separated under
 the main term heading from each other by a pipe symbol.
-

 
 

 
    Paragraph containing main term, second term and sub-term.
     ={Main term:sub-term+1|second sub-term
     A paragraph that continues discussion of the first sub-term
 

-
  The plus one in the example provided indicates the first sub-term spans
+
 

+The plus one in the example provided indicates the first sub-term spans
 one additional paragraph. The logical structure of the resulting index would
 be:
-

 
 

 
    Main term, 1,
       sub-term, 1-3,
       second sub-term, 1,
 

-
 10. COMPOSITE DOCUMENTS MARKUP
-
  It is possible to build a document by
-creating a master document that requires other documents. The documents
-required may be complete documents that could be generated independently,
-or they could be markup snippets, prepared so as to be easily available
-to be placed within another text. If the calling document is a master document
-(built from other documents), it should be named with the suffix .ssm Within
-this document you would provide information on the other documents that
-should be included within the text. These may be other documents that would
-be processed in a regular way, or markup bits prepared only for inclusion
-within a master document .sst regular markup file, or .ssi (insert/information)
-
-
A secondary file of the composite document is built prior to processing
-
-
with the same prefix and the suffix ._sst
-
  basic markup for importing a
+

+
10. Composite Documents Markup

+

 
-
document into a master document
+
 

+It is possible to build a document by creating a master document that requires
+other documents. The documents required may be complete documents that could
+be generated independently, or they could be markup snippets, prepared
+so as to be easily available to be placed within another text. If the calling
+document is a master document (built from other documents), it should be
+named with the suffix .ssm Within this document you would provide information
+on the other documents that should be included within the text. These may
+be other documents that would be processed in a regular way, or markup
+bits prepared only for inclusion within a master document .sst regular markup
+file, or .ssi (insert/information) A secondary file of the composite document
+
+
is built prior to processing with the same prefix and the suffix ._sst
 

+

+
+
basic markup for importing a document into a master document
 
 

 
  << filename1.sst
   << filename2.ssi
 

-
  The form described above should be relied on. Within the Vim editor it
-results in the text thus linked becoming hyperlinked to the document it
-is calling in which is convenient for editing. Alternative markup for importation
-of documents under consideration, and occasionally supported have been.
-
-

+
 

+The form described above should be relied on. Within the Vim editor it results
+in the text thus linked becoming hyperlinked to the document it is calling
+in which is convenient for editing. Alternative markup for importation of
+documents under consideration, and occasionally supported have been.
 
 

 
  << filename.ssi
   <<{filename.ssi}
   % using textlink alternatives
   << |filename.ssi|@|^|
 

-
 MARKUP SYNTAX HISTORY
-
 11. NOTES RELATED TO FILES-TYPES AND MARKUP SYNTAX
+

+
Markup Syntax History

+

+
+

+
11. Notes Related to Files-types and Markup Syntax

+

 
 
 2.0 introduced new headers and is therefore incompatible with 1.0 though
 otherwise the same with the addition of a couple of tags (i.e. a superset)
 
-
  0.38 is substantially current for version 1.0
-
  * sisu --query=[sisu  version
- [0.38] or ’history]
-
  provides a short history of changes to SiSU markup
+
 

+
+
0.38 is substantially current for version 1.0
+
 

+depreciated 0.16 supported, though file names were changed at 0.37
+
 

+* sisu --query=[sisu  version  [0.38] or ’history]
+
 

+
+
provides a short history of changes to SiSU markup
+
 

+SiSU 2.0 (2010-03-06:09/6) same as 1.0, apart from the changing of headers
+and the addition of a monospace tag related headers now grouped, e.g.
+
 

+
  @title:
+   :subtitle:
+  @creator:
+   :author:
+   :translator:
+   :illustrator:
+  @rights:
+   :text:
+   :illustrations:
+

+
 

+see document markup samples, and sisu --help headers
+
 

+the monospace tag takes the form of a hash ’#’
+
 

+
  #{ this enclosed text would be monospaced }#
+

+
 

+1.0 (2009-12-19:50/6) same as 0.69
+
 

+0.69 (2008-09-16:37/2) (same as 1.0) and as previous (0.57) with the addition
 
-
  0.57 (2007w34/4) SiSU 0.57 is the same as 0.42 with the introduction of
-some a shortcut to use the headers @title and @creator in the first heading
+
of book index tags
+
 

+
  /^={.+?}$/
+

+
 

+e.g. appended to a paragraph, on a new-line (without a blank line in between)
+logical structure produced assuming this is the first text "object"
+
 

+
   ={GNU/Linux community distribution:Debian+2|Fedora|Gentoo;Free Software
+Foundation+5}
+

+
 

+
  Free Software Foundation, 1-6
+  GNU/Linux community distribution, 1
+      Debian, 1-3
+      Fedora, 1
+      Gentoo,
+

+
 

+0.66 (2008-02-24:07/7) same as previous, adds semantic tags, [experimental
+ and not-used]
+
 

+
  /[:;]{.+?}[:;][a-z+]/
+

+
 

+0.57 (2007w34/4) SiSU 0.57 is the same as 0.42 with the introduction of some
+a shortcut to use the headers @title and @creator in the first heading
 [expanded  using  the  and  @author:]
-

 
 

 
  :A~ @title by @author
 

-
  0.52 (2007w14/6) declared document type identifier at start of text/document:
+
 

+0.52 (2007w14/6) declared document type identifier at start of text/document:
 
-
    .B SiSU

+
 

+  .B SiSU

  0.52
-
  or, backward compatible using the comment marker:
-
    %

+
 

+or, backward compatible using the comment marker:
+
 

+  %

  SiSU 0.38
-
  variations include ’ SiSU (text|master|insert) [version]’ and ’sisu-[version]’
+
 

+variations include ’ SiSU (text|master|insert) [version]’ and ’sisu-[version]’
 
-
  0.51 (2007w13/6) skins changed (simplified), markup unchanged
-
  0.42 (2006w27/4)
-* (asterisk) type endnotes, used e.g. in relation to author
-
  SiSU 0.42 is
-the same as 0.38 with the introduction of some additional endnote types,
+
 

+0.51 (2007w13/6) skins changed (simplified), markup unchanged
+
 

+0.42 (2006w27/4) * (asterisk) type endnotes, used e.g. in relation to author
 
-
  Introduces some variations on endnotes, in particular the use of the
+
 

+SiSU 0.42 is the same as 0.38 with the introduction of some additional endnote
+types,
+
 

+Introduces some variations on endnotes, in particular the use of the asterisk
 
-
asterisk
-

 
 

 
  ~{* for example for describing an author }~ and ~{** for describing a
 second author }~
 

-
  * for example for describing an author
-
  ** for describing a second author
+
 

+* for example for describing an author
+
 

+** for describing a second author
+
 

 
-
  and
-

+
and
 
 

 
  ~[*  my  note  ]~ or ~[+  another  note  ]~
 

-
  which numerically increments an asterisk and plus respectively
-
  *1 my
+
 

 
-
note +1 another note
-
  0.38 (2006w15/7) introduced new/alternative notation
-for headers, e.g. @title: (instead of 0~title), and accompanying document
-structure markup, :A,:B,:C,1,2,3 (maps to previous 1,2,3,4,5,6)
-
  SiSU
-0.38 introduced alternative experimental header and heading/structure markers,
+
which numerically increments an asterisk and plus respectively
+
 

 
-

+
*1 my note +1 another note
+
 

+0.38 (2006w15/7) introduced new/alternative notation for headers, e.g. @title:
+(instead of 0~title), and accompanying document structure markup, :A,:B,:C,1,2,3
+(maps to previous 1,2,3,4,5,6)
+
 

+SiSU 0.38 introduced alternative experimental header and heading/structure
+markers,
 
 

 
  @headername: and headers :A~ :B~ :C~ 1~ 2~ 3~
 

-
  as the equivalent of:
-

+
 

+as the equivalent of:
 
 

 
  0~headername and headers 1~ 2~ 3~ 4~ 5~ 6~
 

-
  The internal document markup of SiSU 0.16 remains valid and standard Though
+
 

+
+
The internal document markup of SiSU 0.16 remains valid and standard Though
 
 
note that SiSU 0.37 introduced a new file naming convention
-
  SiSU has in
-effect two sets of levels to be considered, using 0.38 notation A-C headings/levels,
-pre-ordinary paragraphs /pre-substantive text, and 1-3 headings/levels, levels
-which are followed by ordinary text. This may be conceptualised as levels
-A,B,C, 1,2,3, and using such letter number notation, in effect: A must
-exist, optional B and C may follow in sequence (not strict) 1 must exist,
-optional 2 and 3 may follow in sequence i.e. there are two independent heading
-level sequences A,B,C and 1,2,3 (using the 0.16 standard notation 1,2,3
-and 4,5,6) on the positive side: the 0.38 A,B,C,1,2,3 alternative makes
-explicit an aspect of structuring documents in SiSU that is not otherwise
+
 

+SiSU has in effect two sets of levels to be considered, using 0.38 notation
+A-C headings/levels, pre-ordinary paragraphs /pre-substantive text, and 1-3
+headings/levels, levels which are followed by ordinary text. This may be
+conceptualised as levels A,B,C, 1,2,3, and using such letter number notation,
+in effect: A must exist, optional B and C may follow in sequence (not strict)
+1 must exist, optional 2 and 3 may follow in sequence i.e. there are two
+independent heading level sequences A,B,C and 1,2,3 (using the 0.16 standard
+notation 1,2,3 and 4,5,6) on the positive side: the 0.38 A,B,C,1,2,3 alternative
+makes explicit an aspect of structuring documents in SiSU that is not otherwise
 obvious to the newcomer (though it appears more complicated, is more in
 your face and likely to be understood fairly quickly); the substantive
 text follows levels 1,2,3 and it is ’nice’ to do most work in those levels
 
-
  0.37 (2006w09/7) introduced new file naming convention, .sst (text), .ssm
+
 

+0.37 (2006w09/7) introduced new file naming convention, .sst (text), .ssm
 (master), .ssi (insert), markup syntax unchanged
-
  SiSU 0.37 introduced new
-file naming convention, using the file extensions .sst  .ssm and .ssi to replace
-.s1 .s2 .s3 .r1 .r2 .r3 and .si

+
 

+SiSU 0.37 introduced new file naming convention, using the file extensions
+.sst  .ssm and .ssi to replace .s1 .s2 .s3 .r1 .r2 .r3 and .si

 
-
  this is captured by the following file ’rename’ instruction:
-

+
 

+this is captured by the following file ’rename’ instruction:
 
 

 
  rename ’s/.s[123]$/.sst/’ *.s{1,2,3}
   rename ’s/.r[123]$/.ssm/’ *.r{1,2,3}
   rename ’s/.si$/.ssi/’ *.si
 

-
  The internal document markup remains unchanged, from SiSU 0.16
-
  0.35 (2005w52/3)
-sisupod, zipped content file introduced
-
  0.23 (2005w36/2) utf-8 for markup
-
-
file
-
  0.22 (2005w35/3) image dimensions may be omitted if rmagick is available
+
 

+The internal document markup remains unchanged, from SiSU 0.16
+
 

+0.35 (2005w52/3) sisupod, zipped content file introduced
+
 

+0.23 (2005w36/2) utf-8 for markup file
+
 

+0.22 (2005w35/3) image dimensions may be omitted if rmagick is available
 
 
to be relied upon
-
  0.20.4 (2005w33/4) header 0~links
-
  0.16 (2005w25/2) substantial
-changes introduced to make markup cleaner, header 0~title type, and headings
-[1-6]~ introduced, also percentage sign (%) at start of a text line as comment
-
-
marker
-
  SiSU 0.16 (0.15 development branch) introduced the use of
-
  the
-header 0~ and headings/structure 1~ 2~ 3~ 4~ 5~ 6~
-
  in place of the 0.1
-header, heading/structure notation
-
  SiSU 0.1 headers and headings structure
-represented by header 0{~ and headings/structure 1{ 2{ 3{ 4{~ 5{ 6{
-
 12.
-SISU FILETYPES
-
  SiSU has plaintext and binary filetypes, and can process
-either type of document.
-
 12.1 .SST .SSM .SSI MARKED UP PLAIN TEXT
-
  SiSU documents
-are prepared as plain-text (utf-8) files with SiSU markup. They may make reference
-to and contain images (for example), which are stored in the directory
-beneath them _sisu/image. SiSU plaintext markup files are of three types
-that may be distinguished by the file extension used: regular text .sst;
-master documents, composite documents that incorporate other text, which
-can be any regular text or text insert; and inserts the contents of which
-are like regular text except these are marked  .ssi and are not processed.

-
-
  SiSU processing can be done directly against a sisu documents; which
-may be located locally or on a remote server for which a url is provided.
-
-
  SiSU source markup can be shared with the command:
-
    sisu -s [filename]

-
-
 12.1.1 SISU TEXT - REGULAR FILES (.SST)
-
  The most common form of document
-in SiSU , see the section on SiSU markup.
-
  <http://www.sisudoc.org/sisu/sisu_markup
->
-
-
  <http://www.sisudoc.org/sisu/sisu_manual
->
-
 12.1.2 SISU MASTER FILES (.SSM)
-

- Composite documents which incorporate other SiSU documents which may be
-either regular SiSU text .sst which may be generated independently, or inserts
+
 

+0.20.4 (2005w33/4) header 0~links
+
 

+0.16 (2005w25/2) substantial changes introduced to make markup cleaner,
+header 0~title type, and headings [1-6]~ introduced, also percentage sign
+(%) at start of a text line as comment marker
+
 

+SiSU 0.16 (0.15 development branch) introduced the use of
+
 

+the header 0~ and headings/structure 1~ 2~ 3~ 4~ 5~ 6~
+
 

+in place of the 0.1 header, heading/structure notation
+
 

+SiSU 0.1 headers and headings structure represented by header 0{~ and headings/structure
+1{ 2{ 3{ 4{~ 5{ 6{
+

+
12. Sisu Filetypes

+

+
+
 

+SiSU has plaintext and binary filetypes, and can process either type of
+document.
+

+
12.1 .sst .ssm .ssi Marked Up Plain Text

+
+
 

+SiSU documents are prepared as plain-text (utf-8) files with SiSU markup.
+They may make reference to and contain images (for example), which are
+stored in the directory beneath them _sisu/image. SiSU plaintext markup
+files are of three types that may be distinguished by the file extension
+used: regular text .sst; master documents, composite documents that incorporate
+other text, which can be any regular text or text insert; and inserts the
+contents of which are like regular text except these are marked  .ssi and
+are not processed.

+
+
 

+SiSU processing can be done directly against a sisu documents; which may
+be located locally or on a remote server for which a url is provided.
+
 

+SiSU source markup can be shared with the command:
+
 

+  sisu -s [filename]

+
+

+
12.1.1 Sisu Text - Regular Files (.sst)

+
+
 

+The most common form of document in SiSU , see the section on SiSU markup.
+
+
 

+<http://www.sisudoc.org/sisu/sisu_markup
+>
+
 

+<http://www.sisudoc.org/sisu/sisu_manual
+>
+

+
12.1.2 Sisu Master Files (.ssm)

+
+
 

+Composite documents which incorporate other SiSU documents which may be
+either regular SiSU text .sst which may be generated independently, or inserts
 prepared solely for the purpose of being incorporated into one or more
 master documents.
-
  The mechanism by which master files incorporate other
-documents is described as one of the headings under under SiSU markup in
-the SiSU manual.
-
  Note: Master documents may be prepared in a similar way
-to regular documents, and processing will occur normally if a .sst file
-is renamed .ssm without requiring any other documents; the .ssm marker flags
-that the document may contain other documents.
-
  Note: a secondary file
-of the composite document is built prior to processing with the same prefix
-and the suffix ._sst [^17]
-
  <http://www.sisudoc.org/sisu/sisu_markup
+
 

+The mechanism by which master files incorporate other documents is described
+as one of the headings under under SiSU markup in the SiSU manual.
+
 

+Note: Master documents may be prepared in a similar way to regular documents,
+and processing will occur normally if a .sst file is renamed .ssm without
+requiring any other documents; the .ssm marker flags that the document may
+contain other documents.
+
 

+Note: a secondary file of the composite document is built prior to processing
+with the same prefix and the suffix ._sst [^17]
+
 

+<http://www.sisudoc.org/sisu/sisu_markup
 >
-
  <http://www.sisudoc.org/sisu/sisu_manual
+
 

+<http://www.sisudoc.org/sisu/sisu_manual
 >
+

+
12.1.3 Sisu Insert Files (.ssi)

 
-
 12.1.3 SISU INSERT FILES (.SSI)
-
  Inserts are documents prepared solely for
-the purpose of being incorporated into one or more master documents. They
-resemble regular SiSU text files except they are ignored by the SiSU processor.
-Making a file a .ssi file is a quick and convenient way of flagging that
-it is not intended that the file should be processed on its own.
-
 12.2 SISUPOD,
-ZIPPED BINARY CONTAINER (SISUPOD.ZIP, .SSP)
-
  A sisupod is a zipped SiSU
-text file or set of SiSU text files and any associated images that they
-contain (this will be extended to include sound and multimedia-files)
+
 

+Inserts are documents prepared solely for the purpose of being incorporated
+into one or more master documents. They resemble regular SiSU text files
+except they are ignored by the SiSU processor. Making a file a .ssi file
+is a quick and convenient way of flagging that it is not intended that
+the file should be processed on its own.
 

+
12.2 Sisupod, Zipped Binary Container
+(sisupod.zip, .ssp)

+
+
 

+A sisupod is a zipped SiSU text file or set of SiSU text files and any
+associated images that they contain (this will be extended to include sound
+and multimedia-files)
+
 

 SiSU plaintext files rely on a recognised directory structure to find contents
 such as images associated with documents, but all images for example for
 all documents contained in a directory are located in the sub-directory
@@ -2006,212 +2414,306 @@ _sisu/image. Without the ability to create a sisupod it can be inconvenient
 to manually identify all other files associated with a document. A sisupod
 automatically bundles all associated files with the document that is turned
 into a pod.
-
  The structure of the sisupod is such that it may for example
-contain a single document and its associated images; a master document
-and its associated documents and anything else; or the zipped contents
-of a whole directory of prepared SiSU documents.
-
  The command to create
-a sisupod is:
-
    sisu -S [filename]

+
 

+The structure of the sisupod is such that it may for example contain a
+single document and its associated images; a master document and its associated
+documents and anything else; or the zipped contents of a whole directory
+of prepared SiSU documents.
+
 

+The command to create a sisupod is:
+
 

+  sisu -S [filename]

 
-
  Alternatively, make a pod of the contents of a whole directory:
-

-sisu -S

+
 

+Alternatively, make a pod of the contents of a whole directory:
+
 

+  sisu -S

 
-
  SiSU processing can be done directly against a sisupod; which may be
-located locally or on a remote server for which a url is provided.
-
  <http://www.sisudoc.org/sisu/sisu_commands
+
 

+SiSU processing can be done directly against a sisupod; which may be located
+locally or on a remote server for which a url is provided.
+
 

+<http://www.sisudoc.org/sisu/sisu_commands
 >
-
-
  <http://www.sisudoc.org/sisu/sisu_manual
+
 

+<http://www.sisudoc.org/sisu/sisu_manual
 >
-
 13. EXPERIMENTAL ALTERNATIVE INPUT
-REPRESENTATIONS
-
 13.1 ALTERNATIVE XML
-
  SiSU offers alternative XML input
-representations of documents as a proof of concept, experimental feature.
-They are however not strictly maintained, and incomplete and should be
-handled with care.
-
  convert from sst to simple xml representations (sax,
-dom and node):
-
    sisu --to-sax [filename/wildcard] or sisu --to-sxs [filename/wildcard]

+

+
13. Experimental Alternative Input
+Representations

+

+
+

+
13.1 Alternative Xml

+
+
 

+SiSU offers alternative XML input representations of documents as a proof
+of concept, experimental feature. They are however not strictly maintained,
+and incomplete and should be handled with care.
+
 

+convert from sst to simple xml representations (sax, dom and node):
+
 

+  sisu --to-sax [filename/wildcard] or sisu --to-sxs [filename/wildcard]

+
+
 

+  sisu --to-dom [filename/wildcard] or sisu --to-sxd [filename/wildcard]

+
+
 

+  sisu --to-node [filename/wildcard] or sisu --to-sxn [filename/wildcard]

+
+
 

+convert to sst from any sisu xml representation (sax, dom and node):
+
 

+  sisu --from-xml2sst [filename/wildcard  [.sxs.xml,.sxd.xml,sxn.xml]]

+
+
 

+or the same:
+
 

+  sisu --from-sxml [filename/wildcard  [.sxs.xml,.sxd.xml,sxn.xml]]

+
+

+
13.1.1 Xml Sax Representation

 
-
    sisu --to-dom [filename/wildcard] or sisu --to-sxd [filename/wildcard]

+
 

+To convert from sst to simple xml (sax) representation:
+
 

+  sisu --to-sax [filename/wildcard] or sisu --to-sxs [filename/wildcard]

 
-
    sisu --to-node [filename/wildcard] or sisu --to-sxn [filename/wildcard]

+
 

 
-
  convert to sst from any sisu xml representation (sax, dom and node):
+
To convert from any sisu xml representation back to sst
+
 

+  sisu --from-xml2sst [filename/wildcard  [.sxs.xml,.sxd.xml,sxn.xml]]

 
-
    sisu --from-xml2sst [filename/wildcard  [.sxs.xml,.sxd.xml,sxn.xml]]

+
 

+or the same:
+
 

+  sisu --from-sxml [filename/wildcard  [.sxs.xml,.sxd.xml,sxn.xml]]

 
-
  or the same:
-
    sisu --from-sxml [filename/wildcard  [.sxs.xml,.sxd.xml,sxn.xml]]

+

+
13.1.2 Xml Dom Representation

 
-
 13.1.1 XML SAX REPRESENTATION
-
  To convert from sst to simple xml (sax)
-representation:
-
    sisu --to-sax [filename/wildcard] or sisu --to-sxs [filename/wildcard]

+
 

+To convert from sst to simple xml (dom) representation:
+
 

+  sisu --to-dom [filename/wildcard] or sisu --to-sxd [filename/wildcard]

 
-
  To convert from any sisu xml representation back to sst
-
    sisu --from-xml2sst
-[filename/wildcard  [.sxs.xml,.sxd.xml,sxn.xml]]

+
 

 
-
  or the same:
-
    sisu --from-sxml [filename/wildcard  [.sxs.xml,.sxd.xml,sxn.xml]]

+
To convert from any sisu xml representation back to sst
+
 

+  sisu --from-xml2sst [filename/wildcard  [.sxs.xml,.sxd.xml,sxn.xml]]

 
-
 13.1.2 XML DOM REPRESENTATION
-
  To convert from sst to simple xml (dom)
-representation:
-
    sisu --to-dom [filename/wildcard] or sisu --to-sxd [filename/wildcard]

+
 

+or the same:
+
 

+  sisu --from-sxml [filename/wildcard  [.sxs.xml,.sxd.xml,sxn.xml]]

 
-
  To convert from any sisu xml representation back to sst
-
    sisu --from-xml2sst
-[filename/wildcard  [.sxs.xml,.sxd.xml,sxn.xml]]

+

+
13.1.3 Xml Node Representation

 
-
  or the same:
-
    sisu --from-sxml [filename/wildcard  [.sxs.xml,.sxd.xml,sxn.xml]]

+
 

+To convert from sst to simple xml (node) representation:
+
 

+  sisu --to-node [filename/wildcard] or sisu --to-sxn [filename/wildcard]

 
-
 13.1.3 XML NODE REPRESENTATION
-
  To convert from sst to simple xml (node)
-representation:
-
    sisu --to-node [filename/wildcard] or sisu --to-sxn [filename/wildcard]

+
 

 
-
  To convert from any sisu xml representation back to sst
-
    sisu --from-xml2sst
-[filename/wildcard  [.sxs.xml,.sxd.xml,sxn.xml]]

+
To convert from any sisu xml representation back to sst
+
 

+  sisu --from-xml2sst [filename/wildcard  [.sxs.xml,.sxd.xml,sxn.xml]]

 
-
  or the same:
-
    sisu --from-sxml [filename/wildcard  [.sxs.xml,.sxd.xml,sxn.xml]]

+
 

+or the same:
+
 

+  sisu --from-sxml [filename/wildcard  [.sxs.xml,.sxd.xml,sxn.xml]]

 
-
 14. CONFIGURATION
-
 14.1 DETERMINING THE CURRENT CONFIGURATION
-
  Information
-on the current configuration of SiSU should be available with the help
-command:
-
    sisu -v

+

+
14. Configuration

+

 
-
  which is an alias for:
-
    sisu --help env

+

+
14.1 Determining the Current Configuration

 
-
  Either of these should be executed from within a directory that contains
+
 

+Information on the current configuration of SiSU should be available with
+the help command:
+
 

+  sisu -v

+
+
 

+which is an alias for:
+
 

+  sisu --help env

+
+
 

+Either of these should be executed from within a directory that contains
 sisu markup source documents.
-
 14.2 CONFIGURATION FILES (CONFIG.YML)
-
  SiSU
-configration parameters are adjusted in the configuration file, which can
-be used to override the defaults set. This includes such things as which
+

+
14.2 Configuration Files (config.yml)

+
+
 

+SiSU configration parameters are adjusted in the configuration file, which
+can be used to override the defaults set. This includes such things as which
 directory interim processing should be done in and where the generated
 output should be placed.
-
  The SiSU configuration file is a yaml file, which
-means indentation is significant.
-
  SiSU resource configuration is determined
-by looking at the following files if they exist:
-
    ./_sisu/sisurc.yml

+
 

+The SiSU configuration file is a yaml file, which means indentation is
+significant.
+
 

+SiSU resource configuration is determined by looking at the following files
+if they exist:
+
 

+  ./_sisu/sisurc.yml

 
-
    ~/.sisu/sisurc.yml

+
 

+  ~/.sisu/sisurc.yml

 
-
    /etc/sisu/sisurc.yml

+
 

+  /etc/sisu/sisurc.yml

 
-
  The search is in the order listed, and the first one found is used.
-

- In the absence of instructions in any of these it falls back to the internal
+
 

+The search is in the order listed, and the first one found is used.
+
 

+In the absence of instructions in any of these it falls back to the internal
 program defaults.
-
  Configuration determines the output and processing directories
-and the database access details.
-
  If SiSU is installed a sample sisurc.yml
+
 

+Configuration determines the output and processing directories and the
+database access details.
+
 

 
-
may be found in /etc/sisu/sisurc.yml
-
 15. SKINS
-
  Skins modify the default
-appearance of document output on a document, directory, or site wide basis.
-Skins are looked for in the following locations:
-
    ./_sisu/skin

+
If SiSU is installed a sample sisurc.yml may be found in /etc/sisu/sisurc.yml
 
-
    ~/.sisu/skin

+

+
15. Skins

+

 
-
    /etc/sisu/skin

+
 

+Skins modify the default appearance of document output on a document, directory,
+or site wide basis. Skins are looked for in the following locations:
+
 

+  ./_sisu/skin

 
-
  Within the skin directory are the following the default sub-directories
+
 

+  ~/.sisu/skin

+
+
 

+  /etc/sisu/skin

+
+
 

+Within the skin directory are the following the default sub-directories
 for document skins:
-
    ./skin/doc

+
 

+  ./skin/doc

+
+
 

+  ./skin/dir

 
-
    ./skin/dir

+
 

+  ./skin/site

 
-
    ./skin/site

+
 

 
-
  A skin is placed in the appropriate directory and the file named skin_[name].rb
+
A skin is placed in the appropriate directory and the file named skin_[name].rb
 
-
  The skin itself is a ruby file which modifies the default appearances
-set in the program.
-
 15.1 DOCUMENT SKIN
-
  Documents take on a document skin,
-if the header of the document specifies a skin to be used.
+
 

+The skin itself is a ruby file which modifies the default appearances set
+in the program.
 

+
15.1 Document Skin

+
+
 

+Documents take on a document skin, if the header of the document specifies
+a skin to be used.
 
 

 
  @skin: skin_united_nations
 

-
 15.2 DIRECTORY SKIN
-
  A directory may be mapped on to a particular skin,
-so all documents within that directory take on a particular appearance.
-If a skin exists in the skin/dir with the same name as the document directory,
-it will automatically be used for each of the documents in that directory,
-(except where a document specifies the use of another skin, in the skin/doc
-directory).
-
  A personal habit is to place all skins within the doc directory,
-and symbolic links as needed from the site, or dir directories as required.
-
-
 15.3 SITE SKIN
-
  A site skin, modifies the program default skin.
-
 15.4 SAMPLE
-
-
SKINS
-
  With SiSU installed sample skins may be found in:
-
    /etc/sisu/skin/doc
-and

+

+
15.2 Directory Skin

+
+
 

+A directory may be mapped on to a particular skin, so all documents within
+that directory take on a particular appearance. If a skin exists in the
+skin/dir with the same name as the document directory, it will automatically
+be used for each of the documents in that directory, (except where a document
+specifies the use of another skin, in the skin/doc directory).
+
 

+A personal habit is to place all skins within the doc directory, and symbolic
+links as needed from the site, or dir directories as required.
+

+
15.3 Site
+Skin

+
+
 

+A site skin, modifies the program default skin.
+

+
15.4 Sample Skins

+
+
 

+With SiSU installed sample skins may be found in:
+
 

+  /etc/sisu/skin/doc and

    /usr/share/doc/sisu/markup-samples/samples/_sisu/skin/doc

 
-
  (or equivalent directory) and if sisu-markup-samples is installed also
-under:
-
    /usr/share/doc/sisu/markup-samples-non-free/samples/_sisu/skin/doc

+
 

+(or equivalent directory) and if sisu-markup-samples is installed also under:
+
+
 

+  /usr/share/doc/sisu/markup-samples-non-free/samples/_sisu/skin/doc

 
-
  Samples of list.yml and promo.yml (which are used to create the right
-column list) may be found in:
-
    /usr/share/doc/sisu/markup-samples-non-free/samples/_sisu/skin/yml
-(or

+
 

+Samples of list.yml and promo.yml (which are used to create the right column
+list) may be found in:
+
 

+  /usr/share/doc/sisu/markup-samples-non-free/samples/_sisu/skin/yml (or

    equivalent directory)

 
-
 16. CSS - CASCADING STYLE SHEETS (FOR HTML, XHTML AND XML)
-
  CSS files
-to modify the appearance of SiSU html, XHTML or XML may be placed in the
-configuration directory: ./_sisu/css ; ~/.sisu/css or; /etc/sisu/css and
-these will be copied to the output directories with the command sisu -CC.
-
-
  The basic CSS file for html output is html.css, placing a file of that
-name in directory _sisu/css or equivalent will result in the default file
-of that name being overwritten.
-
  HTML: html.css
-
  XML DOM: dom.css
-
  XML
-SAX: sax.css
-
  XHTML: xhtml.css
-
  The default homepage may use homepage.css
-
-
or html.css
-
  Under consideration is to permit the placement of a CSS file
-with a different name in directory _sisu/css directory or equivalent, and
-change the default CSS file that is looked for in a skin.[^18]
-
 17. ORGANISING
-CONTENT
-
 17.1 DIRECTORY STRUCTURE AND MAPPING
-
  The output directory root
-can be set in the sisurc.yml file. Under the root, subdirectories are made
-for each directory in which a document set resides. If you have a directory
-named poems or conventions, that directory will be created under the output
-directory root and the output for all documents contained in the directory
-of a particular name will be generated to subdirectories beneath that directory
-(poem or conventions). A document will be placed in a subdirectory of the
-same name as the document with the filetype identifier stripped (.sst .ssm)
-
-
  The last part of a directory path, representing the sub-directory in which
+

+
16. Css - Cascading Style Sheets (for Html, Xhtml and Xml)

+

+
+
 

+CSS files to modify the appearance of SiSU html, XHTML or XML may be placed
+in the configuration directory: ./_sisu/css ; ~/.sisu/css or; /etc/sisu/css
+and these will be copied to the output directories with the command sisu
+-CC.
+
 

+The basic CSS file for html output is html.css, placing a file of that name
+in directory _sisu/css or equivalent will result in the default file of
+that name being overwritten.
+
 

+HTML: html.css
+
 

+XML DOM: dom.css
+
 

+XML SAX: sax.css
+
 

+XHTML: xhtml.css
+
 

+
+
The default homepage may use homepage.css or html.css
+
 

+Under consideration is to permit the placement of a CSS file with a different
+name in directory _sisu/css directory or equivalent, and change the default
+CSS file that is looked for in a skin.[^18]
+

+
17. Organising Content

+

+
+

+
17.1 Directory Structure and Mapping

+
+
 

+The output directory root can be set in the sisurc.yml file. Under the root,
+subdirectories are made for each directory in which a document set resides.
+If you have a directory named poems or conventions, that directory will
+be created under the output directory root and the output for all documents
+contained in the directory of a particular name will be generated to subdirectories
+beneath that directory (poem or conventions). A document will be placed
+in a subdirectory of the same name as the document with the filetype identifier
+stripped (.sst .ssm)
+
 

+The last part of a directory path, representing the sub-directory in which
 a document set resides, is the directory name that will be used for the
 output directory. This has implications for the organisation of document
 collections as it could make sense to place documents of a particular subject,
@@ -2226,45 +2728,53 @@ be output to the same output directory. Skins could be associated with each
 institution on a directory basis and resulting documents will take on the
 appropriate different appearance.
 

-
 18. HOMEPAGES
-
  SiSU is about the ability
-to auto-generate documents. Home pages are regarded as custom built items,
-and are not created by SiSU  SiSU has a default home page, which will not
-be appropriate for use with other sites, and the means to provide your
-own home page instead in one of two ways as part of a site’s configuration,
-these being:
-
  1. through placing your home page and other custom built
-documents in the subdirectory _sisu/home/ (this probably being the easier
-and more convenient option)
-
  2. through providing what you want as the
-home page in a skin,
-
  Document sets are contained in directories, usually
-organised by site or subject. Each directory can/should have its own homepage.
-See the section on directory structure and organisation of content.
-
 18.1
-
-
HOME PAGE AND OTHER CUSTOM BUILT PAGES IN A SUB-DIRECTORY
-
  Custom built
-pages, including the home page index.html may be placed within the configuration
-directory _sisu/home/ in any of the locations that is searched for the
-configuration directory, namely ./_sisu ; ~/_sisu ; /etc/sisu From there
-they are copied to the root of the output directory with the command:
-

-   sisu -CC

-
-
 18.2 HOME PAGE WITHIN A SKIN
-
  Skins are described in a separate section,
-but basically are a file written in the programming language Ruby that
-may be provided to change the defaults that are provided with sisu with
-respect to individual documents, a directories contents or for a site.
-

- If you wish to provide a homepage within a skin the skin should be in
-the directory _sisu/skin/dir and have the name of the directory for which
-it is to become the home page. Documents in the directory commercial_law
-would have the homepage modified in skin_commercial law.rb; or the directory
-
-
poems in skin_poems.rb
+
18. Homepages

+

+
+
 

+SiSU is about the ability to auto-generate documents. Home pages are regarded
+as custom built items, and are not created by SiSU  SiSU has a default
+home page, which will not be appropriate for use with other sites, and
+the means to provide your own home page instead in one of two ways as part
+of a site’s configuration, these being:
+
 

+1. through placing your home page and other custom built documents in the
+subdirectory _sisu/home/ (this probably being the easier and more convenient
+option)
+
 

+2. through providing what you want as the home page in a skin,
+
 

+Document sets are contained in directories, usually organised by site or
+subject. Each directory can/should have its own homepage. See the section
+on directory structure and organisation of content.
 

+
18.1 Home Page and Other
+Custom Built Pages in a Sub-directory

+
+
 

+Custom built pages, including the home page index.html may be placed within
+the configuration directory _sisu/home/ in any of the locations that is
+searched for the configuration directory, namely ./_sisu ; ~/_sisu ; /etc/sisu
+From there they are copied to the root of the output directory with the
+command:
+
 

+  sisu -CC

+
+

+
18.2 Home Page Within a Skin

+
+
 

+Skins are described in a separate section, but basically are a file written
+in the programming language Ruby that may be provided to change the defaults
+that are provided with sisu with respect to individual documents, a directories
+contents or for a site.
+
 

+If you wish to provide a homepage within a skin the skin should be in the
+directory _sisu/skin/dir and have the name of the directory for which it
+is to become the home page. Documents in the directory commercial_law would
+have the homepage modified in skin_commercial law.rb; or the directory poems
+
+
in skin_poems.rb
 
 

 
    class Home
       def homepage
@@ -2280,46 +2790,63 @@ index.html
       end
     end
 

-
 19. MARKUP AND OUTPUT EXAMPLES
-
 19.1 MARKUP EXAMPLES
-
  Current markup examples
-and document output samples are provided at <http://www.jus.uio.no/sisu/SiSU/examples.html
+

+
19. Markup and Output Examples

+

+
+

+
19.1 Markup Examples

+
+
 

+Current markup examples and document output samples are provided at <http://www.jus.uio.no/sisu/SiSU/examples.html
 >
 
-
  For some documents hardly any markup at all is required at all, other
-than a header, and an indication that the levels to be taken into account
-by the program in generating its output are.
-
 20. SISU SEARCH - INTRODUCTION
+
 

+For some documents hardly any markup at all is required at all, other than
+a header, and an indication that the levels to be taken into account by
+the program in generating its output are.
+

+
20. Sisu Search - Introduction

+

 
-
  SiSU output can easily and conveniently be indexed by a number of standalone
+
 

+SiSU output can easily and conveniently be indexed by a number of standalone
 indexing tools, such as Lucene, Hyperestraier.
-
  Because the document structure
-of sites created is clearly defined, and the text object citation system
-is available hypothetically at least, for all forms of output, it is possible
-to search the sql database, and either read results from that database,
-or just as simply map the results to the html output, which has richer
-text markup.
-
  In addition to this SiSU has the ability to populate a relational
-sql type database with documents at an object level, with objects numbers
-that are shared across different output types, which make them searchable
-with that degree of granularity. Basically, your match criteria is met by
-these documents and at these locations within each document, which can
-be viewed within the database directly or in various output formats.
-
 21.
-SQL
-
 21.1 POPULATING SQL TYPE DATABASES
-
  SiSU feeds sisu markupd documents
-into sql type databases PostgreSQL[^19] and/or SQLite[^20] database together
-with information related to document structure.
-
  This is one of the more
-interesting output forms, as all the structural data of the documents are
-retained (though can be ignored by the user of the database should they
-so choose). All site texts/documents are (currently) streamed to four tables:
-
-
    * one containing semantic (and other) headers, including, title, author,

+
 

+Because the document structure of sites created is clearly defined, and
+the text object citation system is available hypothetically at least, for
+all forms of output, it is possible to search the sql database, and either
+read results from that database, or just as simply map the results to the
+html output, which has richer text markup.
+
 

+In addition to this SiSU has the ability to populate a relational sql type
+database with documents at an object level, with objects numbers that are
+shared across different output types, which make them searchable with that
+degree of granularity. Basically, your match criteria is met by these documents
+and at these locations within each document, which can be viewed within
+the database directly or in various output formats.
+

+
21. Sql

+

+
+

+
21.1 Populating Sql Type Databases

+
+
 

+SiSU feeds sisu markupd documents into sql type databases PostgreSQL[^19]
+and/or SQLite[^20] database together with information related to document
+structure.
+
 

+This is one of the more interesting output forms, as all the structural
+data of the documents are retained (though can be ignored by the user of
+the database should they so choose). All site texts/documents are (currently)
+streamed to four tables:
+
 

+  * one containing semantic (and other) headers, including, title, author,

    subject, (the Dublin Core...);

 
-
    * another the substantive texts by individual "paragraph" (or object)
+
 

+  * another the substantive texts by individual "paragraph" (or object)
 - along

    with structural information, each paragraph being identifiable by its

    paragraph number (if it has one which almost all of them do), and the

@@ -2327,85 +2854,103 @@ so choose). All site texts/documents are (currently) streamed to four tables:
 (both in

    formatted and clean text versions for searching); and

 
-
    * a third containing endnotes cross-referenced back to the paragraph
-from

+
 

+  * a third containing endnotes cross-referenced back to the paragraph from

    which they are referenced (both in formatted and clean text versions
 for

    searching).

 
-
    * a fourth table with a one to one relation with the headers table
-contains

+
 

+  * a fourth table with a one to one relation with the headers table contains

    full text versions of output, eg. pdf, html, xml, and ascii.

 
-
  There is of course the possibility to add further structures.
-
  At this
-level SiSU loads a relational database with documents chunked into objects,
-their smallest logical structurally constituent parts, as text objects,
-with their object citation number and all other structural information
+
 

+There is of course the possibility to add further structures.
+
 

+At this level SiSU loads a relational database with documents chunked into
+objects, their smallest logical structurally constituent parts, as text
+objects, with their object citation number and all other structural information
 needed to construct the document. Text is stored (at this text object level)
 with and without elementary markup tagging, the stripped version being
 so as to facilitate ease of searching.
-
  Being able to search a relational
-database at an object level with the SiSU citation system is an effective
-way of locating content generated by SiSU  object numbers, and all versions
-of the document have the same numbering, complex searches can be tailored
-to return just the locations of the search results relevant for all available
-output formats, with live links to the precise locations in the database
-or in html/xml documents; or, the structural information provided makes
-it possible to search the full contents of the database and have headings
-in which search content appears, or to search only headings etc. (as the
-Dublin Core is incorporated it is easy to make use of that as well).
-
 22.
-POSTGRESQL
-
 22.1 NAME
-
  SiSU - Structured information, Serialized Units
-- a document publishing system, postgresql dependency package
-
 22.2 DESCRIPTION
-
-
  Information related to using postgresql with sisu (and related to the
-sisu_postgresql dependency package, which is a dummy package to install
-dependencies needed for SiSU to populate a postgresql database, this being
-part of SiSU - man sisu).
-
 22.3 SYNOPSIS
-
    sisu -D [instruction] [filename/wildcard
- if  required]

-
-
    sisu -D --pg --[instruction] [filename/wildcard  if  required]

-
-
 22.4 COMMANDS
-
  Mappings to two databases are provided by default, postgresql
-and sqlite, the same commands are used within sisu to construct and populate
-databases however -d (lowercase) denotes sqlite and -D (uppercase) denotes
-postgresql, alternatively --sqlite or --pgsql may be used
-
  -D or --pgsql may
-be used interchangeably.
-
 22.4.1 CREATE AND DESTROY DATABASE
+
 

+Being able to search a relational database at an object level with the
+SiSU citation system is an effective way of locating content generated
+by SiSU  object numbers, and all versions of the document have the same
+numbering, complex searches can be tailored to return just the locations
+of the search results relevant for all available output formats, with live
+links to the precise locations in the database or in html/xml documents;
+or, the structural information provided makes it possible to search the
+full contents of the database and have headings in which search content
+appears, or to search only headings etc. (as the Dublin Core is incorporated
+it is easy to make use of that as well).
+

+
22. Postgresql

+

+
+

+
22.1 Name

+
+
 

+SiSU - Structured information, Serialized Units - a document publishing system,
+
+
postgresql dependency package
+

+
22.2 Description

+
+
 

+Information related to using postgresql with sisu (and related to the sisu_postgresql
+dependency package, which is a dummy package to install dependencies needed
+for SiSU to populate a postgresql database, this being part of SiSU - man
+sisu).
 

+
22.3 Synopsis

+
+
 

+  sisu -D [instruction] [filename/wildcard  if  required]

+
+
 

+  sisu -D --pg --[instruction] [filename/wildcard  if  required]

+
+

+
22.4 Commands

+
+
 

+Mappings to two databases are provided by default, postgresql and sqlite,
+the same commands are used within sisu to construct and populate databases
+however -d (lowercase) denotes sqlite and -D (uppercase) denotes postgresql,
+
+
alternatively --sqlite or --pgsql may be used
+
 

+-D or --pgsql may be used interchangeably.
+

+
22.4.1 Create and Destroy Database

+
+

+
 

 
-
--pgsql --createall
-

-
initial step, creates required relations (tables, indexes) in existing
-(postgresql) database (a database should be created manually and given
-the same name as working directory, as requested) (rb.dbi)
+
--pgsql --createall 

+
initial step, creates required relations (tables, indexes)
+in existing (postgresql) database (a database should be created manually
+and given the same name as working directory, as requested) (rb.dbi)
 
 

 
-
sisu -D --createdb
-

-

-
creates database where no database existed before
+
sisu
+-D --createdb 

+
creates database where no database existed before
 
 

 
-
sisu -D --create 

-
creates
-
-
database tables where no database tables existed before
+
sisu -D --create
+

+

+
creates database tables where no database tables existed before
 
 

 
-
sisu -D --Dropall
-

-
destroys database (including all its content)! kills data and drops tables,
-indexes and database associated with a given directory (and directories
+
sisu -D
+--Dropall 

+
destroys database (including all its content)! kills data and drops
+tables, indexes and database associated with a given directory (and directories
 of the same name).
 
 

 
@@ -2415,78 +2960,95 @@ of the same name).
 
a new empty database structure
 
 
 

-22.4.2 IMPORT AND REMOVE DOCUMENTS
+
+
22.4.2 Import and Remove Documents

+
 

 

 
-
sisu
--D --import -v [filename/wildcard] 

-
populates database with the contents of
-the file. Imports documents(s) specified to a postgresql database (at an
-object level).
+
sisu -D
+--import -v [filename/wildcard] 

+
populates database with the contents of the
+file. Imports documents(s) specified to a postgresql database (at an object
+level).
 
 

 
 
sisu -D --update -v [filename/wildcard] 

-
updates file contents
+
updates file contents in database
 
-
in database
 
 

 
 
sisu -D --remove -v [filename/wildcard] 

-
removes specified document
-from postgresql database.
+
removes specified document from postgresql
+database.
 
 

 

-23. SQLITE
-
 23.1 NAME
-
  SiSU - Structured information,
-Serialized Units - a document publishing system.
-
 23.2 DESCRIPTION
-
  Information
-related to using sqlite with sisu (and related to the sisu_sqlite dependency
-package, which is a dummy package to install dependencies needed for SiSU
-to populate an sqlite database, this being part of SiSU - man sisu).
-
 23.3
-
-
SYNOPSIS
-
    sisu -d [instruction] [filename/wildcard  if  required]

-
-
    sisu -d --(sqlite|pg) --[instruction] [filename/wildcard  if  required]

-
-
 23.4 COMMANDS
-
  Mappings to two databases are provided by default, postgresql
-and sqlite, the same commands are used within sisu to construct and populate
-databases however -d (lowercase) denotes sqlite and -D (uppercase) denotes
-postgresql, alternatively --sqlite or --pgsql may be used
-
  -d or --sqlite may
-be used interchangeably.
-
 23.4.1 CREATE AND DESTROY DATABASE
+
+
23. Sqlite

+

+
+

+
23.1 Name

+
+
 

+SiSU - Structured information, Serialized Units - a document publishing system.
+
+

+
23.2 Description

+
+
 

+Information related to using sqlite with sisu (and related to the sisu_sqlite
+dependency package, which is a dummy package to install dependencies needed
+for SiSU to populate an sqlite database, this being part of SiSU - man sisu).
+
+

+
23.3 Synopsis

+
+
 

+  sisu -d [instruction] [filename/wildcard  if  required]

+
+
 

+  sisu -d --(sqlite|pg) --[instruction] [filename/wildcard  if  required]

+
+

+
23.4 Commands

+
+
 

+Mappings to two databases are provided by default, postgresql and sqlite,
+the same commands are used within sisu to construct and populate databases
+however -d (lowercase) denotes sqlite and -D (uppercase) denotes postgresql,
+
+
alternatively --sqlite or --pgsql may be used
+
 

+-d or --sqlite may be used interchangeably.
+

+
23.4.1 Create and Destroy Database

+
 

+
 

 
-
--sqlite --createall
-

-
initial step, creates required relations (tables, indexes) in existing
-(sqlite) database (a database should be created manually and given the
-same name as working directory, as requested) (rb.dbi)
+
--sqlite --createall 

+
initial step, creates required relations (tables, indexes)
+in existing (sqlite) database (a database should be created manually and
+given the same name as working directory, as requested) (rb.dbi)
 
 

 
-
sisu -d --createdb
-

-

-
creates database where no database existed before
+
sisu -d
+--createdb 

+
creates database where no database existed before
 
 

 
-
sisu -d --create 

-
creates
-
-
database tables where no database tables existed before
+
sisu -d --create
+

+

+
creates database tables where no database tables existed before
 
 

 
-
sisu -d --dropall
-

-
destroys database (including all its content)! kills data and drops tables,
-indexes and database associated with a given directory (and directories
+
sisu -d
+--dropall 

+
destroys database (including all its content)! kills data and drops
+tables, indexes and database associated with a given directory (and directories
 of the same name).
 
 

 
@@ -2496,14 +3058,16 @@ of the same name).
 
a new empty database structure
 
 
 

-23.4.2 IMPORT AND REMOVE DOCUMENTS
+
+
23.4.2 Import and Remove Documents

+
 

 

 
-
sisu
--d --import -v [filename/wildcard] 

-
populates database with the contents of
-the file. Imports documents(s) specified to an sqlite database (at an object
+
sisu -d
+--import -v [filename/wildcard] 

+
populates database with the contents of the
+file. Imports documents(s) specified to an sqlite database (at an object
 level).
 
 

 
@@ -2517,38 +3081,44 @@ level).
 database.
 
 
 

-24. INTRODUCTION
-
 24.1 SEARCH - DATABASE FRONTEND SAMPLE, UTILISING
-DATABASE AND SISU FEATURES, INCLUDING OBJECT CITATION NUMBERING (BACKEND
-CURRENTLY POSTGRESQL)
-
  Sample search frontend <http://search.sisudoc.org
->
-[^21] A small database and sample query front-end (search from) that makes
-use of the citation system, object citation numbering to demonstrates functionality.[^22]
 
-
  SiSU can provide information on which documents are matched and at what
+
24. Introduction

+

+
+

+
24.1 Search - Database Frontend Sample, Utilising Database and Sisu Features,

+INCLUDING
+OBJECT CITATION NUMBERING (BACKEND CURRENTLY POSTGRESQL)
+
 

+Sample search frontend <http://search.sisudoc.org
+> [^21] A small database and
+sample query front-end (search from) that makes use of the citation system,
+object citation numbering to demonstrates functionality.[^22]
+
 

+SiSU can provide information on which documents are matched and at what
 locations within each document the matches are found. These results are
 relevant across all outputs using object citation numbering, which includes
 html, XML, EPUB, LaTeX, PDF and indeed the SQL database. You can then refer
 to one of the other outputs or in the SQL database expand the text within
 the matched objects (paragraphs) in the documents matched.
-
  Note you may
-set results either for documents matched and object number locations within
-each matched document meeting the search criteria; or display the names
-of the documents matched along with the objects (paragraphs) that meet
-the search criteria.[^23]
+
 

+Note you may set results either for documents matched and object number
+locations within each matched document meeting the search criteria; or
+display the names of the documents matched along with the objects (paragraphs)
+that meet the search criteria.[^23]
 

 

 
 
sisu -F --webserv-webrick 

-
builds a cgi web search
+
builds a cgi web
 
-
frontend for the database created
-
  The following is feedback on the setup
-on a machine provided by the help command:
-
    sisu --help sql

+
search frontend for the database created
+
 

+The following is feedback on the setup on a machine provided by the help
+command:
+
 

+  sisu --help sql

 
-

 
 

 
  Postgresql
     user:             ralph
@@ -2559,30 +3129,35 @@ on a machine provided by the help command:
     current db set:   /home/ralph/sisu_www/sisu/sisu_sqlite.db
     dbi connect       DBI:SQLite:/home/ralph/sisu_www/sisu/sisu_sqlite.db
 

-
  Note on databases built
-
  By default, [unless  otherwise  specified] databases
-are built on a directory basis, from collections of documents within that
-directory. The name of the directory you choose to work from is used as
-the database name, i.e. if you are working in a directory called /home/ralph/ebook
-the database SiSU_ebook is used. [otherwise  a  manual  mapping  for  the  collection
- is
+
 

+
+
Note on databases built
+
 

+By default, [unless  otherwise  specified] databases are built on a directory
+basis, from collections of documents within that directory. The name of
+the directory you choose to work from is used as the database name, i.e.
+if you are working in a directory called /home/ralph/ebook the database
+SiSU_ebook is used. [otherwise  a  manual  mapping  for  the  collection  is
 
 

 

-24.2 SEARCH FORM
+
+
24.2
+Search Form

+
 

 

 
 
sisu -F 

-
generates a sample search form, which must
+
generates a sample search form, which must be copied
 
-
be copied to the web-server cgi directory
+
to the web-server cgi directory
 
 

 
 
sisu -F --webserv-webrick 

-
generates
-a sample search form for use with the webrick server, which must be copied
+
generates a sample
+search form for use with the webrick server, which must be copied to the
 
-
to the web-server cgi directory
+
web-server cgi directory
 
 

 
 
sisu -Fv 

@@ -2595,196 +3170,265 @@ a sample search form for use with the webrick server, which must be copied
 
starts the webrick server which should
 
 
be available wherever sisu is properly installed
-
  The generated search
+
 

 
-
form must be copied manually to the webserver directory as instructed
-

-

+
The generated search form must be copied manually to the webserver directory
+
+
as instructed
+
 
 

-25. HYPERESTRAIER
-
  See the documentation for hyperestraier:
-
    <http://hyperestraier.sourceforge.net/
+
+
25. Hyperestraier

+

+
+
 

+See the documentation for hyperestraier:
+
 

+  <http://hyperestraier.sourceforge.net/
 >

 
-
    /usr/share/doc/hyperestraier/index.html

+
 

+  /usr/share/doc/hyperestraier/index.html

 
-
    man estcmd

+
 

+  man estcmd

 
-
  NOTE: the examples that follow assume that sisu output is placed in
+
 

+NOTE: the examples that follow assume that sisu output is placed in the
 
-
the directory /home/ralph/sisu_www
-
  (A) to generate the index within the
-webserver directory to be indexed:
-
    estcmd gather -sd [index  name] [directory
- path  to  index]

+
directory /home/ralph/sisu_www
+
 

+(A) to generate the index within the webserver directory to be indexed:
 
-
  the following are examples that will need to be tailored according to
-your needs:
-
    cd /home/ralph/sisu_www

+
 

+  estcmd gather -sd [index  name] [directory  path  to  index]

 
-
    estcmd gather -sd casket /home/ralph/sisu_www

+
 

+the following are examples that will need to be tailored according to your
+needs:
+
 

+  cd /home/ralph/sisu_www

 
-
  you may use the ’find’ command together with ’egrep’ to limit indexing to
-particular document collection directories within the web server directory:
+
 

+  estcmd gather -sd casket /home/ralph/sisu_www

 
-
    find /home/ralph/sisu_www -type f | egrep

+
 

+you may use the ’find’ command together with ’egrep’ to limit indexing to particular
+document collection directories within the web server directory:
+
 

+  find /home/ralph/sisu_www -type f | egrep

    ’/home/ralph/sisu_www/sisu/.+?.html$’ |estcmd gather -sd casket -

 
-
  Check which directories in the webserver/output directory (~/sisu_www
-or elsewhere depending on configuration) you wish to include in the search
+
 

+Check which directories in the webserver/output directory (~/sisu_www or
+elsewhere depending on configuration) you wish to include in the search
 index.
-
  As sisu duplicates output in multiple file formats, it it is probably
-preferable to limit the estraier index to html output, and as it may also
-be desirable to exclude files ’plain.txt’, ’toc.html’ and ’concordance.html’, as
-these duplicate information held in other html output e.g.
-
    find /home/ralph/sisu_www
--type f | egrep

+
 

+As sisu duplicates output in multiple file formats, it it is probably preferable
+to limit the estraier index to html output, and as it may also be desirable
+to exclude files ’plain.txt’, ’toc.html’ and ’concordance.html’, as these duplicate
+information held in other html output e.g.
+
 

+  find /home/ralph/sisu_www -type f | egrep

    ’/sisu_www/(sisu|bookmarks)/.+?.html$’ | egrep -v ’(doc|concordance).html$’

    |estcmd gather -sd casket -

 
-
  from your current document preparation/markup directory, you would construct
+
 

+from your current document preparation/markup directory, you would construct
 a rune along the following lines:
-
    find /home/ralph/sisu_www -type f
-| egrep ’/home/ralph/sisu_www/([specify 

+
 

+  find /home/ralph/sisu_www -type f | egrep ’/home/ralph/sisu_www/([specify
+

    first  directory  for  inclusion]|[specify  second  directory  for 

    inclusion]|[another  directory  for  inclusion?  ...])/.+?.html$’ |

    egrep -v ’(doc|concordance).html$’ |estcmd gather -sd

    /home/ralph/sisu_www/casket -

 
-
  (B) to set up the search form
-
  (i) copy estseek.cgi to your cgi directory
-and set file permissions to 755:
-
    sudo cp -vi /usr/lib/estraier/estseek.cgi
-/usr/lib/cgi-bin

+
 

+(B) to set up the search form
+
 

+(i) copy estseek.cgi to your cgi directory and set file permissions to 755:
+
+
 

+  sudo cp -vi /usr/lib/estraier/estseek.cgi /usr/lib/cgi-bin

 
-
    sudo chmod -v 755 /usr/lib/cgi-bin/estseek.cgi

+
 

+  sudo chmod -v 755 /usr/lib/cgi-bin/estseek.cgi

 
-
    sudo cp -v /usr/share/hyperestraier/estseek.* /usr/lib/cgi-bin

+
 

+  sudo cp -v /usr/share/hyperestraier/estseek.* /usr/lib/cgi-bin

 
-
    [see  estraier  documentation  for  paths]

+
 

+  [see  estraier  documentation  for  paths]

 
-
  (ii) edit estseek.conf, with attention to the lines starting ’indexname:’
+
 

+(ii) edit estseek.conf, with attention to the lines starting ’indexname:’
 and
-
    indexname: /home/ralph/sisu_www/casket

+
 

+  indexname: /home/ralph/sisu_www/casket

 
-
    replace: ^file:///home/ralph/sisu_www{{!}}http://localhost
+
 

+  replace: ^file:///home/ralph/sisu_www{{!}}http://localhost
 

 
-
    replace: /index.html?${{!}}/

+
 

+  replace: /index.html?${{!}}/

 
-
  (C) to test using webrick, start webrick:
-
    sisu -W

+
 

+(C) to test using webrick, start webrick:
+
 

+  sisu -W

 
-
  and try open the url: <http://localhost:8081/cgi-bin/estseek.cgi
->
-
 26. SISU_WEBRICK
-
-
 26.1 NAME
-
  SiSU - Structured information, Serialized Units - a document
-
-
publishing system
-
 26.2 SYNOPSIS
-
  sisu_webrick [port]
-
  or
-
  sisu -W [port]
-
-
 26.3 DESCRIPTION
-
  sisu_webrick is part of SiSU (man sisu) sisu_webrick
-starts Ruby  SiSU output is written, providing a list of these directories
-(assuming SiSU is in use and they exist).
-
  The default port for sisu_webrick
-is set to 8081, this may be modified in the yaml file: ~/.sisu/sisurc.yml
-a sample of which is provided as /etc/sisu/sisurc.yml (or in the equivalent
-directory on your system).
-
 26.4 SUMMARY OF MAN PAGE
-
  sisu_webrick, may
-be started on it’s own with the command: sisu_webrick [port] or using the
-sisu command with the -W flag: sisu -W [port]
-
  where no port is given and
-
-
settings are unchanged the default port is 8081
-
 26.5 DOCUMENT PROCESSING
-
-
COMMAND FLAGS
-
  sisu -W [port] starts Ruby Webrick web-server, serving SiSU
-output directories, on the port provided, or if no port is provided and
-
-
the defaults have not been changed in ~/.sisu/sisurc.yaml then on port 8081
-
-
 26.6 FURTHER INFORMATION
-
  For more information on SiSU see: <http://www.sisudoc.org/
+
 

+and try open the url: <http://localhost:8081/cgi-bin/estseek.cgi
 >
-or <http://www.jus.uio.no/sisu
+

+
26. Sisu_webrick

+

+
+

+
26.1 Name

+
+
 

+SiSU - Structured information, Serialized Units - a document publishing system
+
+

+
26.2 Synopsis

+
+
 

+sisu_webrick [port]
+
 

+
+
or
+
 

+sisu -W [port]
+

+
26.3 Description

+
+
 

+sisu_webrick is part of SiSU (man sisu) sisu_webrick starts Ruby  SiSU
+output is written, providing a list of these directories (assuming SiSU
+is in use and they exist).
+
 

+The default port for sisu_webrick is set to 8081, this may be modified
+in the yaml file: ~/.sisu/sisurc.yml a sample of which is provided as /etc/sisu/sisurc.yml
+(or in the equivalent directory on your system).
+

+
26.4 Summary of Man Page

+
+

+

+sisu_webrick, may be started on it’s own with the command: sisu_webrick
+[port] or using the sisu command with the -W flag: sisu -W [port]
+
 

+
+
where no port is given and settings are unchanged the default port is 8081
+
+

+
26.5 Document Processing Command Flags

+
+
 

+sisu -W [port] starts Ruby Webrick web-server, serving SiSU output directories,
+on the port provided, or if no port is provided and the defaults have not
+
+
been changed in ~/.sisu/sisurc.yaml then on port 8081
+

+
26.6 Further Information

+
+

+

+For more information on SiSU see: <http://www.sisudoc.org/
+> or <http://www.jus.uio.no/sisu
 >
-
  or man sisu
-
 26.7 AUTHOR
-
  Ralph Amissah ralph@amissah.com
 
-
or ralph.amissah@gmail.com
-
 26.8 SEE ALSO
-
    sisu(1)
+
 

+
+
or man sisu
+

+
26.7 Author

+
+
 

+Ralph Amissah <ralph@amissah.com> or <ralph.amissah@gmail.com>
+

+
26.8 See Also

+
+
 

+  sisu(1)
 

 
-
    sisu_vim(7)
+
 

+  sisu_vim(7)
 

 
-
    sisu(8)
+

+
27. Remote Source Documents

 

 
-
 27. REMOTE SOURCE DOCUMENTS
-
  SiSU processing instructions can be run
-against remote source documents by providing the url of the documents against
-which the processing instructions are to be carried out. The remote SiSU
-documents can either be sisu marked up files in plaintext .sst or .ssm or;
-zipped sisu files, sisupod.zip or filename.ssp
-
  .sst / .ssm - sisu text files
+
 

+SiSU processing instructions can be run against remote source documents
+by providing the url of the documents against which the processing instructions
+are to be carried out. The remote SiSU documents can either be sisu marked
+up files in plaintext .sst or .ssm or; zipped sisu files, sisupod.zip or filename.ssp
 
-
  SiSU can be run against source text files on a remote machine, provide
+
 

+.sst / .ssm - sisu text files
+
 

+SiSU can be run against source text files on a remote machine, provide
 the processing instruction and the url. The source file and any associated
 parts (such as images) will be downloaded and generated locally.
-

 
 

 
  sisu -3 http://[provide  url  to  valid  .sst  or  .ssm  file]
 

-
  Any of the source documents in the sisu examples page can be used in
-this way, see <http://www.jus.uio.no/sisu/SiSU/examples.html
-> and use the url
-to the  .sst for the desired document.

+
 

+Any of the source documents in the sisu examples page can be used in this
+way, see <http://www.jus.uio.no/sisu/SiSU/examples.html
+> and use the url to the
+ .sst for the desired document.

 
-
  NOTE: to set up a remote machine to serve SiSU documents in this way,
+
 

+NOTE: to set up a remote machine to serve SiSU documents in this way, images
 
-
images should be in the directory relative to the document source ../_sisu/image
+
should be in the directory relative to the document source ../_sisu/image
 
-
  sisupod - zipped sisu files
-
  A sisupod is the zipped content of a sisu
-marked up text or texts and any other associated parts to the document
-such as images.
-
  SiSU can be run against a sisupod on a (local or) remote
-machine, provide the processing instruction and the url, the sisupod will
-be downloaded and the documents it contains generated locally.
-

+
 

+sisupod - zipped sisu files
+
 

+A sisupod is the zipped content of a sisu marked up text or texts and any
+other associated parts to the document such as images.
+
 

+SiSU can be run against a sisupod on a (local or) remote machine, provide
+the processing instruction and the url, the sisupod will be downloaded
+and the documents it contains generated locally.
 
 

 
  sisu -3 http://[provide  url  to  valid  sisupod.zip  or  .ssp  file]
 

-
  Any of the source documents in the sisu examples page can be used in
-this way, see <http://www.jus.uio.no/sisu/SiSU/examples.html
-> and use the url
-for the desired document.
-
 REMOTE DOCUMENT OUTPUT
-
 28. REMOTE OUTPUT
+
 

+Any of the source documents in the sisu examples page can be used in this
+way, see <http://www.jus.uio.no/sisu/SiSU/examples.html
+> and use the url for
+the desired document.
+

+
Remote Document Output

+

+
 

+
28. Remote Output

+

+
+
 

 Once properly configured SiSU output can be automatically posted once generated
 to a designated remote machine using either rsync, or scp.
-
  In order to
-do this some ssh authentication agent and keychain or similar tool will
-need to be configured. Once that is done the placement on a remote host
-can be done seamlessly with the -r (for scp) or -R (for rsync) flag, which
-may be used in conjunction with other processing flags, e.g.
-

+
 

+In order to do this some ssh authentication agent and keychain or similar
+tool will need to be configured. Once that is done the placement on a remote
+host can be done seamlessly with the -r (for scp) or -R (for rsync) flag,
+which may be used in conjunction with other processing flags, e.g.
 
 

 
  sisu -3R sisu_remote.sst
 

-
 28.1 COMMANDS
+

+
28.1 Commands

+
 

 

 
@@ -2805,429 +3449,602 @@ information on hostname and username, and that you have your "keys" and
 ssh agent in place. Also see -R
 
 
 

-28.2 CONFIGURATION
-
  [expand  on  the  setting
- up  of  an  ssh-agent  /  keychain]
-
 29. REMOTE SERVERS
-
  As SiSU is generally
-operated using the command line, and works within a Unix type environment,
-SiSU the program and all documents can just as easily be on a remote server,
-to which you are logged on using a terminal, and commands and operations
-would be pretty much the same as they would be on your local machine.
-
 30.
-QUICKSTART - GETTING STARTED HOWTO
-
 30.1 INSTALLATION
-
  Installation is
-currently most straightforward and tested on the Debian platform, as there
-are packages for the installation of sisu and all requirements for what
-it does.
-
 30.1.1 DEBIAN INSTALLATION
-
  SiSU is available directly from the
-Debian Sid and testing archives (and possibly Ubuntu), assuming your /etc/apt/sources.list
-is set accordingly:
+
+
28.2 Configuration

+
+
 

+[expand  on  the  setting  up  of  an  ssh-agent  /  keychain]
 

+
29. Remote Servers

+

+
+
 

+As SiSU is generally operated using the command line, and works within
+a Unix type environment, SiSU the program and all documents can just as
+easily be on a remote server, to which you are logged on using a terminal,
+and commands and operations would be pretty much the same as they would
+be on your local machine.
+

+
30. Quickstart - Getting Started Howto

+

+
+

+
30.1 Installation

+
+
 

+Installation is currently most straightforward and tested on the Debian
+platform, as there are packages for the installation of sisu and all requirements
+for what it does.
+

+
30.1.1 Debian Installation

+
+
 

+SiSU is available directly from the Debian Sid and testing archives (and
+possibly Ubuntu), assuming your /etc/apt/sources.list is set accordingly:
+
 
 

 
    aptitude update
     aptitude install sisu-complete
 

-
  The following /etc/apt/sources.list setting permits the download of additional
+
 

+The following /etc/apt/sources.list setting permits the download of additional
 markup samples:
-

 
 

 
  #/etc/apt/sources.list
+
     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
+
 

-
  The aptitude commands become:
-

+
 

+The aptitude commands become:
 
 

 
    aptitude update
+
     aptitude install sisu-complete sisu-markup-samples
 

-
  If there are newer versions of SiSU upstream of the Debian archives,
+
 

+If there are newer versions of SiSU upstream of the Debian archives, they
 
-
they will be available by adding the following to your /etc/apt/sources.list
+
will be available by adding the following to your /etc/apt/sources.list
 
-

 
 

 
  #/etc/apt/sources.list
     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
 

-
  repeat the aptitude commands
-

+
 

+
+
repeat the aptitude commands
 
 

 
    aptitude update
     aptitude install sisu-complete sisu-markup-samples
 

-
  Note however that it is not necessary to install sisu-complete if not
-all components of sisu are to be used. Installing just the package sisu
-will provide basic functionality.
-
 30.1.2 RPM INSTALLATION
-
  RPMs are provided
-though untested, they are prepared by running alien against the source
-package, and against the debs.
-
  They may be downloaded from:
-
    <http://www.jus.uio.no/sisu/SiSU/download.html#rpm
+
 

+Note however that it is not necessary to install sisu-complete if not all
+components of sisu are to be used. Installing just the package sisu will
+provide basic functionality.
+

+
30.1.2 Rpm Installation

+
+
 

+RPMs are provided though untested, they are prepared by running alien against
+the source package, and against the debs.
+
 

+They may be downloaded from:
+
 

+  <http://www.jus.uio.no/sisu/SiSU/download.html#rpm
 >

 
-
  as root type:
-
    rpm -i [rpm  package  name]

+
 

+as root type:
+
 

+  rpm -i [rpm  package  name]

+
+

+
30.1.3 Installation from Source

 
-
 30.1.3 INSTALLATION FROM SOURCE
-
  To install SiSU from source check information
-at:
-
    <http://www.jus.uio.no/sisu/SiSU/download.html#current
+
 

+To install SiSU from source check information at:
+
 

+  <http://www.jus.uio.no/sisu/SiSU/download.html#current
 >

 
-
  * download the source package
-
  * Unpack the source
-
  Two alternative
-modes of installation from source are provided, setup.rb (by Minero Aoki)
-and a rant(by Stefan Lang) built install file, in either case: the first
-steps are the same, download and unpack the source file:
-
  For basic use
-SiSU is only dependent on the programming language in which it is written
-Ruby , and SiSU will be able to generate html, EPUB, various XMLs, including
-ODF (and will also produce LaTeX). Dependencies required for further actions,
-though it relies on the installation of additional dependencies which the
-source tarball does not take care of, for things like using a database
-(postgresql or sqlite)[^24] or converting LaTeX to pdf.
-
  setup.rb
-
  This
-is a standard ruby installer, using setup.rb is a three step process. In
-the root directory of the unpacked SiSU as root type:
-

+
 

+* download the source package
+
 

+* Unpack the source
+
 

+Two alternative modes of installation from source are provided, setup.rb
+(by Minero Aoki) and a rant(by Stefan Lang) built install file, in either
+case: the first steps are the same, download and unpack the source file:
+
+
 

+For basic use SiSU is only dependent on the programming language in which
+it is written Ruby , and SiSU will be able to generate html, EPUB, various
+XMLs, including ODF (and will also produce LaTeX). Dependencies required
+for further actions, though it relies on the installation of additional
+dependencies which the source tarball does not take care of, for things
+like using a database (postgresql or sqlite)[^24] or converting LaTeX to
+pdf.
+
 

+
+
setup.rb
+
 

+This is a standard ruby installer, using setup.rb is a three step process.
+In the root directory of the unpacked SiSU as root type:
 
 

 
      ruby setup.rb config
       ruby setup.rb setup
       #[and  as  root:]
       ruby setup.rb install
 

-
  further information on setup.rb is available from:
-
    <http://i.loveruby.net/en/projects/setup/
+
 

+further information on setup.rb is available from:
+
 

+  <http://i.loveruby.net/en/projects/setup/
+>

+
+
 

+  <http://i.loveruby.net/en/projects/setup/doc/usage.html
 >

 
-
    <http://i.loveruby.net/en/projects/setup/doc/usage.html
->

+
 

+
+
install
+
 

+The "install" file provided is an installer prepared using "rant". In the
+root directory of the unpacked SiSU as root type:
+
 

+  ruby install base

+
+
 

+or for a more complete installation:
+
 

+  ruby install

+
+
 

+
+
or
+
 

+  ruby install base

+
+
 

+This makes use of Rant (by Stefan Lang) and the provided Rantfile. It has
+been configured to do post installation setup setup configuration and generation
+of first test file. Note however, that additional external package dependencies,
+such as tetex-extra are not taken care of for you.
+
 

+Further information on "rant" is available from:
+
 

+  <http://make.rubyforge.org/
+>

+
+
 

+  <http://rubyforge.org/frs/?group_id=615
+>

+
+
 

+For a list of alternative actions you may type:
+
 

+  ruby install help

+
+
 

+  ruby install -T

+
+

+
30.2 Testing Sisu, Generating Output

+
+
 

+To check which version of sisu is installed:
+
 

+
+
sisu -v
+
 

+Depending on your mode of installation one or a number of markup sample
+files may be found either in the directory:
+
 

+
+
 

+
+
or
+
 

+
+
 

+change directory to the appropriate one:
+
 

+
+
cd /usr/share/doc/sisu/markup-samples/samples
+

+
30.2.1 Basic Text, Plaintext,
+Html, Xml, Odf, Epub

+
+
 

+Having moved to the directory that contains the markup samples (see instructions
+above if necessary), choose a file and run sisu against it
+
 

+
+
sisu -NhwoabxXyv free_as_in_freedom.rms_and_free_software.sam_williams.sst
+
+
 

+this will generate html including a concordance file, opendocument text
+format, plaintext, XHTML and various forms of XML, and OpenDocument text
 
-
  install
-
  The "install" file provided is an installer prepared using
-"rant". In the root directory of the unpacked SiSU as root type:
-
    ruby
-install base

-
-
  or for a more complete installation:
-
    ruby install

-
-
  or
-
    ruby install base

-
-
  This makes use of Rant (by Stefan Lang) and the provided Rantfile. It
-has been configured to do post installation setup setup configuration and
-generation of first test file. Note however, that additional external package
-dependencies, such as tetex-extra are not taken care of for you.
-
  Further
-information on "rant" is available from:
-
    <http://make.rubyforge.org/
->

+

+
30.2.2 LaTeX / Pdf

 
-
    <http://rubyforge.org/frs/?group_id=615
->

+
 

+Assuming a LaTeX engine such as tetex or texlive is installed with the
+required modules (done automatically on selection of sisu-pdf in Debian
+)
+
 

+Having moved to the directory that contains the markup samples (see instructions
+above if necessary), choose a file and run sisu against it
+
 

 
-
  For a list of alternative actions you may type:
-
    ruby install help

+
sisu -pv free_as_in_freedom.rms_and_free_software.sam_williams.sst
+
 

 
-
    ruby install -T

+
sisu -3 free_as_in_freedom.rms_and_free_software.sam_williams.sst
+
 

+should generate most available output formats: html including a concordance
+file, opendocument text format, plaintext, XHTML and various forms of XML,
 
-
 30.2 TESTING SISU, GENERATING OUTPUT
-
  To check which version of sisu
-is installed:
-
  sisu -v
-
  Depending on your mode of installation one or
-a number of markup sample files may be found either in the directory:
+
and OpenDocument text and pdf
 

+
30.2.3 Relational Database - Postgresql, Sqlite

 
-
  or
 

-
  change directory to the appropriate one:
-
  cd /usr/share/doc/sisu/sisu_markup_samples/dfsg
-
-
 30.2.1 BASIC TEXT, PLAINTEXT, HTML, XML, ODF, EPUB
-
  Having moved to the
-directory that contains the markup samples (see instructions above if necessary),
-
-
choose a file and run sisu against it
-
  sisu -NhwoabxXyv free_as_in_freedom.rms_and_free_software.sam_williams.sst
+

+Relational databases need some setting up - you must have permission to
+create the database and write to it when you run sisu.
+
 

 
-
  this will generate html including a concordance file, opendocument text
-format, plaintext, XHTML and various forms of XML, and OpenDocument text
+
Assuming you have the database installed and the requisite permissions
 
-
 30.2.2 LATEX / PDF
-
  Assuming a LaTeX engine such as tetex or texlive is
-installed with the required modules (done automatically on selection of
-sisu-pdf in Debian )
-
  Having moved to the directory that contains the markup
-samples (see instructions above if necessary), choose a file and run sisu
+
 

 
-
against it
-
  sisu -pv free_as_in_freedom.rms_and_free_software.sam_williams.sst
+
sisu --sqlite --recreate
+
 

 
-
  sisu -3 free_as_in_freedom.rms_and_free_software.sam_williams.sst
-
  should
-generate most available output formats: html including a concordance file,
-opendocument text format, plaintext, XHTML and various forms of XML, and
+
sisu --sqlite -v --import free_as_in_freedom.rms_and_free_software.sam_williams.sst
 
-
OpenDocument text and pdf
-
 30.2.3 RELATIONAL DATABASE - POSTGRESQL, SQLITE
+
 

 
-
  Relational databases need some setting up - you must have permission to
-create the database and write to it when you run sisu.
-
  Assuming you have
+
sisu --pgsql --recreate
+
 

 
-
the database installed and the requisite permissions
-
  sisu --sqlite --recreate
+
sisu --pgsql -v --import free_as_in_freedom.rms_and_free_software.sam_williams.sst
 
-
  sisu --sqlite -v --import free_as_in_freedom.rms_and_free_software.sam_williams.sst
+

+
30.3 Getting Help

 
-
  sisu --pgsql --recreate
-
  sisu --pgsql -v --import free_as_in_freedom.rms_and_free_software.sam_williams.sst
+

+
30.3.1 the Man Pages

 
-
 30.3 GETTING HELP
-
 30.3.1 THE MAN PAGES
-
  Type:
-
    man sisu

+
 

+Type:
+
 

+  man sisu

 
-
  The man pages are also available online, though not always kept as up
-to date as within the package itself:
-
  * sisu.1 <http://www.jus.uio.no/sisu/man/sisu.1.html
->
-[^25]
-
  * sisu.8 <http://www.jus.uio.no/sisu/man/sisu.8.html
+
 

+The man pages are also available online, though not always kept as up to
+date as within the package itself:
+
 

+* sisu.1 <http://www.jus.uio.no/sisu/man/sisu.1.html
+> [^25]
+
 

+* sisu.8 <http://www.jus.uio.no/sisu/man/sisu.8.html
 > [^26]
-
  * man directory
-<http://www.jus.uio.no/sisu/man
+
 

+* man directory <http://www.jus.uio.no/sisu/man
 > [^27]
-
 30.3.2 BUILT IN HELP
-
  sisu --help
-
  sisu
+

+
30.3.2 Built in Help

 
-
-
-
-
-
help --env
-
  sisu --help --commands
-
  sisu --help --markup
-
 30.3.3 THE HOME PAGE
+
 

+
+
sisu --help
+
 

+
+
sisu --help --env
+
 

+
+
sisu --help --commands
+
 

+
+
sisu --help --markup
 

+
30.3.3 the Home Page

+
+
 

 <http://www.sisudoc.org/
 >
-
  <http://www.jus.uio.no/sisu
+
 

+<http://www.jus.uio.no/sisu
 >
-
  <http://www.jus.uio.no/sisu/SiSU
+
 

+<http://www.jus.uio.no/sisu/SiSU
 >
+

+
30.4 Markup Samples

 
-
 30.4 MARKUP SAMPLES
-
  A number of markup samples (along with output) are
-available off:
-
  <http://www.jus.uio.no/sisu/SiSU/examples.html
+
 

+A number of markup samples (along with output) are available off:
+
 

+<http://www.jus.uio.no/sisu/SiSU/examples.html
 >
-
  Additional
-markup samples are packaged separately in the file:
-
  *
-
  On Debian they
-are available in non-free[^28] to include them it is necessary to include
-non-free in your /etc/apt/source.list or obtain them from the sisu home site.
+
 

+Additional markup samples are packaged separately in the file:
+
 

+***
+
 

+On Debian they are available in non-free[^28] to include them it is necessary
+to include non-free in your /etc/apt/source.list or obtain them from the
+sisu home site.
+

+
31. Editor Files, Syntax Highlighting

+

 
-
 31. EDITOR FILES, SYNTAX HIGHLIGHTING
-
  The directory:
-
    ./data/sisu/v2/conf/editor-syntax-etc/

+
 

+The directory:
+
 

+  ./data/sisu/v2/conf/editor-syntax-etc/

 
-
    ./data/sisu/v3/conf/editor-syntax-etc/

+
 

+  ./data/sisu/v3/conf/editor-syntax-etc/

 
-
    /usr/share/sisu/v2/conf/editor-syntax-etc

+
 

+  /usr/share/sisu/v2/conf/editor-syntax-etc

 
-
    /usr/share/sisu/v3/conf/editor-syntax-etc

+
 

+  /usr/share/sisu/v3/conf/editor-syntax-etc

 
-
  contains rudimentary sisu syntax highlighting files for:
-
  * (g)vim
-<http://www.vim.org
+
 

+contains rudimentary sisu syntax highlighting files for:
+
 

+* (g)vim <http://www.vim.org
 >
-
    package: sisu-vim

+
 

+  package: sisu-vim

 
-
  status: largely done
-
    there is a vim syntax highlighting and folds
-component

+
 

+status: largely done
+
 

+  there is a vim syntax highlighting and folds component

 
-
  * gedit <http://www.gnome.org/projects/gedit
+
 

+* gedit <http://www.gnome.org/projects/gedit
 >
-
  * gobby <http://gobby.0x539.de/
+
 

+* gobby <http://gobby.0x539.de/
 >
+
 

+  file: sisu.lang

 
-
    file: sisu.lang

+
 

+place in:
+
 

+  /usr/share/gtksourceview-1.0/language-specs

 
-
  place in:
-
    /usr/share/gtksourceview-1.0/language-specs

+
 

 
-
  or
-
    ~/.gnome2/gtksourceview-1.0/language-specs

+
or
+
 

+  ~/.gnome2/gtksourceview-1.0/language-specs

 
-
    status: very basic syntax highlighting

+
 

+  status: very basic syntax highlighting

 
-
    comments: this editor features display line wrap and is used by Goby!

+
 

+  comments: this editor features display line wrap and is used by Goby!

 
-
  * nano <http://www.nano-editor.org
+
 

+* nano <http://www.nano-editor.org
 >
-
    file: nanorc

+
 

+  file: nanorc

 
-
  save as:
-
    ~/.nanorc

+
 

+save as:
+
 

+  ~/.nanorc

 
-
    status: basic syntax highlighting

+
 

+  status: basic syntax highlighting

 
-
    comments: assumes dark background; no display line-wrap; does line
-breaks

+
 

+  comments: assumes dark background; no display line-wrap; does line breaks

 
-
  * diakonos (an editor written in ruby) <http://purepistos.net/diakonos
+
 

+* diakonos (an editor written in ruby) <http://purepistos.net/diakonos
 >
+
 

+file: diakonos.conf
+
 

+save as:
+
 

+  ~/.diakonos/diakonos.conf

 
-
  file: diakonos.conf
-
  save as:
-
    ~/.diakonos/diakonos.conf

-
-
  includes:
-
    status: basic syntax highlighting

+
 

+includes:
+
 

+  status: basic syntax highlighting

 
-
  comments: assumes dark background; no display line-wrap
-
  * kate & kwrite
-<http://kate.kde.org
+
 

+comments: assumes dark background; no display line-wrap
+
 

+* kate & kwrite <http://kate.kde.org
 >
-
    file: sisu.xml

+
 

+  file: sisu.xml

 
-
    place in:

+
 

+  place in:

 
-
      /usr/share/apps/katepart/syntax

+
 

+    /usr/share/apps/katepart/syntax

 
-
    or

+
 

+  or

 
-
      ~/.kde/share/apps/katepart/syntax

+
 

+    ~/.kde/share/apps/katepart/syntax

 
-
    [settings::configure  kate::{highlighting,filetypes}]

+
 

+  [settings::configure  kate::{highlighting,filetypes}]

 
-
    [tools::highlighting::{markup,scripts}::  .B  SiSU  ]

+
 

+  [tools::highlighting::{markup,scripts}::  .B  SiSU  ]

 
-
  * nedit <http://www.nedit.org
+
 

+* nedit <http://www.nedit.org
 >
-
    file: sisu_nedit.pats

+
 

+  file: sisu_nedit.pats

 
-
    nedit -import sisu_nedit.pats

+
 

+  nedit -import sisu_nedit.pats

 
-
    status: a very clumsy first attempt [not  really  done]

+
 

+  status: a very clumsy first attempt [not  really  done]

 
-
    comments: this editor features display line wrap

+
 

+  comments: this editor features display line wrap

 
-
  * emacs <http://www.gnu.org/software/emacs/emacs.html
+
 

+* emacs <http://www.gnu.org/software/emacs/emacs.html
 >
-
    files: sisu-mode.el

+
 

+  files: sisu-mode.el

 
-
    to file ~/.emacs add the following 2 lines:

+
 

+  to file ~/.emacs add the following 2 lines:

 
-
      (add-to-list ’load-path

+
 

+    (add-to-list ’load-path

      "/usr/share/sisu/v2/conf/editor-syntax-etc/emacs")

 
-
      (require ’sisu-mode.el)

+
 

+    (require ’sisu-mode.el)

 
-
    [not  done  /  not  yet  included]

+
 

+  [not  done  /  not  yet  included]

 
-
  * vim & gvim <http://www.vim.org
+
 

+* vim & gvim <http://www.vim.org
 >
-
    files:

+
 

+  files:

 
-
    package is the most comprehensive sisu syntax highlighting and editor

+
 

+  package is the most comprehensive sisu syntax highlighting and editor

    environment provided to date (is for vim/ gvim, and is separate from
 the

    contents of this directory)

 
-
    status: this includes: syntax highlighting; vim folds; some error
-checking

-
-
    comments: this editor features display line wrap

-
-
  NOTE:
-
  [  .B  SiSU  parses  files  with  long  lines  or  line  breaks,  display
- linewrap  (without  line-breaks)  is  a  convenient editor  feature  to  have  for
- sisu  markup]
-
 32. HOW DOES SISU WORK?
-
  SiSU markup is fairly minimalistic,
-it consists of: a (largely optional) document header, made up of information
-about the document (such as when it was published, who authored it, and
-granting what rights) and any processing instructions; and markup within
-the substantive text of the document, which is related to document structure
-and typeface. SiSU must be able to discern the structure of a document,
-(text headings and their levels in relation to each other), either from
-information provided in the document header or from markup within the text
-(or from a combination of both). Processing is done against an abstraction
-of the document comprising of information on the document’s structure and
-its objects,[2] which the program serializes (providing the object numbers)
-and which are assigned hash sum values based on their content. This abstraction
-of information about document structure, objects, (and hash sums), provides
-considerable flexibility in representing documents different ways and for
-different purposes (e.g. search, document layout, publishing, content certification,
-concordance etc.), and makes it possible to take advantage of some of the
-strengths of established ways of representing documents, (or indeed to
-create new ones).
-
 33. SUMMARY OF FEATURES
-
  * sparse/minimal markup (clean
-utf-8 source texts). Documents are prepared in a single UTF-8 file using a
-minimalistic mnemonic syntax. Typical literature, documents like "War and
-Peace" require almost no markup, and most of the headers are optional.
-

- * markup is easily readable/parsable by the human eye, (basic markup is
+
 

+  status: this includes: syntax highlighting; vim folds; some error checking

+
+
 

+  comments: this editor features display line wrap

+
+
 

+NOTE:
+
 

+[  .B  SiSU  parses  files  with  long  lines  or  line  breaks,  display  linewrap
+ (without  line-breaks)  is  a  convenient editor  feature  to  have  for  sisu  markup]
+
+

+
32. How Does Sisu Work?

+

+
+
 

+SiSU markup is fairly minimalistic, it consists of: a (largely optional)
+document header, made up of information about the document (such as when
+it was published, who authored it, and granting what rights) and any processing
+instructions; and markup within the substantive text of the document, which
+is related to document structure and typeface. SiSU must be able to discern
+the structure of a document, (text headings and their levels in relation
+to each other), either from information provided in the document header
+or from markup within the text (or from a combination of both). Processing
+is done against an abstraction of the document comprising of information
+on the document’s structure and its objects,[2] which the program serializes
+(providing the object numbers) and which are assigned hash sum values based
+on their content. This abstraction of information about document structure,
+objects, (and hash sums), provides considerable flexibility in representing
+documents different ways and for different purposes (e.g. search, document
+layout, publishing, content certification, concordance etc.), and makes
+it possible to take advantage of some of the strengths of established ways
+of representing documents, (or indeed to create new ones).
+

+
33. Summary of
+Features

+

+
+
 

+* sparse/minimal markup (clean utf-8 source texts). Documents are prepared
+in a single UTF-8 file using a minimalistic mnemonic syntax. Typical literature,
+documents like "War and Peace" require almost no markup, and most of the
+headers are optional.
+
 

+* markup is easily readable/parsable by the human eye, (basic markup is
 simpler and more sparse than the most basic HTML), [this  may  also  be  converted
  to  XML  representations  of  the  same  input/source  document].
-
  * markup defines
-document structure (this may be done once in a header pattern-match description,
-or for heading levels individually); basic text attributes (bold, italics,
-underscore, strike-through etc.) as required; and semantic information related
-to the document (header information, extended beyond the Dublin core and
-easily further extended as required); the headers may also contain processing
-instructions. SiSU markup is primarily an abstraction of document structure
-and document metadata to permit taking advantage of the basic strengths
-of existing alternative practical standard ways of representing documents
-[be  that  paper  publication,  sql  search  etc.] (html, epub, xml, odf, latex,
-pdf, sql)
-
  * for output produces reasonably elegant output of established
-industry and institutionally accepted open standard formats.[3] takes advantage
-of the different strengths of various standard formats for representing
-documents, amongst the output formats currently supported are:
-
    * html
-- both as a single scrollable text and a segmented document

-
-
    * xhtml

-
-
    * epub

-
-
    * XML - both in sax and dom style xml structures for further development
+
 

+* markup defines document structure (this may be done once in a header
+pattern-match description, or for heading levels individually); basic text
+attributes (bold, italics, underscore, strike-through etc.) as required;
+and semantic information related to the document (header information, extended
+beyond the Dublin core and easily further extended as required); the headers
+may also contain processing instructions. SiSU markup is primarily an abstraction
+of document structure and document metadata to permit taking advantage
+of the basic strengths of existing alternative practical standard ways
+of representing documents [be  that  paper  publication,  sql  search  etc.] (html,
+epub, xml, odf, latex, pdf, sql)
+
 

+* for output produces reasonably elegant output of established industry
+and institutionally accepted open standard formats.[3] takes advantage of
+the different strengths of various standard formats for representing documents,
+amongst the output formats currently supported are:
+
 

+  * html - both as a single scrollable text and a segmented document

+
+
 

+  * xhtml

+
+
 

+  * epub

+
+
 

+  * XML - both in sax and dom style xml structures for further development
 as

    required

 
-
    * ODF - open document format, the iso standard for document storage

+
 

+  * ODF - open document format, the iso standard for document storage

 
-
    * LaTeX - used to generate pdf

+
 

+  * LaTeX - used to generate pdf

 
-
    * pdf (via LaTeX)

+
 

+  * pdf (via LaTeX)

 
-
    * sql - population of an sql database, (at the same object level that
+
 

+  * sql - population of an sql database, (at the same object level that
 is used

    to cite text within a document)

 
-
  Also produces: concordance files; document content certificates (md5
-or sha256 digests of headings, paragraphs, images etc.) and html manifests
+
 

+Also produces: concordance files; document content certificates (md5 or
+sha256 digests of headings, paragraphs, images etc.) and html manifests
 (and sitemaps of content). (b) takes advantage of the strengths implicit
 in these very different output types, (e.g. PDFs produced using typesetting
 of LaTeX, databases populated with documents at an individual object/paragraph
 level, making possible granular search (and related possibilities))
-
  *
-ensuring content can be cited in a meaningful way regardless of selected
+
 

+* ensuring content can be cited in a meaningful way regardless of selected
 output format. Online publishing (and publishing in multiple document formats)
 lacks a useful way of citing text internally within documents (important
 to academics generally and to lawyers) as page numbers are meaningless
@@ -3237,266 +4054,320 @@ search engines). The outputs share a common numbering system that is meaningful
 (to man and machine) across all digital outputs whether paper, screen,
 or database oriented, (pdf, HTML, EPUB, xml, sqlite, postgresql), this
 numbering system can be used to reference content.
-
  * Granular search within
-documents. SQL databases are populated at an object level (roughly headings,
-paragraphs, verse, tables) and become searchable with that degree of granularity,
-the output information provides the object/paragraph numbers which are
-relevant across all generated outputs; it is also possible to look at just
-the matching paragraphs of the documents in the database; [output  indexing
- also  work  well  with  search  indexing tools  like  hyperestraier].
-
  * long
-term maintainability of document collections in a world of changing formats,
-having a very sparsely marked-up source document base. there is a considerable
-degree of future-proofing, output representations are "upgradeable", and
-new document formats may be added. e.g. addition of odf (open document text)
-module in 2006, epub in 2009 and in future html5 output sometime in future,
-
-
without modification of existing prepared texts
-
  * SQL search aside, documents
-are generated as required and static once generated.
-
  * documents produced
-are static files, and may be batch processed, this needs to be done only
-once but may be repeated for various reasons as desired (updated content,
-addition of new output formats, updated technology document presentations/representations)
-
-
  * document source (plaintext utf-8) if shared on the net may be used as
+
 

+* Granular search within documents. SQL databases are populated at an object
+level (roughly headings, paragraphs, verse, tables) and become searchable
+with that degree of granularity, the output information provides the object/paragraph
+numbers which are relevant across all generated outputs; it is also possible
+to look at just the matching paragraphs of the documents in the database;
+[output  indexing  also  work  well  with  search  indexing tools  like  hyperestraier].
+
+
 

+* long term maintainability of document collections in a world of changing
+formats, having a very sparsely marked-up source document base. there is
+a considerable degree of future-proofing, output representations are "upgradeable",
+and new document formats may be added. e.g. addition of odf (open document
+text) module in 2006, epub in 2009 and in future html5 output sometime
+in future, without modification of existing prepared texts
+
 

+* SQL search aside, documents are generated as required and static once
+generated.
+
 

+* documents produced are static files, and may be batch processed, this
+needs to be done only once but may be repeated for various reasons as desired
+(updated content, addition of new output formats, updated technology document
+presentations/representations)
+
 

+* document source (plaintext utf-8) if shared on the net may be used as
 
 
input and processed locally to produce the different document outputs
 

- * document source may be bundled together (automatically) with associated
+

+* document source may be bundled together (automatically) with associated
 documents (multiple language versions or master document with inclusions)
 and images and sent as a zip file called a sisupod, if shared on the net
 
 
these too may be processed locally to produce the desired document outputs
 
-
  * generated document outputs may automatically be posted to remote sites.
+
 

+* generated document outputs may automatically be posted to remote sites.
 
-
  * for basic document generation, the only software dependency is Ruby
-, and a few standard Unix tools (this covers plaintext, HTML, EPUB, XML,
+
 

+* for basic document generation, the only software dependency is Ruby ,
+and a few standard Unix tools (this covers plaintext, HTML, EPUB, XML,
 ODF, LaTeX). To use a database you of course need that, and to convert the
 LaTeX generated to pdf, a latex processor like tetex or texlive.
-
  * as
-
-
a developers tool it is flexible and extensible
-
  Syntax highlighting for
-SiSU markup is available for a number of text editors.
-
  SiSU is less about
-document layout than about finding a way with little markup to be able
-to construct an abstract representation of a document that makes it possible
-to produce multiple representations of it which may be rather different
-from each other and used for different purposes, whether layout and publishing,
-
-
or search of content
-
  i.e. to be able to take advantage from this minimal
-preparation starting point of some of the strengths of rather different
-established ways of representing documents for different purposes, whether
-for search (relational database, or indexed flat files generated for that
-purpose whether of complete documents, or say of files made up of objects),
-online viewing (e.g. html, xml, pdf), or paper publication (e.g. pdf)...
-
  the
-solution arrived at is by extracting structural information about the document
-(about headings within the document) and by tracking objects (which are
-serialized and also given hash values) in the manner described. It makes
+
 

+* as a developers tool it is flexible and extensible
+
 

+Syntax highlighting for SiSU markup is available for a number of text editors.
+
+
 

+SiSU is less about document layout than about finding a way with little
+markup to be able to construct an abstract representation of a document
+that makes it possible to produce multiple representations of it which
+may be rather different from each other and used for different purposes,
+whether layout and publishing, or search of content
+
 

+i.e. to be able to take advantage from this minimal preparation starting
+point of some of the strengths of rather different established ways of
+representing documents for different purposes, whether for search (relational
+database, or indexed flat files generated for that purpose whether of complete
+documents, or say of files made up of objects), online viewing (e.g. html,
+xml, pdf), or paper publication (e.g. pdf)...
+
 

+the solution arrived at is by extracting structural information about the
+document (about headings within the document) and by tracking objects (which
+are serialized and also given hash values) in the manner described. It makes
 possible representations that are quite different from those offered at
 present. For example objects could be saved individually and identified
 by their hashes, with an index of how the objects relate to each other
 to form a document.
-
 34. HELP SOURCES
-
  For a summary of alternative ways
-to get help on SiSU try one of the following:
-
  man page
-
    man sisu_help

-
-
  man2html
-
    <http://www.jus.uio.no/sisu/man/sisu_help.1.html
->

+

+
34. Help Sources

+

 
-
  sisu generated output - links to html
-
    <http://sisudoc.org/sisu/sisu_help/index.html
->

+

+
34.1 Man Pages

 
-
  help sources lists
-
  Alternative sources for this help sources page
-listed here:
-
    man sisu_help_sources

+
 

+  man sisu

 
-
    <http://sisudoc.org/sisu/sisu_help_sources/index.html
->

+
 

+  man sisu-concordance

 
-
 34.1 MAN PAGES
-
 34.1.1 MAN
-
    man sisu

+
 

+  man sisu-epub

 
-
    man sisu-concordance

+
 

+  man sisu-git

 
-
    man sisu-epub

+
 

+  man sisu-harvest

 
-
    man sisu-git

+
 

+  man sisu-html

 
-
    man sisu-harvest

+
 

+  man sisu-odf

 
-
    man sisu-html

+
 

+  man sisu-pdf

 
-
    man sisu-odf

+
 

+  man sisu-pg

 
-
    man sisu-pdf

+
 

+  man sisu-po

 
-
    man sisu-pg

+
 

+  man sisu-sqlite

 
-
    man sisu-po

+
 

+  man sisu-txt

 
-
    man sisu-sqlite

+
 

+  man 7 sisu_complete

 
-
    man sisu-txt

+
 

+  man 7 sisu_pdf

 
-
    man 7 sisu_complete

+
 

+  man 7 sisu_postgresql

 
-
    man 7 sisu_pdf

+
 

+  man 7 sisu_sqlite

 
-
    man 7 sisu_postgresql

+
 

+  man sisu_termsheet

 
-
    man 7 sisu_sqlite

+
 

+  man sisu_webrick

 
-
    man sisu_termsheet

+

+
34.2 Sisu Generated Output - Links to HTML

 
-
    man sisu_webrick

+
 

+Note SiSU documentation is prepared in SiSU and output is available in
+multiple formats including amongst others html, pdf, odf and epub, which
+may be also be accessed via the html pages[^29]
+

+
34.2.1 Www.sisudoc.org

 
-
 34.2 SISU GENERATED OUTPUT - LINKS TO HTML
-
  Note SiSU documentation is
-prepared in SiSU and output is available in multiple formats including
-amongst others html, pdf, odf and epub, which may be also be accessed via
-the html pages[^29]
-
 34.2.1 WWW.SISUDOC.ORG
-
  <http://sisudoc.org/sisu/sisu_manual/index.html
+
 

+<http://sisudoc.org/sisu/sisu_manual/index.html
 >
-
-
    <http://sisudoc.org/sisu/sisu_manual/index.html
+
 

+  <http://sisudoc.org/sisu/sisu_manual/index.html
 >

 
-
 34.3 MAN2HTML
-
 34.3.1 LOCALLY INSTALLED
-
  file:///usr/share/doc/sisu/html/sisu.1.html
+

+
34.3 Man2html

+
+

+
34.3.1 Locally Installed

+
+
 

+
+
file:///usr/share/doc/sisu/html/sisu.1.html
+
 

+  file:///usr/share/doc/sisu/html/sisu.1.html

 
-
    file:///usr/share/doc/sisu/html/sisu.1.html

+
 

+  /usr/share/doc/sisu/html/sisu_pdf.7.html

 
-
    file:///usr/share/doc/sisu/html/sisu_pdf.7.html

+
 

+  /usr/share/doc/sisu/html/sisu_postgresql.7.html

 
-
    file:///usr/share/doc/sisu/html/sisu_postgresql.7.html

+
 

+  /usr/share/doc/sisu/html/sisu_sqlite.7.html

 
-
    file:///usr/share/doc/sisu/html/sisu_sqlite.7.html

+
 

+  /usr/share/doc/sisu/html/sisu_webrick.1.html

 
-
    file:///usr/share/doc/sisu/html/sisu_webrick.1.html

+

+
34.3.2 WWW.jus.uio.no/sisu

 
-
 34.3.2 WWW.JUS.UIO.NO/SISU
-
  <http://www.jus.uio.no/sisu/man/sisu.1.html
+
 

+<http://www.jus.uio.no/sisu/man/sisu.1.html
 >
-
    <http://www.jus.uio.no/sisu/man/sisu.1.html
+
 

+  <http://www.jus.uio.no/sisu/man/sisu.1.html
 >

 
-
    <http://www.jus.uio.no/sisu/man/sisu_complete.7.html
+
 

+  <http://www.jus.uio.no/sisu/man/sisu_complete.7.html
 >

 
-
    <http://www.jus.uio.no/sisu/man/sisu_pdf.7.html
+
 

+  <http://www.jus.uio.no/sisu/man/sisu_pdf.7.html
 >

 
-
    <http://www.jus.uio.no/sisu/man/sisu_postgresql.7.html
+
 

+  <http://www.jus.uio.no/sisu/man/sisu_postgresql.7.html
 >

 
-
    <http://www.jus.uio.no/sisu/man/sisu_sqlite.7.html
+
 

+  <http://www.jus.uio.no/sisu/man/sisu_sqlite.7.html
 >

 
-
    <http://www.jus.uio.no/sisu/man/sisu_webrick.1.html
+
 

+  <http://www.jus.uio.no/sisu/man/sisu_webrick.1.html
 >

 
-

-
    
-.
  1. objects include: headings, paragraphs, verse, tables, images, but not
+
     1. objects include: headings, paragraphs, verse, tables, images, but not
 footnotes/endnotes which are numbered separately and tied to the object
-from which they are referenced. 
    2. .
  2. i.e. the html, pdf, epub, odf outputs are
-each built individually and optimised for that form of presentation, rather
-than for example the html being a saved version of the odf, or the pdf
-being a saved version of the html.
-
      
    3. .
  3. the different heading levels 
    4. .
  4. units
-of text, primarily paragraphs and headings, also any tables, poems, code-blocks
-
    5. .
  5. Specification submitted by Adobe to ISO to become a full open ISO specification
-<http://www.linux-watch.com/news/NS7542722606.html
-> 
    6. .
  6. ISO standard ISO/IEC 26300:2006
-
-
      
    7. .
  7. An open standard format for e-books
-
      
-
-
    *1. 
    
-
    square brackets 
    
+from which they are referenced.
+
     
    
+2. i.e. the html, pdf, epub, odf outputs are each built individually and optimised
+for that form of presentation, rather than for example the html being a
+saved version of the odf, or the pdf being a saved version of the html.
 
-
    *2. 
    
-
    square brackets
-
    
+
     
    
+3. the different heading levels
+
     
    
+4. units of text, primarily paragraphs and headings, also any tables, poems,
 
-
    +1. 
    
-
    square brackets 
    8. .
  8. <http://www.jus.uio.no/sisu/man/
-> 
    9. .
  9. <http://www.jus.uio.no/sisu/man/sisu.1.html
+
    code-blocks
+
     
    
+5. Specification submitted by Adobe to ISO to become a full open ISO specification
+<http://www.linux-watch.com/news/NS7542722606.html
 >
-
    10. .
  10. From sometime after SiSU 0.58 it should be possible to describe SiSU markup
-using SiSU, which though not an original design goal is useful. 
    11. .
  11. files should
-be prepared using UTF-8 character encoding 
    12. .
  12. a footnote or endnote 
    13. .
  13. self contained
-endnote marker & endnote in one 
-
-
    *. 
    
-
    unnumbered asterisk footnote/endnote,
-insert multiple asterisks if required 
    
-
-
    **. 
    
-
    another unnumbered asterisk footnote/endnote
-
    
-
-
    *3. 
    
-
    editors notes, numbered asterisk footnote/endnote series 
    
-
-
    +2. 
    
-
    editors
-notes, numbered asterisk footnote/endnote series 
    14. .
  14. <http://www.sisudoc.org/
+
     
    
+6. ISO standard ISO/IEC 26300:2006
+
     
    
+7. An open standard format for e-books
+
     
    
+*1. square brackets
+
     
    
+*2. square brackets
+
     
    
++1. square brackets
+
     
    
+8. <http://www.jus.uio.no/sisu/man/
+>
+
     
    
+9. <http://www.jus.uio.no/sisu/man/sisu.1.html
 >
+
     
    
+10. From sometime after SiSU 0.58 it should be possible to describe SiSU
+markup using SiSU, which though not an original design goal is useful.
+
    
+
    
+11. files should be prepared using UTF-8 character encoding
+
     
    
+12. a footnote or endnote
+
     
    
+13. self contained endnote marker & endnote in one
+
     
    
+* unnumbered asterisk footnote/endnote, insert multiple asterisks if required
 
-
      
    15. .
  15. <http://www.ruby-lang.org/en/
-> 
    16. .
  16. Table from the Wealth of Networks by Yochai
-Benkler <http://www.jus.uio.no/sisu/the_wealth_of_networks.yochai_benkler
-> 
    17. .
  17. .ssc
-(for composite) is under consideration but ._sst makes clear that this is
-not a regular file to be worked on, and thus less likely that people will
-have "accidents", working on a .ssc file that is overwritten by subsequent
-processing. It may be however that when the resulting file is shared .ssc
-is an appropriate suffix to use. 
    18. .
  18. <http://www.postgresql.org/
-> <http://advocacy.postgresql.org/
+
     
    
+** another unnumbered asterisk footnote/endnote
+
     
    
+*3. editors notes, numbered asterisk footnote/endnote series
+
     
    
++2. editors notes, numbered asterisk footnote/endnote series
+
     
    
+14 <http://www.sisudoc.org/
 >
-<http://en.wikipedia.org/wiki/Postgresql
-> 
    19. .
  19. <http://www.hwaci.com/sw/sqlite/
-> <http://en.wikipedia.org/wiki/Sqlite
+
     
    
+15. <http://www.ruby-lang.org/en/
 >
-
    20. .
  20. <http://search.sisudoc.org
-> 
    21. .
  21. (which could be extended further with current back-end).
-As regards scaling of the database, it is as scalable as the database (here
-Postgresql) and hardware allow. 
    22. .
  22. of this feature when demonstrated to an
-IBM software innovations evaluator in 2004 he said to paraphrase: this
-could be of interest to us. We have large document management systems, you
-can search hundreds of thousands of documents and we can tell you which
-documents meet your search criteria, but there is no way we can tell you
-without opening each document where within each your matches are found.
-
    23. .
  23. There is nothing to stop MySQL support being added in future. 
    24. .
  24. <http://www.jus.uio.no/sisu/man/sisu.1.html
+
     
    
+16. Table from the Wealth of Networks by Yochai Benkler <http://www.jus.uio.no/sisu/the_wealth_of_networks.yochai_benkler
 >
 
-
      
    25. .
  25. <http://www.jus.uio.no/sisu/man/sisu.8.html
+
     
    
+17. .ssc (for composite) is under consideration but ._sst makes clear that
+this is not a regular file to be worked on, and thus less likely that people
+will have subsequent processing. It may be however that when the resulting
+file is shared
+
     
    
+19. <http://www.postgresql.org/
+> 
    
+<http://advocacy.postgresql.org/
+> 
    
+<http://en.wikipedia.org/wiki/Postgresql
+> 
    
+20. <http://www.hwaci.com/sw/sqlite/
+> 
    
+<http://en.wikipedia.org/wiki/Sqlite
+> 
    
+21. <http://search.sisudoc.org
+>
+
     
    
+22. (which could be extended further with current back-end). As regards scaling
+of the database, it is as scalable as the database (here Postgresql) and
+hardware allow.
+
     
    
+23. of this feature when demonstrated to an IBM software innovations evaluator
+in 2004 he said to paraphrase: this could be of interest to us. We have
+large document management systems, you can search hundreds of thousands
+of documents and we can tell you which documents meet your search criteria,
+but there is no way we can tell you without opening each document where
+within each your matches are found.
+
     
    
+24. There is nothing to stop MySQL support being added in future.
+
     
    
+25. <http://www.jus.uio.no/sisu/man/sisu.1.html
+>
+
     
    
+26. <http://www.jus.uio.no/sisu/man/sisu.8.html
 >
-
      
    26. .
  26. <http://www.jus.uio.no/sisu/man
-> 
    27. .
-
  27. the Debian Free Software guidelines require that everything distributed
+
     
    
+27. <http://www.jus.uio.no/sisu/man
+>
+
     
    
+28. the Debian Free Software guidelines require that everything distributed
 within Debian can be changed - and the documents are authors’ works that
-while freely distributable are not freely changeable. 
    28. .
  28. named index.html or
-
-
    more extensively through sisu_manifest.html
-
     
    29. 
-

+while freely distributable are not freely changeable.
+
 

+29. named index.html or more extensively through sisu_manifest.html 

 
-
See Also

+

+
See Also

+

 sisu(1)
 , 

 sisu-epub(1)
@@ -3518,22 +4389,151 @@ while freely distributable are not freely changeable. .
  • named ind
 sisu_vim(7)
 
 
    
-
    Homepage
    
+
    Homepage
    
+
    
 More information about SiSU can be found at <http://www.sisudoc.org/
+> or <http://www.jus.uio.no/sisu/
 >.
 
 
    
-
    Author
    
-SiSU was written by Ralph Amissah <ralph@amissah.com>. 
    
+
    Author
    
+SiSU is written by Ralph Amissah <ralph@amissah.com>. 
    
 
 
    
 Table of Contents
    
 
    
 
 
diff --git a/man/man1/sisu.1 b/man/man1/sisu.1
index e90d76c0..c0676d20 100644
--- a/man/man1/sisu.1
+++ b/man/man1/sisu.1
@@ -1,37 +1,38 @@
-.TH "sisu" "1" "2011-03-05" "2.8.1" "SiSU"
+.TH "sisu" "1" "2011-03-09" "3.0.3-beta-rb1.9.2p180" "SiSU"
+.br
 .SH NAME
+.br
 sisu - documents: markup, structuring, publishing in multiple standard formats, and search
+.br
 .SH SYNOPSIS
+.br
 sisu [-abcDdFehIiMmNnopqRrSsTtUuVvwXxYyZz0-9] [filename/wildcard]
 
-.BR
+.br
 sisu [-Ddcv] [instruction] [filename/wildcard]
 
-.BR
+.br
 sisu [-CcFLSVvW]
 
-.BR
+.br
 sisu --v2 [operations]
 
-.BR
+.br
 sisu --v3 [operations]
 
-.BR
+.br
 sisu3 [operations]
-.SH
-SISU - MANUAL,
+.SH SISU - MANUAL,
 RALPH AMISSAH
-.BR
+.br
 
-.SH
-WHAT IS SISU?
-.BR
+.SH WHAT IS SISU?
+.br
 
-.SH
-1. INTRODUCTION - WHAT IS SISU?
-.BR
+.SH 1. INTRODUCTION - WHAT IS SISU?
+.br
 
-.BR
+.br
 .B SiSU
 is a framework for document structuring, publishing (in multiple open
 standard formats) and search, comprising of: (a) a lightweight document
@@ -41,7 +42,7 @@ markup syntax, which is able to produce multiple standard outputs (including
 the population of sql databases) that (can) share a common numbering system for
 the citation of text within a document.
 
-.BR
+.br
 .B SiSU
 is developed under an open source, software libre license (GPL3). Its use
 case for development is work with medium to large document sets and cope with
@@ -50,7 +51,7 @@ once, and generated as need be to update the technical presentation or add
 additional output formats. Various output formats (including search related
 output) share a common mechanism for cross-output-format citation.
 
-.BR
+.br
 .B SiSU
 both defines a markup syntax and provides an engine that produces open
 standards format outputs from documents prepared with
@@ -69,7 +70,7 @@ added to and updated.
 is also able to populate SQL type databases at an object level, which means
 that searches can be made with that degree of granularity.
 
-.BR
+.br
 Source document preparation and output generation is a two step process: (i)
 document source is prepared, that is, marked up in sisu markup syntax and (ii)
 the desired output subsequently generated by running the sisu engine against
@@ -89,7 +90,7 @@ system for locating content. This is particularly suitable for "published"
 works (finalized texts as opposed to works that are frequently changed or
 updated) for which it provides a fixed means of reference of content.
 
-.BR
+.br
 In preparing a
 .B SiSU
 document you optionally provide semantic information related to the document
@@ -99,7 +100,7 @@ levels and footnotes. You also provide information on basic text attributes
 where used. The rest is automatic, sisu from this information custom builds[^2]
 the different forms of output requested.
 
-.BR
+.br
 .B SiSU
 works with an abstraction of the document based on its structure which is
 comprised of its headings[^3] and objects[^4], which enables
@@ -117,7 +118,7 @@ object numbering also has implications for search that
 .B SiSU
 is able to take advantage of.
 
-.BR
+.br
 One of the challenges of maintaining documents is to keep them in a format that
 allows use of them independently of proprietary platforms. Consider issues
 related to dealing with legacy proprietary formats today and what guarantee you
@@ -149,12 +150,12 @@ years, presumably when the World Wide Web Consortium (w3c) finalises html 5
 which is currently under development, the html module will again be updated
 allowing all existing documents to be regenerated as html 5).
 
-.BR
+.br
 The document formats are written to the file-system and available for indexing
 by independent indexing tools, whether off the web like Google and Yahoo or on
 the site like Lucene and Hyperestraier.
 
-.BR
+.br
 .B SiSU
 also provides other features such as concordance files and document content
 certificates, and the working against an abstraction of document structure has
@@ -164,7 +165,7 @@ maps and thesauri, together with the flexibility of
 .B SiSU
 offers great possibilities.
 
-.BR
+.br
 .B SiSU
 is primarily for published works, which can take advantage of the citation
 system to reliably reference its documents.
@@ -175,20 +176,18 @@ content prepared in
 .B SiSU
 .
 
-.BR
+.br
 
 
-.BR
+.br
 
 
-.SH
-2. COMMANDS SUMMARY
-.BR
+.SH 2. COMMANDS SUMMARY
+.br
 
-.SH
-2.1 DESCRIPTION
+.SH 2.1 DESCRIPTION
 
-.BR
+.br
 .B SiSU
 .B SiSU
 is a document publishing system, that from a simple single marked-up
@@ -198,8 +197,7 @@ SQLite), which share numbered text objects ("object citation numbering") and
 the same document structure information. For more see:
 
 
-.SH
-2.2 DOCUMENT PROCESSING COMMAND FLAGS
+.SH 2.2 DOCUMENT PROCESSING COMMAND FLAGS
 
 .TP
 .B -a [filename/wildcard]
@@ -651,9 +649,8 @@ will remove the related document output directory. Alias -Z
 .B -Z [filename/wildcard]
 see --zap
 
-.SH
-3. COMMAND LINE MODIFIERS
-.BR
+.SH 3. COMMAND LINE MODIFIERS
+.br
 
 .TP
 .B --no-ocn
@@ -674,14 +671,13 @@ strips output text of editor endnotes[^*2] denoted by asterisk sign
 .B --no-dagger
 strips output text of editor endnotes[^+1] denoted by dagger/plus sign
 
-.SH
-4. DATABASE COMMANDS
-.BR
+.SH 4. DATABASE COMMANDS
+.br
 
-.BR
+.br
 dbi - database interface
 
-.BR
+.br
 -D or --pgsql set for postgresql -d or --sqlite default set for sqlite -d is
 modifiable with --db=[database \ type \ (pgsql \ or \ sqlite)]
 
@@ -716,12 +712,11 @@ Please use only alphanumerics and underscores.
 kills data" and drops (postgresql or sqlite) db, tables & indexes [ \ -d \
 --dropall \ sqlite \ equivalent]
 
-.BR
+.br
 The -v is for verbose output.
 
-.SH
-5. SHORTCUTS, SHORTHAND FOR MULTIPLE FLAGS
-.BR
+.SH 5. SHORTCUTS, SHORTHAND FOR MULTIPLE FLAGS
+.br
 
 .TP
 .B --update [filename/wildcard]
@@ -761,74 +756,64 @@ options \ are \ give, \ i.e. \ on \ 'sisu \ [filename]']
 .B -5
 -mhewpAobxXDyY --update
 
-.BR
+.br
 add -v for verbose mode and -c for color, e.g. sisu -2vc [filename \ or \
 wildcard]
 
-.BR
+.br
 consider -u for appended url info or -v for verbose output
 
-.SH
-5.1 COMMAND LINE WITH FLAGS - BATCH PROCESSING
+.SH 5.1 COMMAND LINE WITH FLAGS - BATCH PROCESSING
 
-.BR
+.br
 In the data directory run sisu -mh filename or wildcard eg. "sisu -h cisg.sst"
 or "sisu -h *.{sst,ssm}" to produce html version of all documents.
 
-.BR
+.br
 Running sisu (alone without any flags, filenames or wildcards) brings up the
 interactive help, as does any sisu command that is not recognised. Enter to
 escape.
 
-.SH
-6. HELP
-.BR
+.SH 6. HELP
+.br
 
-.SH
-6.1 SISU MANUAL
+.SH 6.1 SISU MANUAL
 
-.BR
+.br
 The most up to date information on sisu should be contained in the sisu_manual,
 available at:
 
-.BR
+.br
   
 
-.BR
+.br
 The manual can be generated from source, found respectively, either within the
 .B SiSU
 tarball or installed locally at:
 
-.BR
+.br
   ./data/doc/sisu/markup-samples/sisu_manual
 
-.BR
+.br
   /usr/share/doc/sisu/markup-samples/sisu_manual
 
-.BR
+.br
 move to the respective directory and type e.g.:
 
-.BR
+.br
   sisu sisu_manual.ssm
 
-.SH
-6.2 SISU MAN PAGES
+.SH 6.2 SISU MAN PAGES
 
-.BR
+.br
 If
 .B SiSU
 is installed on your system usual man commands should be available, try:
 
-.BR
+.br
   man sisu
 
-.BR
-  man sisu_markup
-
-.BR
-  man sisu_commands
-
-.BR
+.br
 Most
 .B SiSU
 man pages are generated directly from sisu documents that are used to prepare
@@ -836,224 +821,188 @@ the sisu manual, the sources files for which are located within the
 .B SiSU
 tarball at:
 
-.BR
+.br
   ./data/doc/sisu/markup-samples/sisu_manual
 
-.BR
+.br
 Once installed, directory equivalent to:
 
-.BR
+.br
   /usr/share/doc/sisu/markup-samples/sisu_manual
 
-.BR
+.br
 Available man pages are converted back to html using man2html:
 
-.BR
+.br
   /usr/share/doc/sisu/html/
 
-.BR
+.br
   ./data/doc/sisu/html
 
-.BR
+.br
 An online version of the sisu man page is available here:
 
-.BR
+.br
 * various sisu man pages  [^8]
 
-.BR
+.br
 * sisu.1  [^9]
 
-.SH
-6.3 SISU BUILT-IN INTERACTIVE HELP
+.SH 6.3 SISU BUILT-IN INTERACTIVE HELP
 
-.BR
+.br
 This is particularly useful for getting the current sisu setup/environment
 information:
 
-.BR
+.br
   sisu --help
 
-.BR
+.br
   sisu --help [subject]
 
-.BR
+.br
     sisu --help commands
 
-.BR
+.br
     sisu --help markup
 
-.BR
+.br
     sisu --help env [for \ feedback \ on \ the \ way \ your \ system \ is \
     setup \ with \ regard \ to \ sisu]
 
-.BR
+.br
   sisu -V [environment \ information, \ same \ as \ above \ command]
 
-.BR
+.br
   sisu (on its own provides version and some help information)
 
-.BR
+.br
 Apart from real-time information on your current configuration the
 .B SiSU
 manual and man pages are likely to contain more up-to-date information than
 the sisu interactive help (for example on commands and markup).
 
-.BR
+.br
 NOTE: Running the command sisu (alone without any flags, filenames or
 wildcards) brings up the interactive help, as does any sisu command that is not
 recognised. Enter to escape.
 
-.SH
-6.4 HELP SOURCES
-
-.BR
-For lists of alternative help sources, see:
-
-.BR
-.B man page
-
-.BR
-  man sisu_help_sources
-
-.BR
-.B man2html
-
-.BR
-  /usr/share/doc/sisu/v2/html/sisu.1.html
-
-.BR
-  
-
-.SH
-7. INTRODUCTION TO SISU MARKUP[^10]
-.BR
+.SH 7. INTRODUCTION TO SISU MARKUP[^10]
+.br
 
-.SH
-7.1 SUMMARY
+.SH 7.1 SUMMARY
 
-.BR
+.br
 .B SiSU
 source documents are plaintext (UTF-8)[^11] files
 
-.BR
+.br
 All paragraphs are separated by an empty line.
 
-.BR
+.br
 Markup is comprised of:
 
-.BR
+.br
 * at the top of a document, the document header made up of semantic meta-data
 about the document and if desired additional processing instructions (such an
 instruction to automatically number headings from a particular level down)
 
-.BR
+.br
 * followed by the prepared substantive text of which the most important single
 characteristic is the markup of different heading levels, which define the
 primary outline of the document structure. Markup of substantive text includes:
 
-.BR
+.br
   * heading levels defines document structure
 
-.BR
+.br
   * text basic attributes, italics, bold etc.
 
-.BR
+.br
   * grouped text (objects), which are to be treated differently, such as code
   blocks or poems.
 
-.BR
+.br
   * footnotes/endnotes
 
-.BR
+.br
   * linked text and images
 
-.BR
+.br
   * paragraph actions, such as indent, bulleted, numbered-lists, etc.
 
-.BR
+.br
 Some interactive help on markup is available, by typing sisu and selecting
 markup or sisu --help markup
 
-.BR
+.br
 To check the markup in a file:
 
-.BR
+.br
   sisu --identify [filename].sst
 
-.BR
+.br
 For brief descriptive summary of markup history
 
-.BR
+.br
   sisu --query-history
 
-.BR
+.br
 or if for a particular version:
 
-.BR
+.br
   sisu --query-0.38
 
-.SH
-7.2 MARKUP EXAMPLES
+.SH 7.2 MARKUP EXAMPLES
 
-.SH
-7.2.1 ONLINE
+.SH 7.2.1 ONLINE
 
-.BR
+.br
 Online markup examples are available together with the respective outputs
 produced from  or from
 
 
-.BR
+.br
 There is of course this document, which provides a cursory overview of sisu
 markup and the respective output produced:
 
 
-.BR
-Some example marked up files are available as html with syntax highlighting for
-viewing: 
-
-.BR
+.br
 an alternative presentation of markup syntax:
-
+/usr/share/doc/sisu/on_markup.txt.gz
 
-.SH
-7.2.2 INSTALLED
+.SH 7.2.2 INSTALLED
 
-.BR
+.br
 With
 .B SiSU
-installed sample skins may be found in:
-/usr/share/doc/sisu/sisu_markup_samples/dfsg (or equivalent directory) and if
-sisu-markup-samples is installed also under:
-/usr/share/doc/sisu/sisu_markup_samples/non-free
+installed sample skins may be found in: /usr/share/doc/sisu/markup-samples
+(or equivalent directory) and if sisu-markup-samples is installed also under:
+/usr/share/doc/sisu/markup-samples-non-free
 
-.SH
-8. MARKUP OF HEADERS
-.BR
+.SH 8. MARKUP OF HEADERS
+.br
 
-.BR
+.br
 Headers contain either: semantic meta-data about a document, which can be used
 by any output module of the program, or; processing instructions.
 
-.BR
+.br
 Note: the first line of a document may include information on the markup
 version used in the form of a comment. Comments are a percentage mark at the
 start of a paragraph (and as the first character in a line of text) followed by
 a space and the comment:
 
-
 .nf
   % this would be a comment
 .fi
 
-.SH
-8.1 SAMPLE HEADER
+.SH 8.1 SAMPLE HEADER
 
-.BR
+.br
 This current document is loaded by a master document that has a header similar
 to this one:
 
-
 .nf
   % SiSU master 2.0
   @title: SiSU
@@ -1067,12 +1016,14 @@ to this one:
       electronic document, electronic citation, data structure,
        citation systems, search
   % used_by: manual
-  @date: :published: 2008-05-22
+  @date:
+   :published: 2008-05-22
    :created: 2002-08-28
    :issued: 2002-08-28
    :available: 2002-08-28
    :modified: 2010-03-03
-  @make: :num_top: 1
+  @make:
+   :num_top: 1
    :breaks: new=C; break=1
    :skin: skin_sisu_manual
    :bold: /Gnu|Debian|Ruby|SiSU/
@@ -1082,46 +1033,45 @@ to this one:
        . sisu \ [-Ddcv] \ [instruction]
        . sisu \ [-CcFLSVvW]
        . sisu --v2 \ [operations]
-       . sisu --v1 \ [operations]
-  @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/
+       . sisu --v3 \ [operations]
+  @links:
+   { SiSU Homepage }http://www.sisudoc.org/
+   { SiSU Manual }http://www.sisudoc.org/sisu/sisu_manual/
+   { Book Samples & Markup Examples }http://www.jus.uio.no/sisu/SiSU/examples.html
+   { SiSU Download }http://www.jus.uio.no/sisu/SiSU/download.html
+   { SiSU Changelog }http://www.jus.uio.no/sisu/SiSU/changelog.html
+   { SiSU Git repo }http://git.sisudoc.org/?p=code/sisu.git;a=summary
+   { SiSU List Archives }http://lists.sisudoc.org/pipermail/sisu/
+   { SiSU @ Debian }http://packages.qa.debian.org/s/sisu.html
+   { SiSU Project @ Debian }http://qa.debian.org/developer.php?login=sisu@lists.sisudoc.org
+   { SiSU @ Wikipedia }http://en.wikipedia.org/wiki/SiSU
 .fi
 
-.SH
-8.2 AVAILABLE HEADERS
+.SH 8.2 AVAILABLE HEADERS
 
-.BR
+.br
 Header tags appear at the beginning of a document and provide meta information
 on the document (such as the Dublin Core), or information as to how the
 document as a whole is to be processed. All header instructions take the form
 @headername: or on the next line and indented by once space :subheadername: All
 Dublin Core meta tags are available
 
-.BR
+.br
 .B @indentifier:
 information or instructions
 
-.BR
+.br
 where the "identifier" is a tag recognised by the program, and the
 "information" or "instructions" belong to the tag/indentifier specified
 
-.BR
+.br
 Note: a header where used should only be used once; all headers apart from
 @title: are optional; the @structure: header is used to describe document
 structure, and can be useful to know.
 
-.BR
+.br
 This is a sample header
 
-
 .nf
   % SiSU 2.0 \ [declared \ file-type \ identifier \ with \ markup \ version]
 .fi
@@ -1133,14 +1083,16 @@ This is a sample header
 .fi
 
 .nf
-  @creator: :author: \ [Lastname, \ First \ names]
+  @creator:
+   :author: \ [Lastname, \ First \ names]
    :illustrator: \ [Lastname, \ First \ names]
    :translator: \ [Lastname, \ First \ names]
    :prepared_by: \ [Lastname, \ First \ names]
 .fi
 
 .nf
-  @date: :published: \ [year \ or \ yyyy-mm-dd]
+  @date:
+   :published: \ [year \ or \ yyyy-mm-dd]
    :created: \ [year \ or \ yyyy-mm-dd]
    :issued: \ [year \ or \ yyyy-mm-dd]
    :available: \ [year \ or \ yyyy-mm-dd]
@@ -1151,7 +1103,8 @@ This is a sample header
 .fi
 
 .nf
-  @rights: :copyright: Copyright (C) \ [Year \ and \ Holder]
+  @rights:
+   :copyright: Copyright (C) \ [Year \ and \ Holder]
    :license: \ [Use \ License \ granted]
    :text: \ [Year \ and \ Holder]
    :translation: \ [Name, \ Year]
@@ -1168,8 +1121,8 @@ This is a sample header
    :abstract:
    :isbn: \ [ISBN]
    :loc: \ [Library \ of \ Congress \ classification]
-   :dewey: \ [Dewey \ classification
-  :pg: \ [Project \ Gutenberg \ text \ number]
+   :dewey: \ [Dewey \ classification]
+   :pg: \ [Project \ Gutenberg \ text \ number]
 .fi
 
 .nf
@@ -1192,42 +1145,42 @@ This is a sample header
 .fi
 
 .nf
-  @original: :language: \ [language]
+  @original:
+   :language: \ [language]
 .fi
 
 .nf
-  @notes: :comment:
+  @notes:
+   :comment:
    :prefix: \ [prefix \ is \ placed \ just \ after \ table \ of \ contents]
 .fi
 
-.SH
-9. MARKUP OF SUBSTANTIVE TEXT
-.BR
+.SH 9. MARKUP OF SUBSTANTIVE TEXT
+.br
 
-.SH
-9.1 HEADING LEVELS
+.SH 9.1 HEADING LEVELS
 
-.BR
+.br
 Heading levels are :A~ ,:B~ ,:C~ ,1~ ,2~ ,3~ \... :A - :C being part / section
 headings, followed by other heading levels, and 1 -6 being headings followed by
 substantive text or sub-headings. :A~ usually the title :A~? conditional level
 1 heading (used where a stand-alone document may be imported into another)
 
-.BR
+.br
 .B :A~ [heading \ text]
 Top level heading [this \ usually \ has \ similar \ content \ to \ the \
 title \ @title: \ ] NOTE: the heading levels described here are in 0.38
 notation, see heading
 
-.BR
+.br
 .B :B~ [heading \ text]
 Second level heading [this \ is \ a \ heading \ level \ divider]
 
-.BR
+.br
 .B :C~ [heading \ text]
 Third level heading [this \ is \ a \ heading \ level \ divider]
 
-.BR
+.br
 .B 1~ [heading \ text]
 Top level heading preceding substantive text of document or sub-heading 2,
 the heading level that would normally be marked 1. or 2. or 3. etc. in a
@@ -1235,18 +1188,17 @@ document, and the level on which sisu by default would break html output into
 named segments, names are provided automatically if none are given (a number),
 otherwise takes the form 1~my_filename_for_this_segment
 
-.BR
+.br
 .B 2~ [heading \ text]
 Second level heading preceding substantive text of document or sub-heading 3
 , the heading level that would normally be marked 1.1 or 1.2 or 1.3 or 2.1 etc.
 in a document.
 
-.BR
+.br
 .B 3~ [heading \ text]
 Third level heading preceding substantive text of document, that would
 normally be marked 1.1.1 or 1.1.2 or 1.2.1 or 2.1.1 etc. in a document
 
-
 .nf
   1~filename level 1 heading,
   % the primary division such as Chapter that is followed by substantive text,
@@ -1254,43 +1206,41 @@ normally be marked 1.1.1 or 1.1.2 or 1.2.1 or 2.1.1 etc. in a document
   % segments are made)
 .fi
 
-.SH
-9.2 FONT ATTRIBUTES
+.SH 9.2 FONT ATTRIBUTES
 
-.BR
+.br
 .B markup example:
 
-
 .nf
   normal text,  *{emphasis}*, !{bold text}!, /{italics}/, _{underscore}_, "{citation}",
   ^{superscript}^, ,{subscript},, +{inserted text}+, -{strikethrough}-, #{monospace}#
   normal text
-.BR
+.br
   *{emphasis}* \ [note: \ can \ be \ configured \ to \ be \ represented \ by \ bold, \ italics \ or \ underscore]
-.BR
+.br
   !{bold text}!
-.BR
+.br
   _{underscore}_
-.BR
+.br
   /{italics}/
-.BR
+.br
   "{citation}"
-.BR
+.br
   ^{superscript}^
-.BR
+.br
   ,{subscript},
-.BR
+.br
   +{inserted text}+
-.BR
+.br
   \-{strikethrough}\-
-.BR
+.br
   #{monospace}#
 .fi
 
-.BR
+.br
 .B resulting output:
 
-.BR
+.br
 normal text,
 .B emphasis
 ,
@@ -1302,371 +1252,346 @@ normal text,
 , "citation", ^superscript^, [subscript], ++inserted text++,
 --strikethrough--, monospace
 
-.BR
+.br
 normal text
 
-.BR
+.br
 .B emphasis
 [note: \ can \ be \ configured \ to \ be \ represented \ by \ bold, \ italics
 \ or \ underscore]
 
-.BR
+.br
 .B bold text
 
-.BR
+.br
 .I italics
 
-.BR
+.br
 .I underscore
 
-.BR
+.br
 "citation"
 
-.BR
+.br
 ^superscript^
 
-.BR
+.br
 [subscript]
 
-.BR
+.br
 ++inserted text++
 
-.BR
+.br
 --strikethrough--
 
-.BR
+.br
 monospace
 
-.SH
-9.3 INDENTATION AND BULLETS
+.SH 9.3 INDENTATION AND BULLETS
 
-.BR
+.br
 .B markup example:
 
-
 .nf
   ordinary paragraph
-.BR
+.br
   _1 indent paragraph one step
-.BR
+.br
   _2 indent paragraph two steps
-.BR
+.br
   _9 indent paragraph nine steps
 .fi
 
-
+.br
 .B resulting output:
 
-.BR
+.br
 ordinary paragraph
 
-.BR
+.br
   indent paragraph one step
 
-.BR
+.br
     indent paragraph two steps
 
-.BR
+.br
                   indent paragraph nine steps
 
-.BR
+.br
 .B markup example:
 
-
 .nf
   _* bullet text
-.BR
+.br
   _1* bullet text, first indent
-.BR
+.br
   _2* bullet text, two step indent
 .fi
 
-.BR
+.br
 .B resulting output:
 
-.BR
+.br
 * bullet text
 
-.BR
+.br
   * bullet text, first indent
 
-.BR
+.br
     * bullet text, two step indent
 
-.BR
+.br
 Numbered List (not to be confused with headings/titles, (document structure))
 
-.BR
+.br
 .B markup example:
 
-
 .nf
   # numbered list                numbered list 1., 2., 3, etc.
-.BR
+.br
   _# numbered list numbered list indented a., b., c., d., etc.
 .fi
 
-.SH
-9.4 FOOTNOTES / ENDNOTES
+.SH 9.4 FOOTNOTES / ENDNOTES
 
-.BR
+.br
 Footnotes and endnotes are marked up at the location where they would be
 indicated within a text. They are automatically numbered. The output type
 determines whether footnotes or endnotes will be produced
 
-.BR
+.br
 .B markup example:
 
-
 .nf
   ~{ a footnote or endnote }~
 .fi
 
-.BR
+.br
 .B resulting output:
 
-.BR
+.br
 [^12]
 
-.BR
+.br
 .B markup example:
 
-
 .nf
   normal text~{ self contained endnote marker & endnote in one }~ continues
 .fi
 
-.BR
+.br
 .B resulting output:
 
-.BR
+.br
 normal text[^13] continues
 
-.BR
+.br
 .B markup example:
 
-
 .nf
   normal text ~{* unnumbered asterisk footnote/endnote, insert multiple asterisks if required }~ continues
-.BR
+.br
   normal text ~{** another unnumbered asterisk footnote/endnote }~ continues
 .fi
 
-.BR
+.br
 .B resulting output:
 
-.BR
+.br
 normal text [^*] continues
 
-.BR
+.br
 normal text [^**] continues
 
-.BR
+.br
 .B markup example:
 
-
 .nf
   normal text ~[* \ editors \ notes, \ numbered \ asterisk \ footnote/endnote \ series \ ]~ continues
-.BR
+.br
   normal text ~[+ \ editors \ notes, \ numbered \ asterisk \ footnote/endnote \ series \ ]~ continues
 .fi
 
-.BR
+.br
 .B resulting output:
 
-.BR
+.br
 normal text [^*3] continues
 
-.BR
+.br
 normal text [^+2] continues
 
-.BR
+.br
 .B Alternative endnote pair notation for footnotes/endnotes:
 
-
 .nf
   % note the endnote marker "~^"
   normal text~^ continues
-.BR
+.br
   ^~ endnote text following the paragraph in which the marker occurs
 .fi
 
-.BR
+.br
 the standard and pair notation cannot be mixed in the same document
 
-.SH
-9.5 LINKS
+.SH 9.5 LINKS
 
-.SH
-9.5.1 NAKED URLS WITHIN TEXT, DEALING WITH URLS
+.SH 9.5.1 NAKED URLS WITHIN TEXT, DEALING WITH URLS
 
-.BR
+.br
 urls found within text are marked up automatically. A url within text is
 automatically hyperlinked to itself and by default decorated with angled
 braces, unless they are contained within a code block (in which case they are
 passed as normal text), or escaped by a preceding underscore (in which case the
 decoration is omitted).
 
-.BR
+.br
 .B markup example:
 
-
 .nf
   normal text http://www.sisudoc.org/ continues
 .fi
 
-.BR
+.br
 .B resulting output:
 
-.BR
+.br
 normal text  continues
 
-.BR
+.br
 An escaped url without decoration
 
-.BR
+.br
 .B markup example:
 
-
 .nf
   normal text _http://www.sisudoc.org/ continues
   deb http://www.jus.uio.no/sisu/archive unstable main non-free
 .fi
 
-.BR
+.br
 .B resulting output:
 
-.BR
+.br
 normal text <_http://www.sisudoc.org/> continues
 
-.BR
+.br
 deb <_http://www.jus.uio.no/sisu/archive> unstable main non-free
 
-.BR
+.br
 where a code block is used there is neither decoration nor hyperlinking, code
 blocks are discussed later in this document
 
-.BR
+.br
 .B resulting output:
 
-
 .nf
   deb http://www.jus.uio.no/sisu/archive unstable main non-free
-.BR
+.br
   deb-src http://www.jus.uio.no/sisu/archive unstable main non-free
 .fi
 
-.SH
-9.5.2 LINKING TEXT
+.SH 9.5.2 LINKING TEXT
 
-.BR
+.br
 To link text or an image to a url the markup is as follows
 
-.BR
+.br
 .B markup example:
 
-
 .nf
   about { SiSU }http://url.org markup
 .fi
 
-.BR
+.br
 .B resulting output:
 
-.BR
+.br
 aboutSiSU  markup
 
-.BR
+.br
 A shortcut notation is available so the url link may also be provided
 automatically as a footnote
 
-.BR
+.br
 .B markup example:
 
-
 .nf
   about {~^ SiSU }http://url.org markup
 .fi
 
-.BR
+.br
 .B resulting output:
 
-.BR
+.br
 about SiSU  [^14] markup
 
-.SH
-9.5.3 LINKING IMAGES
+.SH 9.5.3 LINKING IMAGES
 
-.BR
+.br
 .B markup example:
 
-
 .nf
   { tux.png 64x80 }image
-.BR
+.br
   % various url linked images
-.BR
+.br
   {tux.png 64x80 "a better way" }http://www.sisudoc.org/
-.BR
-.BR
+.br
+.br
   {GnuDebianLinuxRubyBetterWay.png 100x101 "Way Better - with Gnu/Linux, Debian and Ruby" }http://www.sisudoc.org/
-.BR
-.BR
+.br
+.br
   {~^ ruby_logo.png "Ruby" }http://www.ruby-lang.org/en/
-.BR
-.BR
+.br
+.br
 .fi
 
-.BR
+.br
 .B resulting output:
 
-.BR
+.br
 [ tux.png ]
 
-.BR
+.br
 tux.png 64x80 "Gnu/Linux - a better way" 
 
-.BR
+.br
 [ \ ruby_logo \ (png \ missing) \ ] [^15]
 
-.BR
+.br
 GnuDebianLinuxRubyBetterWay.png 100x101 "Way Better - with Gnu/Linux, Debian
 and Ruby" 
 
-.BR
+.br
 .B linked url footnote shortcut
 
-
 .nf
   {~^ \ [text \ to \ link] }http://url.org
   % maps to: { \ [text \ to \ link] }http://url.org ~{ http://url.org }~
   % which produces hyper-linked text within a document/paragraph,
-  with an endnote providing the url for the text location used in the hyperlink
+  % with an endnote providing the url for the text location used in the hyperlink
 .fi
 
-
 .nf
   text marker *~name
 .fi
 
-.BR
+.br
 note at a heading level the same is automatically achieved by providing names
 to headings 1, 2 and 3 i.e. 2~[name] and 3~[name] or in the case of
 auto-heading numbering, without further intervention.
 
-.SH
-9.6 GROUPED TEXT
+.SH 9.6 GROUPED TEXT
 
-.SH
-9.6.1 TABLES
+.SH 9.6.1 TABLES
 
-.BR
+.br
 Tables may be prepared in two either of two forms
 
-.BR
+.br
 .B markup example:
 
-
 .nf
   table{ c3; 40; 30; 30;
   This is a table
@@ -1678,20 +1603,19 @@ Tables may be prepared in two either of two forms
   }table
 .fi
 
-.BR
+.br
 .B resulting output:
 
   [table  omitted,  see  other  document  formats]
 
-.BR
+.br
 a second form may be easier to work with in cases where there is not much
 information in each column
 
-.BR
+.br
 .B markup example:
 [^16]
 
-
 .nf
   !_ Table 3.1: Contributors to Wikipedia, January 2001 - June 2005
   {table~h 24; 12; 12; 12; 12; 12; 12;}
@@ -1704,25 +1628,23 @@ information in each column
   \\* Contributed at least ten times; \\** at least 5 times in last month; \\*\** more than 100 times in last month.
 .fi
 
-.BR
+.br
 .B resulting output:
 
-.BR
+.br
 .B Table 3.1: Contributors to Wikipedia, January 2001 - June 2005
 
   [table  omitted,  see  other  document  formats]
 
-.BR
+.br
 * Contributed at least ten times; ** at least 5 times in last month; *** more
 than 100 times in last month.
 
-.SH
-9.6.2 POEM
+.SH 9.6.2 POEM
 
-.BR
+.br
 .B basic markup:
 
-
 .nf
   poem{
     Your poem here
@@ -1730,10 +1652,9 @@ than 100 times in last month.
   Each verse in a poem is given an object number.
 .fi
 
-.BR
+.br
 .B markup example:
 
-
 .nf
   poem{
                       `Fury said to a
@@ -1783,122 +1704,119 @@ than 100 times in last month.
   }poem
 .fi
 
-.BR
+.br
 .B resulting output:
 
                     `Fury said to a
-.BR
+.br
                    mouse, That he
-.BR
+.br
                  met in the
-.BR
+.br
                house,
-.BR
+.br
             "Let us
-.BR
+.br
               both go to
-.BR
+.br
                 law:  I will
-.BR
+.br
                   prosecute
-.BR
+.br
                     YOU.  --Come,
-.BR
+.br
                        I'll take no
-.BR
+.br
                         denial; We
-.BR
+.br
                      must have a
-.BR
+.br
                  trial:  For
-.BR
+.br
               really this
-.BR
+.br
            morning I've
-.BR
+.br
           nothing
-.BR
+.br
          to do."
-.BR
+.br
            Said the
-.BR
+.br
              mouse to the
-.BR
+.br
                cur, "Such
-.BR
+.br
                  a trial,
-.BR
+.br
                    dear Sir,
-.BR
+.br
                          With
-.BR
+.br
                      no jury
-.BR
+.br
                   or judge,
-.BR
+.br
                 would be
-.BR
+.br
               wasting
-.BR
+.br
              our
-.BR
+.br
               breath."
-.BR
+.br
                "I'll be
-.BR
+.br
                  judge, I'll
-.BR
+.br
                    be jury,"
-.BR
+.br
                          Said
-.BR
+.br
                     cunning
-.BR
+.br
                       old Fury:
-.BR
+.br
                      "I'll
-.BR
+.br
                       try the
-.BR
+.br
                          whole
-.BR
+.br
                           cause,
-.BR
+.br
                              and
-.BR
+.br
                         condemn
-.BR
+.br
                        you
-.BR
+.br
                       to
-.BR
+.br
                        death."'
-.BR
+.br
 
-.SH
-9.6.3 GROUP
+.SH 9.6.3 GROUP
 
-.BR
+.br
 .B basic markup:
 
-
 .nf
   group{
-.BR
+.br
     Your grouped text here
-.BR
+.br
   }group
-.BR
+.br
   A group is treated as an object and given a single object number.
 .fi
 
-.BR
+.br
 .B markup example:
 
-
 .nf
   group{
-.BR
+.br
                       'Fury said to a
                      mouse, That he
                    met in the
@@ -1946,102 +1864,101 @@ than 100 times in last month.
   }group
 .fi
 
-.BR
+.br
 .B resulting output:
 
                     `Fury said to a
-.BR
+.br
                    mouse, That he
-.BR
+.br
                  met in the
-.BR
+.br
                house,
-.BR
+.br
             "Let us
-.BR
+.br
               both go to
-.BR
+.br
                 law:  I will
-.BR
+.br
                   prosecute
-.BR
+.br
                     YOU.  --Come,
-.BR
+.br
                        I'll take no
-.BR
+.br
                         denial; We
-.BR
+.br
                      must have a
-.BR
+.br
                  trial:  For
-.BR
+.br
               really this
-.BR
+.br
            morning I've
-.BR
+.br
           nothing
-.BR
+.br
          to do."
-.BR
+.br
            Said the
-.BR
+.br
              mouse to the
-.BR
+.br
                cur, "Such
-.BR
+.br
                  a trial,
-.BR
+.br
                    dear Sir,
-.BR
+.br
                          With
-.BR
+.br
                      no jury
-.BR
+.br
                   or judge,
-.BR
+.br
                 would be
-.BR
+.br
               wasting
-.BR
+.br
              our
-.BR
+.br
               breath."
-.BR
+.br
                "I'll be
-.BR
+.br
                  judge, I'll
-.BR
+.br
                    be jury,"
-.BR
+.br
                          Said
-.BR
+.br
                     cunning
-.BR
+.br
                       old Fury:
-.BR
+.br
                      "I'll
-.BR
+.br
                       try the
-.BR
+.br
                          whole
-.BR
+.br
                           cause,
-.BR
+.br
                              and
-.BR
+.br
                         condemn
-.BR
+.br
                        you
-.BR
+.br
                       to
-.BR
+.br
                        death."'
-.BR
+.br
 
-.SH
-9.6.4 CODE
+.SH 9.6.4 CODE
 
-.BR
+.br
 Code tags code{ \... }code (used as with other group tags described above) are
 used to escape regular sisu markup, and have been used extensively within this
 document to provide examples of
@@ -2049,15 +1966,14 @@ document to provide examples of
 markup. You cannot however use code tags to escape code tags. They are
 however used in the same way as group or poem tags.
 
-.BR
+.br
 A code-block is treated as an object and given a single object number. [an \
 option \ to \ number \ each \ line \ of \ code \ may \ be \ considered \ at \
 some \ later \ time]
 
-.BR
+.br
 .B use of code tags instead of poem compared, resulting output:
 
-
 .nf
                       `Fury said to a
                      mouse, That he
@@ -2105,13 +2021,12 @@ some \ later \ time]
                          death."'
 .fi
 
-.BR
+.br
 From
 .B SiSU
 2.7.7 on you can number codeblocks by placing a hash after the opening code
 tag code{# as demonstrated here:
 
-
 .nf
 1  |                      `Fury said to a
 2  |                     mouse, That he
@@ -2159,83 +2074,75 @@ tag code{# as demonstrated here:
 44 |                         death."'
 .fi
 
-.SH
-9.7 BOOK INDEX
+.SH 9.7 BOOK INDEX
 
-.BR
+.br
 To make an index append to paragraph the book index term relates to it, using
 an equal sign and curly braces.
 
-.BR
+.br
 Currently two levels are provided, a main term and if needed a sub-term.
 Sub-terms are separated from the main term by a colon.
 
-
 .nf
     Paragraph containing main term and sub-term.
     ={Main term:sub-term}
 .fi
 
-.BR
+.br
 The index syntax starts on a new line, but there should not be an empty line
 between paragraph and index markup.
 
-.BR
+.br
 The structure of the resulting index would be:
 
-
 .nf
     Main term, 1
       sub-term, 1
 .fi
 
-.BR
+.br
 Several terms may relate to a paragraph, they are separated by a semicolon. If
 the term refers to more than one paragraph, indicate the number of paragraphs.
 
-
 .nf
     Paragraph containing main term, second term and sub-term.
     ={first term; second term: sub-term}
 .fi
 
-.BR
+.br
 The structure of the resulting index would be:
 
-
 .nf
     First term, 1,
     Second term, 1,
       sub-term, 1
 .fi
 
-.BR
+.br
 If multiple sub-terms appear under one paragraph, they are separated under the
 main term heading from each other by a pipe symbol.
 
-
 .nf
     Paragraph containing main term, second term and sub-term.
     ={Main term:sub-term+1|second sub-term
     A paragraph that continues discussion of the first sub-term
 .fi
 
-.BR
+.br
 The plus one in the example provided indicates the first sub-term spans one
 additional paragraph. The logical structure of the resulting index would be:
 
-
 .nf
     Main term, 1,
       sub-term, 1-3,
       second sub-term, 1,
 .fi
 
-.SH
-10. COMPOSITE DOCUMENTS MARKUP
-.BR
+.SH 10. COMPOSITE DOCUMENTS MARKUP
+.br
 
-.BR
+.br
 It is possible to build a document by creating a master document that requires
 other documents. The documents required may be complete documents that could be
 generated independently, or they could be markup snippets, prepared so as to be
@@ -2254,22 +2161,20 @@ regular markup file, or
 prior to processing with the same prefix and the suffix
 .B \._sst
 
-.BR
+.br
 basic markup for importing a document into a master document
 
-
 .nf
   << filename1.sst
   << filename2.ssi
 .fi
 
-.BR
+.br
 The form described above should be relied on. Within the Vim editor it results
 in the text thus linked becoming hyperlinked to the document it is calling in
 which is convenient for editing. Alternative markup for importation of
 documents under consideration, and occasionally supported have been.
 
-
 .nf
   << filename.ssi
   <<{filename.ssi}
@@ -2277,29 +2182,97 @@ documents under consideration, and occasionally supported have been.
   << |filename.ssi|@|^|
 .fi
 
-.SH
-MARKUP SYNTAX HISTORY
-.BR
+.SH MARKUP SYNTAX HISTORY
+.br
 
-.SH
-11. NOTES RELATED TO FILES\-TYPES AND MARKUP SYNTAX
-.BR
+.SH 11. NOTES RELATED TO FILES-TYPES AND MARKUP SYNTAX
+.br
 
 2.0 introduced new headers and is therefore incompatible with 1.0 though
 otherwise the same with the addition of a couple of tags (i.e. a superset)
 
-.BR
+.br
 0.38 is substantially current for version 1.0
 
-.BR
-* sisu \-\-query=[sisu \ version \ [0.38] or \'history]
+.br
+depreciated 0.16 supported, though file names were changed at 0.37
+
+.br
+* sisu --query=[sisu \ version \ [0.38] or 'history]
 
-.BR
+.br
 provides a short history of changes to
 .B SiSU
 markup
 
-.BR
+.br
+.B SiSU 2.0
+(2010-03-06:09/6) same as 1.0, apart from the changing of headers and the
+addition of a monospace tag related headers now grouped, e.g.
+
+.nf
+  @title:
+   :subtitle:
+
+  @creator:
+   :author:
+   :translator:
+   :illustrator:
+
+  @rights:
+   :text:
+   :illustrations:
+.fi
+
+.br
+see document markup samples, and sisu --help headers
+
+.br
+the monospace tag takes the form of a hash '#'
+
+.nf
+  #{ this enclosed text would be monospaced }#
+.fi
+
+.br
+.B 1.0
+(2009-12-19:50/6) same as 0.69
+
+.br
+.B 0.69
+(2008-09-16:37/2) (same as 1.0) and as previous (0.57) with the addition of
+book index tags
+
+.nf
+  /^={.+?}$/
+.fi
+
+.br
+e.g. appended to a paragraph, on a new-line (without a blank line in between)
+logical structure produced assuming this is the first text "object"
+
+.nf
+   ={GNU/Linux community distribution:Debian+2|Fedora|Gentoo;Free Software Foundation+5}
+.fi
+
+.nf
+  Free Software Foundation, 1-6
+  GNU/Linux community distribution, 1
+      Debian, 1-3
+      Fedora, 1
+      Gentoo,
+.fi
+
+.br
+.B 0.66
+(2008-02-24:07/7) same as previous, adds semantic tags, [experimental \ and \
+not-used]
+
+.nf
+  /[:;]{.+?}[:;][a-z+]/
+.fi
+
+.br
 .B 0.57
 (2007w34/4)
 .B SiSU
@@ -2307,105 +2280,100 @@ markup
 headers @title and @creator in the first heading [expanded \ using \ the \
 contents \ of \ the \ headers \ @title: \ and \ @author:]
 
-
 .nf
   :A~ @title by @author
 .fi
 
-.BR
+.br
 .B 0.52
 (2007w14/6) declared document type identifier at start of text/document:
 
-.BR
+.br
   .B SiSU
 0.52
 
-.BR
+.br
 or, backward compatible using the comment marker:
 
-.BR
+.br
   %
 .B SiSU
 0.38
 
-.BR
+.br
 variations include '
 .B SiSU
 (text|master|insert) [version]' and 'sisu-[version]'
 
-.BR
+.br
 .B 0.51
 (2007w13/6) skins changed (simplified), markup unchanged
 
-.BR
+.br
 .B 0.42
 (2006w27/4) * (asterisk) type endnotes, used e.g. in relation to author
 
-.BR
+.br
 .B SiSU
 0.42 is the same as 0.38 with the introduction of some additional endnote
 types,
 
-.BR
+.br
 Introduces some variations on endnotes, in particular the use of the asterisk
 
-
 .nf
   ~{* for example for describing an author }~ and ~{** for describing a second author }~
 .fi
 
-.BR
+.br
 * for example for describing an author
 
-.BR
+.br
 ** for describing a second author
 
-.BR
+.br
 and
 
-
 .nf
   ~[* \ my \ note \ ]~ or ~[+ \ another \ note \ ]~
 .fi
 
-.BR
+.br
 which numerically increments an asterisk and plus respectively
 
-.BR
+.br
 *1 my note +1 another note
 
-.BR
+.br
 .B 0.38
 (2006w15/7) introduced new/alternative notation for headers, e.g. @title:
 (instead of 0~title), and accompanying document structure markup,
 :A,:B,:C,1,2,3 (maps to previous 1,2,3,4,5,6)
 
-.BR
+.br
 .B SiSU
 0.38 introduced alternative experimental header and heading/structure
 markers,
 
-
 .nf
   @headername: and headers :A~ :B~ :C~ 1~ 2~ 3~
 .fi
 
-.BR
+.br
 as the equivalent of:
 
-
 .nf
   0~headername and headers 1~ 2~ 3~ 4~ 5~ 6~
 .fi
 
-.BR
+.br
 The internal document markup of
 .B SiSU
 0.16 remains valid and standard Though note that
 .B SiSU
 0.37 introduced a new file naming convention
 
-.BR
+.br
 .B SiSU
 has in effect two sets of levels to be considered, using 0.38 notation A-C
 headings/levels, pre-ordinary paragraphs /pre-substantive text, and 1-3
@@ -2422,81 +2390,78 @@ complicated, is more in your face and likely to be understood fairly quickly);
 the substantive text follows levels 1,2,3 and it is 'nice' to do most work in
 those levels
 
-.BR
+.br
 .B 0.37
 (2006w09/7) introduced new file naming convention, \.sst (text), \.ssm
 (master), \.ssi (insert), markup syntax unchanged
 
-.BR
+.br
 .B SiSU
 0.37 introduced new file naming convention, using the file extensions \.sst
  \.ssm and \.ssi to replace \.s1 \.s2 \.s3 \.r1 \.r2 \.r3 and \.si
 
-.BR
+.br
 this is captured by the following file 'rename' instruction:
 
-
 .nf
   rename 's/\.s[123]$/\.sst/' *.s{1,2,3}
   rename 's/\.r[123]$/\.ssm/' *.r{1,2,3}
   rename 's/\.si$/\.ssi/' *.si
 .fi
 
-.BR
+.br
 The internal document markup remains unchanged, from
 .B SiSU
 0.16
 
-.BR
+.br
 .B 0.35
 (2005w52/3) sisupod, zipped content file introduced
 
-.BR
+.br
 .B 0.23
 (2005w36/2) utf-8 for markup file
 
-.BR
+.br
 .B 0.22
 (2005w35/3) image dimensions may be omitted if rmagick is available to be
 relied upon
 
-.BR
+.br
 .B 0.20.4
 (2005w33/4) header 0~links
 
-.BR
+.br
 .B 0.16
 (2005w25/2) substantial changes introduced to make markup cleaner, header
 0~title type, and headings [1-6]~ introduced, also percentage sign (%) at start
 of a text line as comment marker
 
-.BR
+.br
 .B SiSU
 0.16 (0.15 development branch) introduced the use of
 
-.BR
+.br
 the header 0~ and headings/structure 1~ 2~ 3~ 4~ 5~ 6~
 
-.BR
+.br
 in place of the 0.1 header, heading/structure notation
 
-.BR
+.br
 .B SiSU
 0.1 headers and headings structure represented by header 0{~ and
 headings/structure 1{ 2{ 3{ 4{~ 5{ 6{
 
-.SH
-12. SISU FILETYPES
-.BR
+.SH 12. SISU FILETYPES
+.br
 
-.BR
+.br
 .B SiSU
 has plaintext and binary filetypes, and can process either type of document.
 
-.SH
-12.1 \.SST \.SSM \.SSI MARKED UP PLAIN TEXT
+.SH 12.1 \.SST \.SSM \.SSI MARKED UP PLAIN TEXT
 
-.BR
+.br
 .B SiSU
 documents are prepared as plain-text (utf-8) files with
 .B SiSU
@@ -2509,38 +2474,36 @@ that incorporate other text, which can be any regular text or text insert; and
 inserts the contents of which are like regular text except these are marked
  \.ssi and are not processed.
 
-.BR
+.br
 .B SiSU
 processing can be done directly against a sisu documents; which may be
 located locally or on a remote server for which a url is provided.
 
-.BR
+.br
 .B SiSU
 source markup can be shared with the command:
 
-.BR
+.br
   sisu -s [filename]
 
-.SH
-12.1.1 SISU TEXT - REGULAR FILES (.SST)
+.SH 12.1.1 SISU TEXT - REGULAR FILES (.SST)
 
-.BR
+.br
 The most common form of document in
 .B SiSU
 , see the section on
 .B SiSU
 markup.
 
-.BR
+.br
 
 
-.BR
+.br
 
 
-.SH
-12.1.2 SISU MASTER FILES (.SSM)
+.SH 12.1.2 SISU MASTER FILES (.SSM)
 
-.BR
+.br
 Composite documents which incorporate other
 .B SiSU
 documents which may be either regular
@@ -2548,7 +2511,7 @@ documents which may be either regular
 text \.sst which may be generated independently, or inserts prepared solely
 for the purpose of being incorporated into one or more master documents.
 
-.BR
+.br
 The mechanism by which master files incorporate other documents is described as
 one of the headings under under
 .B SiSU
@@ -2556,26 +2519,25 @@ markup in the
 .B SiSU
 manual.
 
-.BR
+.br
 Note: Master documents may be prepared in a similar way to regular documents,
 and processing will occur normally if a \.sst file is renamed \.ssm without
 requiring any other documents; the \.ssm marker flags that the document may
 contain other documents.
 
-.BR
+.br
 Note: a secondary file of the composite document is built prior to processing
 with the same prefix and the suffix \._sst [^17]
 
-.BR
+.br
 
 
-.BR
+.br
 
 
-.SH
-12.1.3 SISU INSERT FILES (.SSI)
+.SH 12.1.3 SISU INSERT FILES (.SSI)
 
-.BR
+.br
 Inserts are documents prepared solely for the purpose of being incorporated
 into one or more master documents. They resemble regular
 .B SiSU
@@ -2584,10 +2546,9 @@ text files except they are ignored by the
 processor. Making a file a \.ssi file is a quick and convenient way of
 flagging that it is not intended that the file should be processed on its own.
 
-.SH
-12.2 SISUPOD, ZIPPED BINARY CONTAINER (SISUPOD.ZIP, \.SSP)
+.SH 12.2 SISUPOD, ZIPPED BINARY CONTAINER (SISUPOD.ZIP, \.SSP)
 
-.BR
+.br
 A sisupod is a zipped
 .B SiSU
 text file or set of
@@ -2595,7 +2556,7 @@ text file or set of
 text files and any associated images that they contain (this will be extended
 to include sound and multimedia-files)
 
-.BR
+.br
 .B SiSU
 plaintext files rely on a recognised directory structure to find contents
 such as images associated with documents, but all images for example for all
@@ -2605,7 +2566,7 @@ manually identify all other files associated with a document. A sisupod
 automatically bundles all associated files with the document that is turned
 into a pod.
 
-.BR
+.br
 The structure of the sisupod is such that it may for example contain a single
 document and its associated images; a master document and its associated
 documents and anything else; or the zipped contents of a whole directory of
@@ -2613,338 +2574,321 @@ prepared
 .B SiSU
 documents.
 
-.BR
+.br
 The command to create a sisupod is:
 
-.BR
+.br
   sisu -S [filename]
 
-.BR
+.br
 Alternatively, make a pod of the contents of a whole directory:
 
-.BR
+.br
   sisu -S
 
-.BR
+.br
 .B SiSU
 processing can be done directly against a sisupod; which may be located
 locally or on a remote server for which a url is provided.
 
-.BR
+.br
 
 
-.BR
+.br
 
 
-.SH
-13. EXPERIMENTAL ALTERNATIVE INPUT REPRESENTATIONS
-.BR
+.SH 13. EXPERIMENTAL ALTERNATIVE INPUT REPRESENTATIONS
+.br
 
-.SH
-13.1 ALTERNATIVE XML
+.SH 13.1 ALTERNATIVE XML
 
-.BR
+.br
 .B SiSU
 offers alternative XML input representations of documents as a proof of
 concept, experimental feature. They are however not strictly maintained, and
 incomplete and should be handled with care.
 
-.BR
+.br
 .B convert from sst to simple xml representations (sax, dom and node):
 
-.BR
+.br
   sisu --to-sax [filename/wildcard] or sisu --to-sxs [filename/wildcard]
 
-.BR
+.br
   sisu --to-dom [filename/wildcard] or sisu --to-sxd [filename/wildcard]
 
-.BR
+.br
   sisu --to-node [filename/wildcard] or sisu --to-sxn [filename/wildcard]
 
-.BR
+.br
 .B convert to sst from any sisu xml representation (sax, dom and node):
 
-.BR
+.br
   sisu --from-xml2sst [filename/wildcard \ [.sxs.xml,.sxd.xml,sxn.xml]]
 
-.BR
+.br
 or the same:
 
-.BR
+.br
   sisu --from-sxml [filename/wildcard \ [.sxs.xml,.sxd.xml,sxn.xml]]
 
-.SH
-13.1.1 XML SAX REPRESENTATION
+.SH 13.1.1 XML SAX REPRESENTATION
 
-.BR
+.br
 To convert from sst to simple xml (sax) representation:
 
-.BR
+.br
   sisu --to-sax [filename/wildcard] or sisu --to-sxs [filename/wildcard]
 
-.BR
+.br
 To convert from any sisu xml representation back to sst
 
-.BR
+.br
   sisu --from-xml2sst [filename/wildcard \ [.sxs.xml,.sxd.xml,sxn.xml]]
 
-.BR
+.br
 or the same:
 
-.BR
+.br
   sisu --from-sxml [filename/wildcard \ [.sxs.xml,.sxd.xml,sxn.xml]]
 
-.SH
-13.1.2 XML DOM REPRESENTATION
+.SH 13.1.2 XML DOM REPRESENTATION
 
-.BR
+.br
 To convert from sst to simple xml (dom) representation:
 
-.BR
+.br
   sisu --to-dom [filename/wildcard] or sisu --to-sxd [filename/wildcard]
 
-.BR
+.br
 To convert from any sisu xml representation back to sst
 
-.BR
+.br
   sisu --from-xml2sst [filename/wildcard \ [.sxs.xml,.sxd.xml,sxn.xml]]
 
-.BR
+.br
 or the same:
 
-.BR
+.br
   sisu --from-sxml [filename/wildcard \ [.sxs.xml,.sxd.xml,sxn.xml]]
 
-.SH
-13.1.3 XML NODE REPRESENTATION
+.SH 13.1.3 XML NODE REPRESENTATION
 
-.BR
+.br
 To convert from sst to simple xml (node) representation:
 
-.BR
+.br
   sisu --to-node [filename/wildcard] or sisu --to-sxn [filename/wildcard]
 
-.BR
+.br
 To convert from any sisu xml representation back to sst
 
-.BR
+.br
   sisu --from-xml2sst [filename/wildcard \ [.sxs.xml,.sxd.xml,sxn.xml]]
 
-.BR
+.br
 or the same:
 
-.BR
+.br
   sisu --from-sxml [filename/wildcard \ [.sxs.xml,.sxd.xml,sxn.xml]]
 
-.SH
-14. CONFIGURATION
-.BR
+.SH 14. CONFIGURATION
+.br
 
-.SH
-14.1 DETERMINING THE CURRENT CONFIGURATION
+.SH 14.1 DETERMINING THE CURRENT CONFIGURATION
 
-.BR
+.br
 Information on the current configuration of
 .B SiSU
 should be available with the help command:
 
-.BR
+.br
   sisu -v
 
-.BR
+.br
 which is an alias for:
 
-.BR
+.br
   sisu --help env
 
-.BR
+.br
 Either of these should be executed from within a directory that contains sisu
 markup source documents.
 
-.SH
-14.2 CONFIGURATION FILES (CONFIG.YML)
+.SH 14.2 CONFIGURATION FILES (CONFIG.YML)
 
-.BR
+.br
 .B SiSU
 configration parameters are adjusted in the configuration file, which can be
 used to override the defaults set. This includes such things as which directory
 interim processing should be done in and where the generated output should be
 placed.
 
-.BR
+.br
 The
 .B SiSU
 configuration file is a yaml file, which means indentation is significant.
 
-.BR
+.br
 .B SiSU
 resource configuration is determined by looking at the following files if
 they exist:
 
-.BR
+.br
   ./_sisu/sisurc.yml
 
-.BR
+.br
   ~/.sisu/sisurc.yml
 
-.BR
+.br
   /etc/sisu/sisurc.yml
 
-.BR
+.br
 The search is in the order listed, and the first one found is used.
 
-.BR
+.br
 In the absence of instructions in any of these it falls back to the internal
 program defaults.
 
-.BR
+.br
 Configuration determines the output and processing directories and the database
 access details.
 
-.BR
+.br
 If
 .B SiSU
 is installed a sample sisurc.yml may be found in /etc/sisu/sisurc.yml
 
-.SH
-15. SKINS
-.BR
+.SH 15. SKINS
+.br
 
-.BR
+.br
 Skins modify the default appearance of document output on a document,
 directory, or site wide basis. Skins are looked for in the following locations:
 
-.BR
+.br
   ./_sisu/skin
 
-.BR
+.br
   ~/.sisu/skin
 
-.BR
+.br
   /etc/sisu/skin
 
-.BR
+.br
 .B Within the skin directory
 are the following the default sub-directories for document skins:
 
-.BR
+.br
   ./skin/doc
 
-.BR
+.br
   ./skin/dir
 
-.BR
+.br
   ./skin/site
 
-.BR
+.br
 A skin is placed in the appropriate directory and the file named skin_[name].rb
 
-.BR
+.br
 The skin itself is a ruby file which modifies the default appearances set in
 the program.
 
-.SH
-15.1 DOCUMENT SKIN
+.SH 15.1 DOCUMENT SKIN
 
-.BR
+.br
 Documents take on a document skin, if the header of the document specifies a
 skin to be used.
 
-
 .nf
   @skin: skin_united_nations
 .fi
 
-.SH
-15.2 DIRECTORY SKIN
+.SH 15.2 DIRECTORY SKIN
 
-.BR
+.br
 A directory may be mapped on to a particular skin, so all documents within that
 directory take on a particular appearance. If a skin exists in the skin/dir
 with the same name as the document directory, it will automatically be used for
 each of the documents in that directory, (except where a document specifies the
 use of another skin, in the skin/doc directory).
 
-.BR
+.br
 A personal habit is to place all skins within the doc directory, and symbolic
 links as needed from the site, or dir directories as required.
 
-.SH
-15.3 SITE SKIN
+.SH 15.3 SITE SKIN
 
-.BR
+.br
 A site skin, modifies the program default skin.
 
-.SH
-15.4 SAMPLE SKINS
+.SH 15.4 SAMPLE SKINS
 
-.BR
+.br
 With
 .B SiSU
 installed sample skins may be found in:
 
-.BR
+.br
   /etc/sisu/skin/doc and
   /usr/share/doc/sisu/markup-samples/samples/_sisu/skin/doc
 
-.BR
+.br
 (or equivalent directory) and if sisu-markup-samples is installed also under:
 
-.BR
+.br
   /usr/share/doc/sisu/markup-samples-non-free/samples/_sisu/skin/doc
 
-.BR
+.br
 Samples of list.yml and promo.yml (which are used to create the right column
 list) may be found in:
 
-.BR
+.br
   /usr/share/doc/sisu/markup-samples-non-free/samples/_sisu/skin/yml (or
   equivalent directory)
 
-.SH
-16. CSS - CASCADING STYLE SHEETS (FOR HTML, XHTML AND XML)
-.BR
+.SH 16. CSS - CASCADING STYLE SHEETS (FOR HTML, XHTML AND XML)
+.br
 
-.BR
+.br
 CSS files to modify the appearance of
 .B SiSU
 html, XHTML or XML may be placed in the configuration directory: \./_sisu/css
 ; ~/.sisu/css or; /etc/sisu/css and these will be copied to the output
 directories with the command sisu -CC.
 
-.BR
+.br
 The basic CSS file for html output is html.css, placing a file of that name in
 directory _sisu/css or equivalent will result in the default file of that name
 being overwritten.
 
-.BR
+.br
 HTML: html.css
 
-.BR
+.br
 XML DOM: dom.css
 
-.BR
+.br
 XML SAX: sax.css
 
-.BR
+.br
 XHTML: xhtml.css
 
-.BR
+.br
 The default homepage may use homepage.css or html.css
 
-.BR
+.br
 Under consideration is to permit the placement of a CSS file with a different
 name in directory _sisu/css directory or equivalent, and change the default CSS
 file that is looked for in a skin.[^18]
 
-.SH
-17. ORGANISING CONTENT
-.BR
+.SH 17. ORGANISING CONTENT
+.br
 
-.SH
-17.1 DIRECTORY STRUCTURE AND MAPPING
+.SH 17.1 DIRECTORY STRUCTURE AND MAPPING
 
-.BR
+.br
 The output directory root can be set in the sisurc.yml file. Under the root,
 subdirectories are made for each directory in which a document set resides. If
 you have a directory named poems or conventions, that directory will be created
@@ -2954,7 +2898,7 @@ that directory (poem or conventions). A document will be placed in a
 subdirectory of the same name as the document with the filetype identifier
 stripped (.sst \.ssm)
 
-.BR
+.br
 The last part of a directory path, representing the sub-directory in which a
 document set resides, is the directory name that will be used for the output
 directory. This has implications for the organisation of document collections
@@ -2970,13 +2914,10 @@ output directory. Skins could be associated with each institution on a
 directory basis and resulting documents will take on the appropriate different
 appearance.
 
-.SH
-
-.SH
-18. HOMEPAGES
-.BR
+.SH 18. HOMEPAGES
+.br
 
-.BR
+.br
 .B SiSU
 is about the ability to auto-generate documents. Home pages are regarded as
 custom built items, and are not created by
@@ -2987,49 +2928,46 @@ has a default home page, which will not be appropriate for use with other
 sites, and the means to provide your own home page instead in one of two ways
 as part of a site's configuration, these being:
 
-.BR
+.br
 1. through placing your home page and other custom built documents in the
 subdirectory _sisu/home/ (this probably being the easier and more convenient
 option)
 
-.BR
+.br
 2. through providing what you want as the home page in a skin,
 
-.BR
+.br
 Document sets are contained in directories, usually organised by site or
 subject. Each directory can/should have its own homepage. See the section on
 directory structure and organisation of content.
 
-.SH
-18.1 HOME PAGE AND OTHER CUSTOM BUILT PAGES IN A SUB-DIRECTORY
+.SH 18.1 HOME PAGE AND OTHER CUSTOM BUILT PAGES IN A SUB-DIRECTORY
 
-.BR
+.br
 Custom built pages, including the home page index.html may be placed within the
 configuration directory _sisu/home/ in any of the locations that is searched
 for the configuration directory, namely \./_sisu ; ~/_sisu ; /etc/sisu From
 there they are copied to the root of the output directory with the command:
 
-.BR
+.br
   sisu -CC
 
-.SH
-18.2 HOME PAGE WITHIN A SKIN
+.SH 18.2 HOME PAGE WITHIN A SKIN
 
-.BR
+.br
 Skins are described in a separate section, but basically are a file written in
 the programming language
 .B Ruby
 that may be provided to change the defaults that are provided with sisu with
 respect to individual documents, a directories contents or for a site.
 
-.BR
+.br
 If you wish to provide a homepage within a skin the skin should be in the
 directory _sisu/skin/dir and have the name of the directory for which it is to
 become the home page. Documents in the directory commercial_law would have the
 homepage modified in skin_commercial law.rb; or the directory poems in
 skin_poems.rb
 
-
 .nf
     class Home
       def homepage
@@ -3045,39 +2983,36 @@ skin_poems.rb
     end
 .fi
 
-.SH
-19. MARKUP AND OUTPUT EXAMPLES
-.BR
+.SH 19. MARKUP AND OUTPUT EXAMPLES
+.br
 
-.SH
-19.1 MARKUP EXAMPLES
+.SH 19.1 MARKUP EXAMPLES
 
-.BR
+.br
 Current markup examples and document output samples are provided at
 
 
-.BR
+.br
 For some documents hardly any markup at all is required at all, other than a
 header, and an indication that the levels to be taken into account by the
 program in generating its output are.
 
-.SH
-20. SISU SEARCH - INTRODUCTION
-.BR
+.SH 20. SISU SEARCH - INTRODUCTION
+.br
 
-.BR
+.br
 .B SiSU
 output can easily and conveniently be indexed by a number of standalone
 indexing tools, such as Lucene, Hyperestraier.
 
-.BR
+.br
 Because the document structure of sites created is clearly defined, and the
 text object citation system is available hypothetically at least, for all forms
 of output, it is possible to search the sql database, and either read results
 from that database, or just as simply map the results to the html output, which
 has richer text markup.
 
-.BR
+.br
 In addition to this
 .B SiSU
 has the ability to populate a relational sql type database with documents at
@@ -3087,48 +3022,46 @@ your match criteria is met by these documents and at these locations within
 each document, which can be viewed within the database directly or in various
 output formats.
 
-.SH
-21. SQL
-.BR
+.SH 21. SQL
+.br
 
-.SH
-21.1 POPULATING SQL TYPE DATABASES
+.SH 21.1 POPULATING SQL TYPE DATABASES
 
-.BR
+.br
 .B SiSU
 feeds sisu markupd documents into sql type databases PostgreSQL[^19] and/or
 SQLite[^20] database together with information related to document structure.
 
-.BR
+.br
 This is one of the more interesting output forms, as all the structural data of
 the documents are retained (though can be ignored by the user of the database
 should they so choose). All site texts/documents are (currently) streamed to
 four tables:
 
-.BR
+.br
   * one containing semantic (and other) headers, including, title, author,
   subject, (the Dublin Core...);
 
-.BR
+.br
   * another the substantive texts by individual "paragraph" (or object) - along
   with structural information, each paragraph being identifiable by its
   paragraph number (if it has one which almost all of them do), and the
   substantive text of each paragraph quite naturally being searchable (both in
   formatted and clean text versions for searching); and
 
-.BR
+.br
   * a third containing endnotes cross-referenced back to the paragraph from
   which they are referenced (both in formatted and clean text versions for
   searching).
 
-.BR
+.br
   * a fourth table with a one to one relation with the headers table contains
   full text versions of output, eg. pdf, html, xml, and ascii.
 
-.BR
+.br
 There is of course the possibility to add further structures.
 
-.BR
+.br
 At this level
 .B SiSU
 loads a relational database with documents chunked into objects, their
@@ -3138,7 +3071,7 @@ the document. Text is stored (at this text object level) with and without
 elementary markup tagging, the stripped version being so as to facilitate ease
 of searching.
 
-.BR
+.br
 Being able to search a relational database at an object level with the
 .B SiSU
 citation system is an effective way of locating content generated by
@@ -3153,22 +3086,19 @@ database and have headings in which search content appears, or to search only
 headings etc. (as the Dublin Core is incorporated it is easy to make use of
 that as well).
 
-.SH
-22. POSTGRESQL
-.BR
+.SH 22. POSTGRESQL
+.br
 
-.SH
-22.1 NAME
+.SH 22.1 NAME
 
-.BR
+.br
 .B SiSU
 - Structured information, Serialized Units - a document publishing system,
 postgresql dependency package
 
-.SH
-22.2 DESCRIPTION
+.SH 22.2 DESCRIPTION
 
-.BR
+.br
 Information related to using postgresql with sisu (and related to the
 sisu_postgresql dependency package, which is a dummy package to install
 dependencies needed for
@@ -3177,30 +3107,27 @@ to populate a postgresql database, this being part of
 .B SiSU
 - man sisu).
 
-.SH
-22.3 SYNOPSIS
+.SH 22.3 SYNOPSIS
 
-.BR
+.br
   sisu -D [instruction] [filename/wildcard \ if \ required]
 
-.BR
+.br
   sisu -D --pg --[instruction] [filename/wildcard \ if \ required]
 
-.SH
-22.4 COMMANDS
+.SH 22.4 COMMANDS
 
-.BR
+.br
 Mappings to two databases are provided by default, postgresql and sqlite, the
 same commands are used within sisu to construct and populate databases however
 -d (lowercase) denotes sqlite and -D (uppercase) denotes postgresql,
 alternatively --sqlite or --pgsql may be used
 
-.BR
+.br
 .B -D or --pgsql
 may be used interchangeably.
 
-.SH
-22.4.1 CREATE AND DESTROY DATABASE
+.SH 22.4.1 CREATE AND DESTROY DATABASE
 
 .TP
 .B --pgsql --createall
@@ -3226,8 +3153,7 @@ same name).
 .B sisu -D --recreate
 destroys existing database and builds a new empty database structure
 
-.SH
-22.4.2 IMPORT AND REMOVE DOCUMENTS
+.SH 22.4.2 IMPORT AND REMOVE DOCUMENTS
 
 .TP
 .B sisu -D --import -v [filename/wildcard]
@@ -3242,21 +3168,18 @@ updates file contents in database
 .B sisu -D --remove -v [filename/wildcard]
 removes specified document from postgresql database.
 
-.SH
-23. SQLITE
-.BR
+.SH 23. SQLITE
+.br
 
-.SH
-23.1 NAME
+.SH 23.1 NAME
 
-.BR
+.br
 .B SiSU
 - Structured information, Serialized Units - a document publishing system.
 
-.SH
-23.2 DESCRIPTION
+.SH 23.2 DESCRIPTION
 
-.BR
+.br
 Information related to using sqlite with sisu (and related to the sisu_sqlite
 dependency package, which is a dummy package to install dependencies needed for
 .B SiSU
@@ -3264,30 +3187,27 @@ to populate an sqlite database, this being part of
 .B SiSU
 - man sisu).
 
-.SH
-23.3 SYNOPSIS
+.SH 23.3 SYNOPSIS
 
-.BR
+.br
   sisu -d [instruction] [filename/wildcard \ if \ required]
 
-.BR
+.br
   sisu -d --(sqlite|pg) --[instruction] [filename/wildcard \ if \ required]
 
-.SH
-23.4 COMMANDS
+.SH 23.4 COMMANDS
 
-.BR
+.br
 Mappings to two databases are provided by default, postgresql and sqlite, the
 same commands are used within sisu to construct and populate databases however
 -d (lowercase) denotes sqlite and -D (uppercase) denotes postgresql,
 alternatively --sqlite or --pgsql may be used
 
-.BR
+.br
 .B -d or --sqlite
 may be used interchangeably.
 
-.SH
-23.4.1 CREATE AND DESTROY DATABASE
+.SH 23.4.1 CREATE AND DESTROY DATABASE
 
 .TP
 .B --sqlite --createall
@@ -3313,8 +3233,7 @@ same name).
 .B sisu -d --recreate
 destroys existing database and builds a new empty database structure
 
-.SH
-23.4.2 IMPORT AND REMOVE DOCUMENTS
+.SH 23.4.2 IMPORT AND REMOVE DOCUMENTS
 
 .TP
 .B sisu -d --import -v [filename/wildcard]
@@ -3329,21 +3248,19 @@ updates file contents in database
 .B sisu -d --remove -v [filename/wildcard]
 removes specified document from sqlite database.
 
-.SH
-24. INTRODUCTION
-.BR
+.SH 24. INTRODUCTION
+.br
 
-.SH
-24.1 SEARCH - DATABASE FRONTEND SAMPLE, UTILISING DATABASE AND SISU FEATURES,
+.SH 24.1 SEARCH - DATABASE FRONTEND SAMPLE, UTILISING DATABASE AND SISU FEATURES,
 INCLUDING OBJECT CITATION NUMBERING (BACKEND CURRENTLY POSTGRESQL)
 
-.BR
+.br
 Sample search frontend  [^21] A small database and
 sample query front-end (search from) that makes use of the citation system,
 .I object citation numbering
 to demonstrates functionality.[^22]
 
-.BR
+.br
 .B SiSU
 can provide information on which documents are matched and at what locations
 within each document the matches are found. These results are relevant across
@@ -3352,7 +3269,7 @@ LaTeX, PDF and indeed the SQL database. You can then refer to one of the other
 outputs or in the SQL database expand the text within the matched objects
 (paragraphs) in the documents matched.
 
-.BR
+.br
 Note you may set results either for documents matched and object number
 locations within each matched document meeting the search criteria; or display
 the names of the documents matched along with the objects (paragraphs) that
@@ -3362,14 +3279,13 @@ meet the search criteria.[^23]
 .B sisu -F --webserv-webrick
 builds a cgi web search frontend for the database created
 
-.BR
+.br
 The following is feedback on the setup on a machine provided by the help
 command:
 
-.BR
+.br
   sisu --help sql
 
-
 .nf
   Postgresql
     user:             ralph
@@ -3381,10 +3297,10 @@ command:
     dbi connect       DBI:SQLite:/home/ralph/sisu_www/sisu/sisu_sqlite.db
 .fi
 
-.BR
+.br
 Note on databases built
 
-.BR
+.br
 By default, [unless \ otherwise \ specified] databases are built on a directory
 basis, from collections of documents within that directory. The name of the
 directory you choose to work from is used as the database name, i.e. if you are
@@ -3392,8 +3308,7 @@ working in a directory called /home/ralph/ebook the database SiSU_ebook is
 used. [otherwise \ a \ manual \ mapping \ for \ the \ collection \ is \
 necessary]
 
-.SH
-24.2 SEARCH FORM
+.SH 24.2 SEARCH FORM
 
 .TP
 .B sisu -F
@@ -3414,147 +3329,142 @@ as above, and provides some information on setting up hyperestraier
 starts the webrick server which should be available wherever sisu is properly
 installed
 
-.BR
+.br
 The generated search form must be copied manually to the webserver directory as
 instructed
 
-.SH
-25. HYPERESTRAIER
-.BR
+.SH 25. HYPERESTRAIER
+.br
 
-.BR
+.br
 See the documentation for hyperestraier:
 
-.BR
+.br
   
 
-.BR
+.br
   /usr/share/doc/hyperestraier/index.html
 
-.BR
+.br
   man estcmd
 
-.BR
+.br
 NOTE: the examples that follow assume that sisu output is placed in the
 directory /home/ralph/sisu_www
 
-.BR
+.br
 (A) to generate the index within the webserver directory to be indexed:
 
-.BR
+.br
   estcmd gather -sd [index \ name] [directory \ path \ to \ index]
 
-.BR
+.br
 the following are examples that will need to be tailored according to your
 needs:
 
-.BR
+.br
   cd /home/ralph/sisu_www
 
-.BR
+.br
   estcmd gather -sd casket /home/ralph/sisu_www
 
-.BR
+.br
 you may use the 'find' command together with 'egrep' to limit indexing to
 particular document collection directories within the web server directory:
 
-.BR
+.br
   find /home/ralph/sisu_www -type f | egrep
   '/home/ralph/sisu_www/sisu/.+?.html$' |estcmd gather -sd casket -
 
-.BR
+.br
 Check which directories in the webserver/output directory (~/sisu_www or
 elsewhere depending on configuration) you wish to include in the search index.
 
-.BR
+.br
 As sisu duplicates output in multiple file formats, it it is probably
 preferable to limit the estraier index to html output, and as it may also be
 desirable to exclude files 'plain.txt', 'toc.html' and 'concordance.html', as
 these duplicate information held in other html output e.g.
 
-.BR
+.br
   find /home/ralph/sisu_www -type f | egrep
   '/sisu_www/(sisu|bookmarks)/.+?.html$' | egrep -v '(doc|concordance).html$'
   |estcmd gather -sd casket -
 
-.BR
+.br
 from your current document preparation/markup directory, you would construct a
 rune along the following lines:
 
-.BR
+.br
   find /home/ralph/sisu_www -type f | egrep '/home/ralph/sisu_www/([specify \
   first \ directory \ for \ inclusion]|[specify \ second \ directory \ for \
   inclusion]|[another \ directory \ for \ inclusion? \ \...])/.+?.html$' |
   egrep -v '(doc|concordance).html$' |estcmd gather -sd
   /home/ralph/sisu_www/casket -
 
-.BR
+.br
 (B) to set up the search form
 
-.BR
+.br
 (i) copy estseek.cgi to your cgi directory and set file permissions to 755:
 
-.BR
+.br
   sudo cp -vi /usr/lib/estraier/estseek.cgi /usr/lib/cgi-bin
 
-.BR
+.br
   sudo chmod -v 755 /usr/lib/cgi-bin/estseek.cgi
 
-.BR
+.br
   sudo cp -v /usr/share/hyperestraier/estseek.* /usr/lib/cgi-bin
 
-.BR
+.br
   [see \ estraier \ documentation \ for \ paths]
 
-.BR
+.br
 (ii) edit estseek.conf, with attention to the lines starting 'indexname:' and
 'replace:':
 
-.BR
+.br
   indexname: /home/ralph/sisu_www/casket
 
-.BR
+.br
   replace: ^file:///home/ralph/sisu_www{{!}}http://localhost
 
-.BR
+.br
   replace: /index.html?${{!}}/
 
-.BR
+.br
 (C) to test using webrick, start webrick:
 
-.BR
+.br
   sisu -W
 
-.BR
+.br
 and try open the url: 
 
-.SH
-26. SISU_WEBRICK
-.BR
+.SH 26. SISU_WEBRICK
+.br
 
-.SH
-26.1 NAME
+.SH 26.1 NAME
 
-.BR
+.br
 .B SiSU
 - Structured information, Serialized Units - a document publishing system
 
-.SH
-26.2 SYNOPSIS
+.SH 26.2 SYNOPSIS
 
-.BR
+.br
 sisu_webrick [port]
 
-.BR
+.br
 or
 
-.BR
+.br
 sisu -W [port]
 
-.SH
-26.3 DESCRIPTION
+.SH 26.3 DESCRIPTION
 
-.BR
+.br
 sisu_webrick is part of
 .B SiSU
 (man sisu) sisu_webrick starts
@@ -3565,25 +3475,23 @@ output is written, providing a list of these directories (assuming
 .B SiSU
 is in use and they exist).
 
-.BR
+.br
 The default port for sisu_webrick is set to 8081, this may be modified in the
 yaml file: ~/.sisu/sisurc.yml a sample of which is provided as
 /etc/sisu/sisurc.yml (or in the equivalent directory on your system).
 
-.SH
-26.4 SUMMARY OF MAN PAGE
+.SH 26.4 SUMMARY OF MAN PAGE
 
-.BR
+.br
 sisu_webrick, may be started on it's own with the command: sisu_webrick [port]
 or using the sisu command with the -W flag: sisu -W [port]
 
-.BR
+.br
 where no port is given and settings are unchanged the default port is 8081
 
-.SH
-26.5 DOCUMENT PROCESSING COMMAND FLAGS
+.SH 26.5 DOCUMENT PROCESSING COMMAND FLAGS
 
-.BR
+.br
 sisu -W [port] starts
 .B Ruby
 Webrick web-server, serving
@@ -3591,40 +3499,33 @@ Webrick web-server, serving
 output directories, on the port provided, or if no port is provided and the
 defaults have not been changed in ~/.sisu/sisurc.yaml then on port 8081
 
-.SH
-26.6 FURTHER INFORMATION
+.SH 26.6 FURTHER INFORMATION
 
-.BR
+.br
 For more information on
 .B SiSU
 see:  or 
 
-.BR
+.br
 or man sisu
 
-.SH
-26.7 AUTHOR
+.SH 26.7 AUTHOR
 
-.BR
-Ralph Amissah ralph@amissah.com or ralph.amissah@gmail.com
+.br
+Ralph Amissah  or 
 
-.SH
-26.8 SEE ALSO
+.SH 26.8 SEE ALSO
 
-.BR
+.br
   sisu(1)
 
-.BR
+.br
   sisu_vim(7)
 
-.BR
-  sisu(8)
-
-.SH
-27. REMOTE SOURCE DOCUMENTS
-.BR
+.SH 27. REMOTE SOURCE DOCUMENTS
+.br
 
-.BR
+.br
 .B SiSU
 processing instructions can be run against remote source documents by
 providing the url of the documents against which the processing instructions
@@ -3633,81 +3534,75 @@ are to be carried out. The remote
 documents can either be sisu marked up files in plaintext \.sst or \.ssm or;
 zipped sisu files, sisupod.zip or filename.ssp
 
-.BR
+.br
 .B \.sst / \.ssm - sisu text files
 
-.BR
+.br
 .B SiSU
 can be run against source text files on a remote machine, provide the
 processing instruction and the url. The source file and any associated parts
 (such as images) will be downloaded and generated locally.
 
-
 .nf
   sisu -3 http://[provide \ url \ to \ valid \ \.sst \ or \ \.ssm \ file]
 .fi
 
-.BR
+.br
 Any of the source documents in the sisu examples page can be used in this way,
 see  and use the url to the
  \.sst for the desired document.
 
-.BR
+.br
 NOTE: to set up a remote machine to serve
 .B SiSU
 documents in this way, images should be in the directory relative to the
 document source \../_sisu/image
 
-.BR
+.br
 .B sisupod - zipped sisu files
 
-.BR
+.br
 A sisupod is the zipped content of a sisu marked up text or texts and any other
 associated parts to the document such as images.
 
-.BR
+.br
 .B SiSU
 can be run against a sisupod on a (local or) remote machine, provide the
 processing instruction and the url, the sisupod will be downloaded and the
 documents it contains generated locally.
 
-
 .nf
   sisu -3 http://[provide \ url \ to \ valid \ sisupod.zip \ or \ \.ssp \ file]
 .fi
 
-.BR
+.br
 Any of the source documents in the sisu examples page can be used in this way,
 see  and use the url for the
 desired document.
 
-.SH
-REMOTE DOCUMENT OUTPUT
-.BR
+.SH REMOTE DOCUMENT OUTPUT
+.br
 
-.SH
-28. REMOTE OUTPUT
-.BR
+.SH 28. REMOTE OUTPUT
+.br
 
-.BR
+.br
 Once properly configured
 .B SiSU
 output can be automatically posted once generated to a designated remote
 machine using either rsync, or scp.
 
-.BR
+.br
 In order to do this some ssh authentication agent and keychain or similar tool
 will need to be configured. Once that is done the placement on a remote host
 can be done seamlessly with the -r (for scp) or -R (for rsync) flag, which may
 be used in conjunction with other processing flags, e.g.
 
-
 .nf
   sisu -3R sisu_remote.sst
 .fi
 
-.SH
-28.1 COMMANDS
+.SH 28.1 COMMANDS
 
 .TP
 .B -R [filename/wildcard]
@@ -3724,17 +3619,15 @@ copies sisu output files to remote host using scp. This requires that
 sisurc.yml has been provided with information on hostname and username, and
 that you have your "keys" and ssh agent in place. Also see -R
 
-.SH
-28.2 CONFIGURATION
+.SH 28.2 CONFIGURATION
 
-.BR
+.br
 [expand \ on \ the \ setting \ up \ of \ an \ ssh-agent \ / \ keychain]
 
-.SH
-29. REMOTE SERVERS
-.BR
+.SH 29. REMOTE SERVERS
+.br
 
-.BR
+.br
 As
 .B SiSU
 is generally operated using the command line, and works within a Unix type
@@ -3744,61 +3637,55 @@ the program and all documents can just as easily be on a remote server, to
 which you are logged on using a terminal, and commands and operations would be
 pretty much the same as they would be on your local machine.
 
-.SH
-30. QUICKSTART - GETTING STARTED HOWTO
-.BR
+.SH 30. QUICKSTART - GETTING STARTED HOWTO
+.br
 
-.SH
-30.1 INSTALLATION
+.SH 30.1 INSTALLATION
 
-.BR
+.br
 Installation is currently most straightforward and tested on the
 .B Debian
 platform, as there are packages for the installation of sisu and all
 requirements for what it does.
 
-.SH
-30.1.1 DEBIAN INSTALLATION
+.SH 30.1.1 DEBIAN INSTALLATION
 
-.BR
+.br
 .B SiSU
 is available directly from the
 .B Debian
 Sid and testing archives (and possibly Ubuntu), assuming your
 /etc/apt/sources.list is set accordingly:
 
-
 .nf
     aptitude update
     aptitude install sisu-complete
 .fi
 
-.BR
+.br
 The following /etc/apt/sources.list setting permits the download of additional
 markup samples:
 
-
 .nf
   #/etc/apt/sources.list
-.BR
+.br
     deb http://ftp.fi.debian.org/debian/ unstable main non-free contrib
-.BR
+.br
     deb-src http://ftp.fi.debian.org/debian/ unstable main non-free contrib
-.BR
+.br
 
 .fi
 
-.BR
+.br
 The aptitude commands become:
 
-
 .nf
     aptitude update
-.BR
+.br
     aptitude install sisu-complete sisu-markup-samples
 .fi
 
-.BR
+.br
 If there are newer versions of
 .B SiSU
 upstream of the
@@ -3806,69 +3693,65 @@ upstream of the
 archives, they will be available by adding the following to your
 /etc/apt/sources.list
 
-
 .nf
   #/etc/apt/sources.list
     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
 .fi
 
-.BR
+.br
 repeat the aptitude commands
 
-
 .nf
     aptitude update
     aptitude install sisu-complete sisu-markup-samples
 .fi
 
-.BR
+.br
 Note however that it is not necessary to install sisu-complete if not all
 components of sisu are to be used. Installing just the package sisu will
 provide basic functionality.
 
-.SH
-30.1.2 RPM INSTALLATION
+.SH 30.1.2 RPM INSTALLATION
 
-.BR
+.br
 RPMs are provided though untested, they are prepared by running alien against
 the source package, and against the debs.
 
-.BR
+.br
 They may be downloaded from:
 
-.BR
+.br
   
 
-.BR
+.br
 as root type:
 
-.BR
+.br
   rpm -i [rpm \ package \ name]
 
-.SH
-30.1.3 INSTALLATION FROM SOURCE
+.SH 30.1.3 INSTALLATION FROM SOURCE
 
-.BR
+.br
 To install
 .B SiSU
 from source check information at:
 
-.BR
+.br
   
 
-.BR
+.br
 * download the source package
 
-.BR
+.br
 * Unpack the source
 
-.BR
+.br
 Two alternative modes of installation from source are provided, setup.rb (by
 Minero Aoki) and a rant(by Stefan Lang) built install file, in either case: the
 first steps are the same, download and unpack the source file:
 
-.BR
+.br
 For basic use
 .B SiSU
 is only dependent on the programming language in which it is written
@@ -3881,16 +3764,15 @@ relies on the installation of additional dependencies which the source tarball
 does not take care of, for things like using a database (postgresql or
 sqlite)[^24] or converting LaTeX to pdf.
 
-.BR
+.br
 .B setup.rb
 
-.BR
+.br
 This is a standard ruby installer, using setup.rb is a three step process. In
 the root directory of the unpacked
 .B SiSU
 as root type:
 
-
 .nf
       ruby setup.rb config
       ruby setup.rb setup
@@ -3898,415 +3780,404 @@ as root type:
       ruby setup.rb install
 .fi
 
-.BR
+.br
 further information on setup.rb is available from:
 
-.BR
+.br
   
 
-.BR
+.br
   
 
-.BR
+.br
 .B "install"
 
-.BR
+.br
 The "install" file provided is an installer prepared using "rant". In the root
 directory of the unpacked
 .B SiSU
 as root type:
 
-.BR
+.br
   ruby install base
 
-.BR
+.br
 or for a more complete installation:
 
-.BR
+.br
   ruby install
 
-.BR
+.br
 or
 
-.BR
+.br
   ruby install base
 
-.BR
+.br
 This makes use of Rant (by Stefan Lang) and the provided Rantfile. It has been
 configured to do post installation setup setup configuration and generation of
 first test file. Note however, that additional external package dependencies,
 such as tetex-extra are not taken care of for you.
 
-.BR
+.br
 Further information on "rant" is available from:
 
-.BR
+.br
   
 
-.BR
+.br
   
 
-.BR
+.br
 For a list of alternative actions you may type:
 
-.BR
+.br
   ruby install help
 
-.BR
+.br
   ruby install -T
 
-.SH
-30.2 TESTING SISU, GENERATING OUTPUT
+.SH 30.2 TESTING SISU, GENERATING OUTPUT
 
-.BR
+.br
 To check which version of sisu is installed:
 
-.BR
+.br
 sisu -v
 
-.BR
+.br
 Depending on your mode of installation one or a number of markup sample files
 may be found either in the directory:
 
-.BR
+.br
 ...
 
-.BR
+.br
 or
 
-.BR
+.br
 ...
 
-.BR
+.br
 change directory to the appropriate one:
 
-.BR
-cd /usr/share/doc/sisu/sisu_markup_samples/dfsg
+.br
+cd /usr/share/doc/sisu/markup-samples/samples
 
-.SH
-30.2.1 BASIC TEXT, PLAINTEXT, HTML, XML, ODF, EPUB
+.SH 30.2.1 BASIC TEXT, PLAINTEXT, HTML, XML, ODF, EPUB
 
-.BR
+.br
 Having moved to the directory that contains the markup samples (see
 instructions above if necessary), choose a file and run sisu against it
 
-.BR
+.br
 sisu -NhwoabxXyv free_as_in_freedom.rms_and_free_software.sam_williams.sst
 
-.BR
+.br
 this will generate html including a concordance file, opendocument text format,
 plaintext, XHTML and various forms of XML, and OpenDocument text
 
-.SH
-30.2.2 LATEX / PDF
+.SH 30.2.2 LATEX / PDF
 
-.BR
+.br
 Assuming a LaTeX engine such as tetex or texlive is installed with the required
 modules (done automatically on selection of sisu-pdf in
 .B Debian
 )
 
-.BR
+.br
 Having moved to the directory that contains the markup samples (see
 instructions above if necessary), choose a file and run sisu against it
 
-.BR
+.br
 sisu -pv free_as_in_freedom.rms_and_free_software.sam_williams.sst
 
-.BR
+.br
 sisu -3 free_as_in_freedom.rms_and_free_software.sam_williams.sst
 
-.BR
+.br
 should generate most available output formats: html including a concordance
 file, opendocument text format, plaintext, XHTML and various forms of XML, and
 OpenDocument text and pdf
 
-.SH
-30.2.3 RELATIONAL DATABASE - POSTGRESQL, SQLITE
+.SH 30.2.3 RELATIONAL DATABASE - POSTGRESQL, SQLITE
 
-.BR
+.br
 Relational databases need some setting up - you must have permission to create
 the database and write to it when you run sisu.
 
-.BR
+.br
 Assuming you have the database installed and the requisite permissions
 
-.BR
+.br
 sisu --sqlite --recreate
 
-.BR
+.br
 sisu --sqlite -v --import
 free_as_in_freedom.rms_and_free_software.sam_williams.sst
 
-.BR
+.br
 sisu --pgsql --recreate
 
-.BR
+.br
 sisu --pgsql -v --import
 free_as_in_freedom.rms_and_free_software.sam_williams.sst
 
-.SH
-30.3 GETTING HELP
+.SH 30.3 GETTING HELP
 
-.SH
-30.3.1 THE MAN PAGES
+.SH 30.3.1 THE MAN PAGES
 
-.BR
+.br
 Type:
 
-.BR
+.br
   man sisu
 
-.BR
+.br
 The man pages are also available online, though not always kept as up to date
 as within the package itself:
 
-.BR
+.br
 * sisu.1  [^25]
 
-.BR
+.br
 * sisu.8  [^26]
 
-.BR
+.br
 * man directory  [^27]
 
-.SH
-30.3.2 BUILT IN HELP
+.SH 30.3.2 BUILT IN HELP
 
-.BR
+.br
 sisu --help
 
-.BR
+.br
 sisu --help --env
 
-.BR
+.br
 sisu --help --commands
 
-.BR
+.br
 sisu --help --markup
 
-.SH
-30.3.3 THE HOME PAGE
+.SH 30.3.3 THE HOME PAGE
 
-.BR
+.br
 
 
-.BR
+.br
 
 
-.BR
+.br
 
 
-.SH
-30.4 MARKUP SAMPLES
+.SH 30.4 MARKUP SAMPLES
 
-.BR
+.br
 A number of markup samples (along with output) are available off:
 
-.BR
+.br
 
 
-.BR
+.br
 Additional markup samples are packaged separately in the file:
 
-.BR
-.B *
+.br
+***
 
-.BR
+.br
 On
 .B Debian
 they are available in non-free[^28] to include them it is necessary to
 include non-free in your /etc/apt/source.list or obtain them from the sisu home
 site.
 
-.SH
-31. EDITOR FILES, SYNTAX HIGHLIGHTING
-.BR
+.SH 31. EDITOR FILES, SYNTAX HIGHLIGHTING
+.br
 
-.BR
+.br
 The directory:
 
-.BR
+.br
   \./data/sisu/v2/conf/editor-syntax-etc/
 
-.BR
+.br
   \./data/sisu/v3/conf/editor-syntax-etc/
 
-.BR
+.br
   /usr/share/sisu/v2/conf/editor-syntax-etc
 
-.BR
+.br
   /usr/share/sisu/v3/conf/editor-syntax-etc
 
-.BR
+.br
 contains rudimentary sisu syntax highlighting files for:
 
-.BR
+.br
 * (g)vim 
 
-.BR
+.br
   package: sisu-vim
 
-.BR
+.br
 status: largely done
 
-.BR
+.br
   there is a vim syntax highlighting and folds component
 
-.BR
+.br
 * gedit 
 
-.BR
+.br
 * gobby 
 
-.BR
+.br
   file: sisu.lang
 
-.BR
+.br
 place in:
 
-.BR
+.br
   /usr/share/gtksourceview-1.0/language-specs
 
-.BR
+.br
 or
 
-.BR
+.br
   ~/.gnome2/gtksourceview-1.0/language-specs
 
-.BR
+.br
   status: very basic syntax highlighting
 
-.BR
+.br
   comments: this editor features display line wrap and is used by Goby!
 
-.BR
+.br
 * nano 
 
-.BR
+.br
   file: nanorc
 
-.BR
+.br
 save as:
 
-.BR
+.br
   ~/.nanorc
 
-.BR
+.br
   status: basic syntax highlighting
 
-.BR
+.br
   comments: assumes dark background; no display line-wrap; does line breaks
 
-.BR
+.br
 * diakonos (an editor written in ruby) 
 
-.BR
+.br
 file: diakonos.conf
 
-.BR
+.br
 save as:
 
-.BR
+.br
   ~/.diakonos/diakonos.conf
 
-.BR
+.br
 includes:
 
-.BR
+.br
   status: basic syntax highlighting
 
-.BR
+.br
 comments: assumes dark background; no display line-wrap
 
-.BR
+.br
 * kate & kwrite 
 
-.BR
+.br
   file: sisu.xml
 
-.BR
+.br
   place in:
 
-.BR
+.br
     /usr/share/apps/katepart/syntax
 
-.BR
+.br
   or
 
-.BR
+.br
     ~/.kde/share/apps/katepart/syntax
 
-.BR
+.br
   [settings::configure \ kate::{highlighting,filetypes}]
 
-.BR
+.br
   [tools::highlighting::{markup,scripts}:: \ .B \ SiSU \ ]
 
-.BR
+.br
 * nedit 
 
-.BR
+.br
   file: sisu_nedit.pats
 
-.BR
+.br
   nedit -import sisu_nedit.pats
 
-.BR
+.br
   status: a very clumsy first attempt [not \ really \ done]
 
-.BR
+.br
   comments: this editor features display line wrap
 
-.BR
+.br
 * emacs 
 
-.BR
+.br
   files: sisu-mode.el
 
-.BR
+.br
   to file ~/.emacs add the following 2 lines:
 
-.BR
+.br
     (add-to-list 'load-path
     "/usr/share/sisu/v2/conf/editor-syntax-etc/emacs")
 
-.BR
+.br
     (require 'sisu-mode.el)
 
-.BR
+.br
   [not \ done \ / \ not \ yet \ included]
 
-.BR
+.br
 * vim & gvim 
 
-.BR
+.br
   files:
 
-.BR
+.br
   package is the most comprehensive sisu syntax highlighting and editor
   environment provided to date (is for vim/ gvim, and is separate from the
   contents of this directory)
 
-.BR
+.br
   status: this includes: syntax highlighting; vim folds; some error checking
 
-.BR
+.br
   comments: this editor features display line wrap
 
-.BR
+.br
 NOTE:
 
-.BR
+.br
 [ \ .B \ SiSU \ parses \ files \ with \ long \ lines \ or \ line \ breaks, \
 but, \ display \ linewrap \ (without \ line-breaks) \ is \ a \ convenient \
 editor \ feature \ to \ have \ for \ sisu \ markup]
 
-.SH
-32. HOW DOES SISU WORK?
-.BR
+.SH 32. HOW DOES SISU WORK?
+.br
 
-.BR
+.br
 .B SiSU
 markup is fairly minimalistic, it consists of: a (largely optional) document
 header, made up of information about the document (such as when it was
@@ -4327,22 +4198,21 @@ document layout, publishing, content certification, concordance etc.), and
 makes it possible to take advantage of some of the strengths of established
 ways of representing documents, (or indeed to create new ones).
 
-.SH
-33. SUMMARY OF FEATURES
-.BR
+.SH 33. SUMMARY OF FEATURES
+.br
 
-.BR
+.br
 * sparse/minimal markup (clean utf-8 source texts). Documents are prepared in a
 single UTF-8 file using a minimalistic mnemonic syntax. Typical literature,
 documents like "War and Peace" require almost no markup, and most of the
 headers are optional.
 
-.BR
+.br
 * markup is easily readable/parsable by the human eye, (basic markup is simpler
 and more sparse than the most basic HTML), [this \ may \ also \ be \ converted
 \ to \ XML \ representations \ of \ the \ same \ input/source \ document].
 
-.BR
+.br
 * markup defines document structure (this may be done once in a header
 pattern-match description, or for heading levels individually); basic text
 attributes (bold, italics, underscore, strike-through etc.) as required; and
@@ -4356,39 +4226,39 @@ alternative practical standard ways of representing documents [be \ that \
 browser \ viewing, \ paper \ publication, \ sql \ search \ etc.] (html, epub,
 xml, odf, latex, pdf, sql)
 
-.BR
+.br
 * for output produces reasonably elegant output of established industry and
 institutionally accepted open standard formats.[3] takes advantage of the
 different strengths of various standard formats for representing documents,
 amongst the output formats currently supported are:
 
-.BR
+.br
   * html - both as a single scrollable text and a segmented document
 
-.BR
+.br
   * xhtml
 
-.BR
+.br
   * epub
 
-.BR
+.br
   * XML - both in sax and dom style xml structures for further development as
   required
 
-.BR
+.br
   * ODF - open document format, the iso standard for document storage
 
-.BR
+.br
   * LaTeX - used to generate pdf
 
-.BR
+.br
   * pdf (via LaTeX)
 
-.BR
+.br
   * sql - population of an sql database, (at the same object level that is used
   to cite text within a document)
 
-.BR
+.br
 Also produces: concordance files; document content certificates (md5 or sha256
 digests of headings, paragraphs, images etc.) and html manifests (and sitemaps
 of content). (b) takes advantage of the strengths implicit in these very
@@ -4396,7 +4266,7 @@ different output types, (e.g. PDFs produced using typesetting of LaTeX,
 databases populated with documents at an individual object/paragraph level,
 making possible granular search (and related possibilities))
 
-.BR
+.br
 * ensuring content can be cited in a meaningful way regardless of selected
 output format. Online publishing (and publishing in multiple document formats)
 lacks a useful way of citing text internally within documents (important to
@@ -4408,7 +4278,7 @@ machine) across all digital outputs whether paper, screen, or database
 oriented, (pdf, HTML, EPUB, xml, sqlite, postgresql), this numbering system can
 be used to reference content.
 
-.BR
+.br
 * Granular search within documents. SQL databases are populated at an object
 level (roughly headings, paragraphs, verse, tables) and become searchable with
 that degree of granularity, the output information provides the
@@ -4417,7 +4287,7 @@ also possible to look at just the matching paragraphs of the documents in the
 database; [output \ indexing \ also \ work \ well \ with \ search \ indexing \
 tools \ like \ hyperestraier].
 
-.BR
+.br
 * long term maintainability of document collections in a world of changing
 formats, having a very sparsely marked-up source document base. there is a
 considerable degree of future-proofing, output representations are
@@ -4425,45 +4295,45 @@ considerable degree of future-proofing, output representations are
 (open document text) module in 2006, epub in 2009 and in future html5 output
 sometime in future, without modification of existing prepared texts
 
-.BR
+.br
 * SQL search aside, documents are generated as required and static once
 generated.
 
-.BR
+.br
 * documents produced are static files, and may be batch processed, this needs
 to be done only once but may be repeated for various reasons as desired
 (updated content, addition of new output formats, updated technology document
 presentations/representations)
 
-.BR
+.br
 * document source (plaintext utf-8) if shared on the net may be used as input
 and processed locally to produce the different document outputs
 
-.BR
+.br
 * document source may be bundled together (automatically) with associated
 documents (multiple language versions or master document with inclusions) and
 images and sent as a zip file called a sisupod, if shared on the net these too
 may be processed locally to produce the desired document outputs
 
-.BR
+.br
 * generated document outputs may automatically be posted to remote sites.
 
-.BR
+.br
 * for basic document generation, the only software dependency is
 .B Ruby
 , and a few standard Unix tools (this covers plaintext, HTML, EPUB, XML, ODF,
 LaTeX). To use a database you of course need that, and to convert the LaTeX
 generated to pdf, a latex processor like tetex or texlive.
 
-.BR
+.br
 * as a developers tool it is flexible and extensible
 
-.BR
+.br
 Syntax highlighting for
 .B SiSU
 markup is available for a number of text editors.
 
-.BR
+.br
 .B SiSU
 is less about document layout than about finding a way with little markup to
 be able to construct an abstract representation of a document that makes it
@@ -4471,7 +4341,7 @@ possible to produce multiple representations of it which may be rather
 different from each other and used for different purposes, whether layout and
 publishing, or search of content
 
-.BR
+.br
 i.e. to be able to take advantage from this minimal preparation starting point
 of some of the strengths of rather different established ways of representing
 documents for different purposes, whether for search (relational database, or
@@ -4479,7 +4349,7 @@ indexed flat files generated for that purpose whether of complete documents, or
 say of files made up of objects), online viewing (e.g. html, xml, pdf), or
 paper publication (e.g. pdf)...
 
-.BR
+.br
 the solution arrived at is by extracting structural information about the
 document (about headings within the document) and by tracking objects (which
 are serialized and also given hash values) in the manner described. It makes
@@ -4488,109 +4358,68 @@ present. For example objects could be saved individually and identified by
 their hashes, with an index of how the objects relate to each other to form a
 document.
 
-.SH
-34. HELP SOURCES
-.BR
-
-.BR
-For a summary of alternative ways to get help on
-.B SiSU
-try one of the following:
-
-.BR
-.B man page
-
-.BR
-  man sisu_help
-
-.BR
-.B man2html
-
-.BR
-  
-
-.BR
-.B sisu generated output - links to html
-
-.BR
-  
-
-.BR
-.B help sources lists
-
-.BR
-Alternative sources for this help sources page listed here:
-
-.BR
-  man sisu_help_sources
-
-.BR
-  
-
-.SH
-34.1 MAN PAGES
+.SH 34. HELP SOURCES
+.br
 
-.SH
-34.1.1 MAN
+.SH 34.1 MAN PAGES
 
-.BR
+.br
   man sisu
 
-.BR
+.br
   man sisu-concordance
 
-.BR
+.br
   man sisu-epub
 
-.BR
+.br
   man sisu-git
 
-.BR
+.br
   man sisu-harvest
 
-.BR
+.br
   man sisu-html
 
-.BR
+.br
   man sisu-odf
 
-.BR
+.br
   man sisu-pdf
 
-.BR
+.br
   man sisu-pg
 
-.BR
+.br
   man sisu-po
 
-.BR
+.br
   man sisu-sqlite
 
-.BR
+.br
   man sisu-txt
 
-.BR
+.br
   man 7 sisu_complete
 
-.BR
+.br
   man 7 sisu_pdf
 
-.BR
+.br
   man 7 sisu_postgresql
 
-.BR
+.br
   man 7 sisu_sqlite
 
-.BR
+.br
   man sisu_termsheet
 
-.BR
+.br
   man sisu_webrick
 
-.SH
-34.2 SISU GENERATED OUTPUT - LINKS TO HTML
+.SH 34.2 SISU GENERATED OUTPUT - LINKS TO HTML
 
-.BR
+.br
 Note
 .B SiSU
 documentation is prepared in
@@ -4598,210 +4427,196 @@ documentation is prepared in
 and output is available in multiple formats including amongst others html,
 pdf, odf and epub, which may be also be accessed via the html pages[^29]
 
-.SH
-34.2.1 WWW.SISUDOC.ORG
+.SH 34.2.1 WWW.SISUDOC.ORG
 
-.BR
+.br
 
 
-.BR
+.br
   
 
-.SH
-34.3 MAN2HTML
+.SH 34.3 MAN2HTML
 
-.SH
-34.3.1 LOCALLY INSTALLED
+.SH 34.3.1 LOCALLY INSTALLED
 
-.BR
+.br
 file:///usr/share/doc/sisu/html/sisu.1.html
 
-.BR
+.br
   file:///usr/share/doc/sisu/html/sisu.1.html
 
-.BR
-  file:///usr/share/doc/sisu/html/sisu_pdf.7.html
+.br
+  /usr/share/doc/sisu/html/sisu_pdf.7.html
 
-.BR
-  file:///usr/share/doc/sisu/html/sisu_postgresql.7.html
+.br
+  /usr/share/doc/sisu/html/sisu_postgresql.7.html
 
-.BR
-  file:///usr/share/doc/sisu/html/sisu_sqlite.7.html
+.br
+  /usr/share/doc/sisu/html/sisu_sqlite.7.html
 
-.BR
-  file:///usr/share/doc/sisu/html/sisu_webrick.1.html
+.br
+  /usr/share/doc/sisu/html/sisu_webrick.1.html
 
-.SH
-34.3.2 WWW.JUS.UIO.NO/SISU
+.SH 34.3.2 WWW.jus.uio.no/sisu
 
-.BR
+.br
 
 
-.BR
+.br
   
 
-.BR
+.br
   
 
-.BR
+.br
   
 
-.BR
+.br
   
 
-.BR
+.br
   
 
-.BR
+.br
   
 
-.TP
-.BI 1.
-objects include: headings, paragraphs, verse, tables, images, but not
+1. objects include: headings, paragraphs, verse, tables, images, but not
 footnotes/endnotes which are numbered separately and tied to the object from
 which they are referenced.
-.TP
-.BI 2.
-i.e. the html, pdf, epub, odf outputs are each built individually and
+
+.br
+2. i.e. the html, pdf, epub, odf outputs are each built individually and
 optimised for that form of presentation, rather than for example the html being
 a saved version of the odf, or the pdf being a saved version of the html.
 
-.BR
-.TP
-.BI 3.
-the different heading levels
-.TP
-.BI 4.
-units of text, primarily paragraphs and headings, also any tables, poems,
+.br
+3. the different heading levels
+
+.br
+4. units of text, primarily paragraphs and headings, also any tables, poems,
 code-blocks
-.TP
-.BI 5.
-Specification submitted by Adobe to ISO to become a full open ISO
+
+.br
+5. Specification submitted by Adobe to ISO to become a full open ISO
 specification
 
-.TP
-.BI 6.
-ISO standard ISO/IEC 26300:2006
 
-.BR
-.TP
-.BI 7.
-An open standard format for e-books
+.br
+6. ISO standard ISO/IEC 26300:2006
 
-.BR
-.TP
-.BI *1.
-square brackets
-.TP
-.BI *2.
-square brackets
-.TP
-.BI +1.
-square brackets
-.TP
-.BI 8.
-
-.TP
-.BI 9.
-
-.TP
-.BI 10.
-From sometime after SiSU 0.58 it should be possible to describe SiSU markup
-using SiSU, which though not an original design goal is useful.
-.TP
-.BI 11.
-files should be prepared using UTF-8 character encoding
-.TP
-.BI 12.
-a footnote or endnote
-.TP
-.BI 13.
-self contained endnote marker & endnote in one
-.TP
-.BI *.
-unnumbered asterisk footnote/endnote, insert multiple asterisks if required
-.TP
-.BI **.
-another unnumbered asterisk footnote/endnote
-.TP
-.BI *3.
-editors notes, numbered asterisk footnote/endnote series
-.TP
-.BI +2.
-editors notes, numbered asterisk footnote/endnote series
-.TP
-.BI 14.
-
+.br
+7. An open standard format for e-books
 
-.BR
-.TP
-.BI 15.
-
-.TP
-.BI 16.
-Table from the Wealth of Networks by Yochai Benkler
+.br
+*1. square brackets
+
+.br
+*2. square brackets
+
+.br
++1. square brackets
+
+.br
+8. 
+
+.br
+9. 
+
+.br
+10. From sometime after SiSU 0.58 it should be possible to describe SiSU
+markup using SiSU, which though not an original design goal is useful.
+
+.br
+11. files should be prepared using UTF-8 character encoding
+
+.br
+12. a footnote or endnote
+
+.br
+13. self contained endnote marker & endnote in one
+
+.br
+* unnumbered asterisk footnote/endnote, insert multiple asterisks if
+required
+
+.br
+** another unnumbered asterisk footnote/endnote
+
+.br
+*3. editors notes, numbered asterisk footnote/endnote series
+
+.br
++2. editors notes, numbered asterisk footnote/endnote series
+
+.br
+14 
+
+.br
+15. 
+
+.br
+16. Table from the Wealth of Networks by Yochai Benkler
 
-.TP
-.BI 17.
-\.ssc (for composite) is under consideration but \._sst makes clear that this
-is not a regular file to be worked on, and thus less likely that people will
-have "accidents", working on a \.ssc file that is overwritten by subsequent
-processing. It may be however that when the resulting file is shared \.ssc is an
-appropriate suffix to use.
-.TP
-.BI 19.
-
+
+.br
+17. .ssc (for composite) is under consideration but ._sst makes clear that
+this is not a regular file to be worked on, and thus less likely that people
+will have \"accidents\", working on a .ssc file that is overwritten by
+subsequent processing. It may be however that when the resulting file is shared
+.ssc is an appropriate suffix to use.
+
+.br
+19. 
+.br
 
+.br
 
-.TP
-.BI 20.
-
+.br
+20. 
+.br
 
-.TP
-.BI 21.
-
-.TP
-.BI 22.
-(which could be extended further with current back-end). As regards scaling
-of the database, it is as scalable as the database (here Postgresql) and
-hardware allow.
-.TP
-.BI 23.
-of this feature when demonstrated to an IBM software innovations evaluator
+.br
+21. 
+
+.br
+22. (which could be extended further with current back-end). As regards
+scaling of the database, it is as scalable as the database (here Postgresql)
+and hardware allow.
+
+.br
+23. of this feature when demonstrated to an IBM software innovations evaluator
 in 2004 he said to paraphrase: this could be of interest to us. We have large
 document management systems, you can search hundreds of thousands of documents
 and we can tell you which documents meet your search criteria, but there is no
 way we can tell you without opening each document where within each your
 matches are found.
-.TP
-.BI 24.
-There is nothing to stop MySQL support being added in future.
-.TP
-.BI 25.
-
 
-.BR
-.TP
-.BI 26.
-
+.br
+24. There is nothing to stop MySQL support being added in future.
 
-.BR
-.TP
-.BI 27.
-
-.TP
-.BI 28.
-the
+.br
+25. 
+
+.br
+26. 
+
+.br
+27. 
+
+.br
+28. the
 .B Debian
 Free Software guidelines require that everything distributed within
 .B Debian
 can be changed - and the documents are authors' works that while freely
 distributable are not freely changeable.
-.TP
-.BI 29.
-named index.html or more extensively through sisu_manifest.html
+
+.br
+29. named index.html or more extensively through sisu_manifest.html
+.br
 
 .SH SEE ALSO
+.br
 \fIsisu\fR(1),
 .br
 \fIsisu-epub\fR(1),
@@ -4823,6 +4638,7 @@ named index.html or more extensively through sisu_manifest.html
 \fIsisu_vim\fR(7)
 
 .SH HOMEPAGE
+.br
 More information about \fBSiSU\fR can be found at <\fIhttp://www.sisudoc.org/\fR> or <\fIhttp://www.jus.uio.no/sisu/\fR>.
 
 .SH AUTHOR
-- 
cgit v1.2.3


From d3a09245ec7eab26b8fc8197cdb0f71f29bc85dd Mon Sep 17 00:00:00 2001
From: Ralph Amissah 
Date: Fri, 11 Mar 2011 00:29:15 -0500
Subject: param: tidy, remove redundant document header tags

---
 data/doc/sisu/CHANGELOG_v3 |  6 ++--
 data/sisu/v3/v/version.yml |  4 +--
 lib/sisu/v3/param.rb       | 81 +++++++++++++++++++++-------------------------
 3 files changed, 43 insertions(+), 48 deletions(-)

diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index e60a8ec3..5148f8aa 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -13,7 +13,7 @@ Reverse Chronological:
 %% Development branch UNSTABLE
 v3 branch once stable will supersede & replace current stable v2 branch
 
-%% 3.0.3.orig.tar.gz (2011-03-10:10/4)
+%% 3.0.3.orig.tar.gz (2011-03-11:10/5)
 http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.3.orig.tar.gz
   sisu_3.0.3.orig.tar.gz
   sisu_3.0.3-1.dsc
@@ -40,11 +40,13 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.3.orig.tar.gz
 
   * dal_doc_str: fix, looks like typo in regex
 
+  * param: tidy, remove redundant document header tags
+
   * manpage output presentation fixes
     * manpage: (lowercase .br; correct newlines before .nf and
       after .fi; no escape of hyphens; remove redundant links; endnotes array
       requires flatten; screen info on output path)
-    * param: manpage header .br and no escape of hyphens 
+    * param: manpage header .br and no escape of hyphens
     * urls: correct output path for manpage
 
   * texpdf: url (regex) pattern match fix (/https?/)
diff --git a/data/sisu/v3/v/version.yml b/data/sisu/v3/v/version.yml
index cb913787..5b718b7c 100644
--- a/data/sisu/v3/v/version.yml
+++ b/data/sisu/v3/v/version.yml
@@ -1,5 +1,5 @@
 ---
 :version: 3.0.3-beta-rb1.9.2p180
-:date_stamp: 2011w10/4
-:date: "2011-03-10"
+:date_stamp: 2011w10/5
+:date: "2011-03-11"
 :project: SiSU
diff --git a/lib/sisu/v3/param.rb b/lib/sisu/v3/param.rb
index 8ae87010..9a11da8c 100644
--- a/lib/sisu/v3/param.rb
+++ b/lib/sisu/v3/param.rb
@@ -958,7 +958,7 @@ module SiSU_Param
           SiSU_Screen::Ansi.new(@cmd,'SiSU filetype indicator not provided',mv).warn unless @cmd =~/q/
         end
         @code_flag=false
-        fns_array.each do |para|                                                                                       #% Scan document
+        fns_array.each do |para|                                               #% scan document
           if para !~/^%+\s/ \
           and para =~//,Mx[:br_line])                       #% metainfo DC copyright, public domain, copyleft, creative commons, etc.
-              @rights=Md.new($1.strip,@opt,@env).rights
-            when /^@papersize:\s+(.+?)$/m                                                                              #% metainfo DC
-              l=$1
-              if @mod.inspect !~/--papersize[=-]\S+/
-                l=determine_papersize(l.dup)
-                @papersize=l
+            when /^@notes?:\s(.+)\Z/m                                          #% * header metadata - notes
+              @notes=Md.new($1.strip,@opt,@env).notes
+            when /^@links:\s+(.+?)\Z/m                                         #% * header metadata - links
+              doc_links=Md.new($1.strip,@opt,@env).links
+              count=1
+              @links=[]
+              doc_links.each do |doc_link|
+                if doc_link=~/\{.+?\}(?:(?:https?|file|ftp):\/|\.\.)\/\S+(?:\s|$)/
+                  @links[count]={}
+                  @links[count][:say],@links[count][:url]=/\{\s*(.+?)\s*\}((?:(?:https?|file|ftp):\/|\.\.)\/\S+)/im.match(doc_link)[1,2]
+                  count +=1
+                end
               end
-            when /^@make:(.+)/m                                                                                        #% metainfo DC
+              @lnk=@links
+            when /^@make:(.+)/m                                                #% * header processing - make
               @make=Md.new($1.strip,@opt,@env).make
               if defined? @make.breaks \
-              and @make.breaks[:page_new]               #clearpage
+              and @make.breaks[:page_new]                  #clearpage
                 @pagenew=@make.breaks[:page_new]
               end
               if defined? @make.breaks \
-              and @make.breaks[:page_break]         #newpage
+              and @make.breaks[:page_break]                #newpage
                 @pagebreak=@make.breaks[:page_break]
               end
               if defined? @make.headings \
@@ -1032,23 +1038,10 @@ module SiSU_Param
               end
               if defined? @make.manpage \
               and @make.manpage
-                @man_section=(defined? @make.manpage.section) ? @make.manpage.section : 1
-              end
-            when /^@links:\s+(.+?)\Z/m                                                                                 #% processing
-              doc_links=Md.new($1.strip,@opt,@env).links
-              count=1
-              @links=[]
-              doc_links.each do |doc_link|
-                if doc_link=~/\{.+?\}(?:(?:https?|file|ftp):\/|\.\.)\/\S+(?:\s|$)/
-                  @links[count]={}
-                  @links[count][:say],@links[count][:url]=/\{\s*(.+?)\s*\}((?:(?:https?|file|ftp):\/|\.\.)\/\S+)/im.match(doc_link)[1,2]
-                  count +=1
-                end
+                @man_section=(defined? @make.manpage.section) \
+                ? @make.manpage.section \
+                : 1
               end
-              @lnk=@links
-            when /^@notes?:\s(.+)\Z/m                                                                               #% metainfo
-              @notes=Md.new($1.strip,@opt,@env).notes
-            when /^@base_program:\s+(.+?)$/; @base_program=$1                                                          #% processing
             end
             @lv1 ||=/^1~/
             @lv2 ||=/^2~/
@@ -1056,7 +1049,7 @@ module SiSU_Param
             @lv4 ||=/^4~/
             @lv5 ||=/^5~/
             @lv6 ||=/^6~/
-          else                                                                                                         #%
+          else                                                                 #% *
             case para
             when /^:?A~/
               @lvs[1]=1
@@ -1071,7 +1064,7 @@ module SiSU_Param
             when /^3~/
               @lvs[6]=1
             end
-            if para =~ /^:A~/                                                                                   #% processing
+            if para =~ /^:A~/                                                  #% processing
               if @markup.nil? \
               or @markup.empty?
                 @markup=@markup_version.determined.to_s
@@ -1091,13 +1084,13 @@ module SiSU_Param
             end
             unless @code_flag
               case para
-              when /~\{\s+.+?\}~/m                                                                                     #% processing
+              when /~\{\s+.+?\}~/m                                             #% processing
                 en=para.scan(/~\{.+?\}~/m)
                 en.each { |e| @en[:sum] +=1 }
-              when /~\^(?:\s|$)/m                                                                                      #% processing
+              when /~\^(?:\s|$)/m                                              #% processing
                 mk=para.scan(/~\^(?:\s|$)/)
                 mk.each { |e| @en[:mark] +=1 }
-              when /^\^~\s+\S/; @en[:note] +=1                                                                         #% processing
+              when /^\^~\s+\S/; @en[:note] +=1                                 #% processing
               end
             end
             if para =~/~\{|\^~ |~\^|<:ee>|\{.+?\[[1-6]\]\}\S+?\.ss[tm]/m; @flag_auto_endnotes,@flag_endnotes=true,true
@@ -1147,7 +1140,7 @@ module SiSU_Param
           unless @sem_tag
             @sem_tag=true if para=~/[:;]\{.+?\}[:;][a-z+]/ #refix later
           end
-        end                                                                                                            #% here endeth the document loop
+        end                                                                    #% here endeth the document loop
         if @ec[:image].length > 0
           @ec[:image].flatten!
           @ec[:image].uniq!
@@ -1360,7 +1353,7 @@ module SiSU_Param
         end
         @data=nil #else whole file's contents are stored in md pstore & is not required to be... big waste actually
         @file=SiSU_Env::SiSU_file.new(self) #watch
-        Store.new(self,@env).store                                                                                     #% pstore
+        Store.new(self,@env).store                                             #% pstore
         self
       end
       private
-- 
cgit v1.2.3


From 61c7438e2e99578646b0b4e1241cf081b867f8f9 Mon Sep 17 00:00:00 2001
From: Ralph Amissah 
Date: Fri, 11 Mar 2011 00:33:35 -0500
Subject: syntax highlighting updates, emacs, vim

* emacs sisu headers updated (subheaders omitted for now) sisu-mode.el
* vim cleaning sisu.vim
---
 data/doc/sisu/CHANGELOG_v2                         |   6 +-
 data/doc/sisu/CHANGELOG_v3                         |   4 +
 .../v2/conf/editor-syntax-etc/emacs/sisu-mode.el   | 272 +++++++++------------
 .../v2/conf/editor-syntax-etc/vim/syntax/sisu.vim  |  22 +-
 data/sisu/v2/v/version.yml                         |   4 +-
 .../v3/conf/editor-syntax-etc/emacs/sisu-mode.el   | 272 +++++++++------------
 .../v3/conf/editor-syntax-etc/vim/syntax/sisu.vim  |  30 ++-
 7 files changed, 265 insertions(+), 345 deletions(-)

diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2
index 3751d9dc..0997a951 100644
--- a/data/doc/sisu/CHANGELOG_v2
+++ b/data/doc/sisu/CHANGELOG_v2
@@ -12,7 +12,7 @@ Reverse Chronological:
 
 %% STABLE Branch
 
-%% 2.8.2.orig.tar.gz (2011-03-10:10/4)
+%% 2.8.2.orig.tar.gz (2011-03-11:10/5)
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.8.2.orig.tar.gz
   sisu_2.8.2.orig.tar.gz
   sisu_2.8.2-1.dsc
@@ -48,6 +48,10 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.8.2.orig.tar.gz
 
   * documentation more link fixes
 
+  * syntax highlighting
+    * emacs sisu headers updated (subheaders omitted for now) sisu-mode.el
+    * vim cleaning sisu.vim
+
 %% 2.8.1.orig.tar.gz (2011-03-05:09/6)
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.8.1.orig.tar.gz
   sisu_2.8.1.orig.tar.gz
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index 5148f8aa..dc148689 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -55,6 +55,10 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.3.orig.tar.gz
 
   * documentation more link fixes
 
+  * syntax highlighting
+    * emacs sisu headers updated (subheaders omitted for now) sisu-mode.el
+    * vim cleaning sisu.vim
+
 %% 3.0.2.orig.tar.gz (2011-03-05:09/6)
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.2-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.2.orig.tar.gz
diff --git a/data/sisu/v2/conf/editor-syntax-etc/emacs/sisu-mode.el b/data/sisu/v2/conf/editor-syntax-etc/emacs/sisu-mode.el
index ba2633d3..5b5cec5c 100644
--- a/data/sisu/v2/conf/editor-syntax-etc/emacs/sisu-mode.el
+++ b/data/sisu/v2/conf/editor-syntax-etc/emacs/sisu-mode.el
@@ -1,7 +1,7 @@
 ;;; sisu-mode.el --- a major-mode for highlighting a hierarchy structured text.
 ;; @Author: Ambrose Kofi Laing (& Ralph Amissah)
 ;; @Keywords: text, processes, tools
-;; @Version: 0.70.1 2008-12-14
+;; @Version: 2.8.2 2011-03-11 (2008-12-14)
 ;; @License: GPLv3
 ;; @Home URL: SiSU:   http://www.jus.uio.no/sisu
 ;; originally looked at (based on) doc-mode, with kind permission of the author
@@ -128,118 +128,127 @@
     (list
 
      ;;grouped text
-     (cons "^group\{\\|^\}group"	'general-font-lock-red2)
-     (cons "^code\{\\|^\}code"          'general-font-lock-red2)
-     (cons "^poem\{\\|^\}poem"		'general-font-lock-red2)
-     (cons "^alt\{\\|^\}alt"		'general-font-lock-red2)
-     (cons "^table\{.+\\|^\}table"	'general-font-lock-red2)
-     (cons "^\{table[^}]+\}"		'general-font-lock-red2)
+     (cons "^group\{\\|^\}group"       'general-font-lock-red2)
+     (cons "^block\{\\|^\}block"       'general-font-lock-red2)
+     (cons "^code\{\\|^\}code"         'general-font-lock-red2)
+     (cons "^poem\{\\|^\}poem"         'general-font-lock-red2)
+     (cons "^alt\{\\|^\}alt"           'general-font-lock-red2)
+     (cons "^table\{.+\\|^\}table"     'general-font-lock-red2)
+     (cons "^\{table[^}]+\}"           'general-font-lock-red2)
 
      ;; footnote/endnote
-       ;(cons "\~\{.+?\}\~"	'general-font-lock-green1)
-     (cons "\~\{\\*\\*\\|\~\{\\*\\|\~\{\\|\}\~"	'general-font-lock-red2)
-     (cons "\~\\[\\+\\|\~\\[\\*\\|\~\\[\\|\\]\~"	'general-font-lock-red2)
+       ;(cons "\~\{.+?\}\~"  'general-font-lock-green1)
+     (cons "\~\{\\*\\*\\|\~\{\\*\\|\~\{\\|\}\~"   'general-font-lock-red2)
+     (cons "\~\\[\\+\\|\~\\[\\*\\|\~\\[\\|\\]\~"  'general-font-lock-red2)
 
      (cons "\~\\^ \\|^\\^\~ " 'general-font-lock-red2)
 
      (list (concat
       "\\(\*\~\\)"
-	    "\\([^ \r\t\n]+\\)")
-	   '(1 general-font-lock-red1 t)
-	   '(2 general-font-lock-blue2 t))
+      "\\([^ \r\t\n]+\\)")
+     '(1 general-font-lock-red1 t)
+     '(2 general-font-lock-blue2 t))
 
-     ;; bold
+     ;; emphasis (can be program configured to be bold italics or underscore)
      (list (concat
-	    "\\([*]\{\\)"
-	    "\\([^\}]+\\)"
-	    "\\(\}[*]\\)")
-	   '(1 general-font-lock-red1 t)
-	   '(2 general-font-lock-red1 t)
+      "\\([*]\{\\)"
+      "\\([^\}]+\\)"
+      "\\(\}[*]\\)")
+     '(1 general-font-lock-red1 t)
+     '(2 general-font-lock-red1 t)
      '(3 general-font-lock-red1 t))
 
+     ;; bold
      (list (concat
-	    "\\([!]\{\\)"
-	    "\\([^\}]+\\)"
-	    "\\(\}[!]\\)")
-	   '(1 general-font-lock-red1 t)
-	   '(2 general-font-lock-red1 t)
+      "\\([!]\{\\)"
+      "\\([^\}]+\\)"
+      "\\(\}[!]\\)")
+     '(1 general-font-lock-red1 t)
+     '(2 general-font-lock-red1 t)
      '(3 general-font-lock-red1 t))
-     (cons "\\*[^ ]+\\*"	'general-font-lock-red1)
-     (cons "^!_ .+"		'general-font-lock-red1)
-
+     (cons "\\*[^ ]+\\*"               'general-font-lock-red1)
+     (cons "^!_ .+"                    'general-font-lock-red1)
 
      ;;; italics
      (list (concat
-	    "\\([/]\{\\)"
-	    "\\([^\}]+\\)"
-	    "\\(\}[/]\\)")
-	   '(1 general-font-lock-red1 t)
-	   '(2 general-font-lock-blue1 t)
+      "\\([/]\{\\)"
+      "\\([^\}]+\\)"
+      "\\(\}[/]\\)")
+     '(1 general-font-lock-red1 t)
+     '(2 general-font-lock-blue1 t)
            '(3 general-font-lock-red1 t))
 
-
      ;; underscore
      (list (concat
-	    "\\([_]\{\\)"
-	    "\\([^\}]+\\)"
-	    "\\(\}[_]\\)")
-	   '(1 general-font-lock-red1 t)
-	   '(2 general-font-lock-red1 t)
+      "\\([_]\{\\)"
+      "\\([^\}]+\\)"
+      "\\(\}[_]\\)")
+     '(1 general-font-lock-red1 t)
+     '(2 general-font-lock-red1 t)
+           '(3 general-font-lock-red1 t))
+
+     ;; monospace
+     (list (concat
+      "\\([#]\{\\)"
+      "\\([^\}]+\\)"
+      "\\(\}[#]\\)")
+     '(1 general-font-lock-red1 t)
+     '(2 general-font-lock-red1 t)
            '(3 general-font-lock-red1 t))
 
      ;; citation
      (list (concat
-	    "\\([\"]\{\\)"
-	    "\\([^\}]+\\)"
-	    "\\(\}[\"]\\)")
-	   '(1 general-font-lock-red1 t)
-	   '(2 general-font-lock-red1 t)
+      "\\([\"]\{\\)"
+      "\\([^\}]+\\)"
+      "\\(\}[\"]\\)")
+     '(1 general-font-lock-red1 t)
+     '(2 general-font-lock-red1 t)
            '(3 general-font-lock-red1 t))
 
      ;; inserted text
      (list (concat
-	    "\\([\+]\{\\)"
-	    "\\([^\}]+\\)"
-	    "\\(\}[\+]\\)")
-	   '(1 general-font-lock-red1 t)
-	   '(2 general-font-lock-red1 t)
+      "\\([\+]\{\\)"
+      "\\([^\}]+\\)"
+      "\\(\}[\+]\\)")
+     '(1 general-font-lock-red1 t)
+     '(2 general-font-lock-red1 t)
            '(3 general-font-lock-red1 t))
 
      ;; strike through
      (list (concat
-	    "\\(\\-\{\\)"
-	    "\\([^\}]+\\)"
-	    "\\(\}\\-\\)")
-	   '(1 general-font-lock-red1 t)
-	   '(2 general-font-lock-red1 t)
+      "\\(\\-\{\\)"
+      "\\([^\}]+\\)"
+      "\\(\}\\-\\)")
+     '(1 general-font-lock-red1 t)
+     '(2 general-font-lock-red1 t)
            '(3 general-font-lock-red1 t))
 
      ;; superscript
      (list (concat
-	    "\\(\\^\{\\)"
-	    "\\([^\}]+\\)"
-	    "\\(\}\\^\\)")
-	   '(1 general-font-lock-red1 t)
-	   '(2 general-font-lock-red1 t)
+      "\\(\\^\{\\)"
+      "\\([^\}]+\\)"
+      "\\(\}\\^\\)")
+     '(1 general-font-lock-red1 t)
+     '(2 general-font-lock-red1 t)
            '(3 general-font-lock-red1 t))
 
      ;; subscript
      (list (concat
-	    "\\([,]\{\\)"
-	    "\\([^\}]+\\)"
-	    "\\(\}[,]\\)")
-	   '(1 general-font-lock-red1 t)
-	   '(2 general-font-lock-red1 t)
+      "\\([,]\{\\)"
+      "\\([^\}]+\\)"
+      "\\(\}[,]\\)")
+     '(1 general-font-lock-red1 t)
+     '(2 general-font-lock-red1 t)
            '(3 general-font-lock-red1 t))
 
      ;;numbered list
-     (cons "^# \\|^_# "	'general-font-lock-red1)
+     (cons "^# \\|^_# "                'general-font-lock-red1)
 
      ;;bullet text
-     (cons "^_\\*[1-9] \\|^_\\* "		'general-font-lock-red1)
+     (cons "^_\\*[1-9] \\|^_\\* "      'general-font-lock-red1)
 
      ;;indented text
-     (cons "^_[1-9] "		'general-font-lock-red1)
+     (cons "^_[1-9] "                  'general-font-lock-red1)
 
      ;;url
      (cons "\\(^\\|[ ]\\)http:[/][/][^ \t\n\r<]+" 'general-font-lock-blue2)
@@ -247,118 +256,67 @@
 ;; \\|\$
 
      ;; Comment Lines
-     (cons "^% .*"		'general-font-lock-blue1)
+     (cons "^% .*"                     'general-font-lock-blue1)
      ;; line break
-     (cons "
    "	'general-font-lock-red1)
+     (cons "
    "                      'general-font-lock-red1)
 
      ;; Section titles
      (list "^\\(\\([1-8]\\|:?[A-C]\\)\\~\\)\\(.*\\)"
-	   '(1 sisu-title-1 t)
-	   '(3 sisu-title-2 t))
+     '(1 sisu-title-1 t)
+     '(3 sisu-title-2 t))
 
      ;; hyper-links
      (list (concat
-	    "\\(\{~^\\|\{\\)"
-	    "\\([^\}\{]+\\)"
-	    "\\(\}http:[/][/][^ \r\n\t<]+\\)")
-	   '(1 general-font-lock-blue2 t)
-	   '(2 general-font-lock-red1 t)
+      "\\(\{~^\\|\{\\)"
+      "\\([^\}\{]+\\)"
+      "\\(\}http:[/][/][^ \r\n\t<]+\\)")
+     '(1 general-font-lock-blue2 t)
+     '(2 general-font-lock-red1 t)
      '(3 general-font-lock-blue2 t))
 
      ;; book index
-     (cons "^\=\{.+\}"	'general-font-lock-green1)
+     (cons "^\=\{.+\}"                 'general-font-lock-green1)
 
      ;; numbers
-     (cons "\\<[.0-9]+\\>"	'general-font-lock-green2)
+     (cons "\\<[.0-9]+\\>"             'general-font-lock-green2)
 
      ;; bullets sisu_normal (nearly copied regexp)
      (cons "^_\\([1-9*]\\|[1-9]\\*\\) " 'general-font-lock-blue2)
 
      ;; image links
      (list (concat
-	    "\\(\{\\)"
-	    "\\([^\}\{]+\\)"
-	    "\\(\}image\\)")
-	   '(1 general-font-lock-blue2 t)
-	   '(2 general-font-lock-red1 t)
+      "\\(\{\\)"
+      "\\([^\}\{]+\\)"
+      "\\(\}image\\)")
+     '(1 general-font-lock-blue2 t)
+     '(2 general-font-lock-red1 t)
            '(3 general-font-lock-blue2 t))
 
      ;; insert file links
      (list (concat
-	    "\\(<< \\)"
-	    "\\([^ \r\t\n]+\\.ss\\)"
-	    "\\(i\\|t\\)")
-	   '(1 general-font-lock-blue2 t)
-	   '(2 general-font-lock-blue2 t)
+      "\\(<< \\)"
+      "\\([^ \r\t\n]+\\.ss\\)"
+      "\\(i\\|t\\)")
+     '(1 general-font-lock-blue2 t)
+     '(2 general-font-lock-blue2 t)
            '(3 general-font-lock-blue2 t))
 
      ;; raw keywords
      (list (concat
-	    "^\\(\\@\\("
-	    "title\\|"
-	    "subtitle\\|"
-	    "author.title\\|"
-	    "author.nationality\\|"
-	    "author\\|creator\\|"
-	    "translator\\|translated_by\\|"
-	    "illustrator\\|illustrated_by\\|"
-	    "prepared_by\\|"
-	    "digitized_by\\|"
-	    "contributor\\|"
-	    "publisher\\|"
-	    "topic_register\\|"
-	    "subject\\|"
-	    "description\\|"
-	    "comment\\|"
-	    "type\\|"
-	    "format\\|"
-	    "source\\|"
-	    "language\.original\\|"
-	    "language\.document\\|"
-	    "language\\|"
-	    "rights\\|"
-	    "relation\\|"
-	    "coverage\\|"
-	    "keywords\\|"
-	    "comments\\|"
-	    "papersize\\|"
-	    "tags\\|"
-	    "catalogue\\|"
-	    "date.created\\|"
-	    "date.issued\\|"
-	    "date.available\\|"
-	    "date.modified\\|"
-	    "date.valid\\|"
-	    "date.added_to_site\\|"
-	    "date\\|"
-	    "original_publication.date\\|"
-	    "original_publication.nationality\\|"
-	    "original_publication.institution\\|"
-	    "original_publication\\|"
-	    "writing_focus.nationality\\|"
-	    "classify_loc\\|"
-	    "classify_dewey\\|"
-	    "classify_isbn\\|"
-	    "classify_pg\\|"
-	    "prefix\\|"
-	    "suffix\\|"
-	    "contact\\|"
-	    "links\\|"
-	    "structure\\|"
-	    "toc\\|"
-	    "level\\|"
-	    "page\\|"
-	    "markup\\|"
-	    "css\\|stylesheet\\|"
-	    "skin\\|"
-	    "abstract\\|"
-	    "bold\\|"
-	    "italics\\|"
-	    "doc_cont_idx\\|"
-	    "doc_content_index\\|"
-	    "\\):\\)\\(.*\\)")
-	   '(1 sisu-title-2 keep)
-	   '(3 sisu-title-3 keep))
+      "^\\(\\@\\("
+      "title\\|"
+      "creator\\|"
+      "date\\|"
+      "publisher\\|"
+      "rights\\|"
+      "classify\\|"
+      "original\\|"
+      "notes\\|"
+      "links\\|"
+      "make\\|"
+      "\\):\\)\\(.*\\)")
+     '(1 sisu-title-2 keep)
+     '(3 sisu-title-3 keep))
 
      ))
  "Default expressions to highlight in AsciiSisu mode.")
@@ -386,11 +344,11 @@
 
   (make-local-variable 'font-lock-defaults)
   (setq font-lock-defaults
-	'(sisu-font-lock-keywords
-	  nil				; KEYWORDS-ONLY: no
-	  nil				; CASE-FOLD: no
-	  ((?_ . "w"))			; SYNTAX-ALIST
-	  ))
+  '(sisu-font-lock-keywords
+    nil        ; KEYWORDS-ONLY: no
+    nil        ; CASE-FOLD: no
+    ((?_ . "w"))      ; SYNTAX-ALIST
+    ))
   (run-hooks 'sisu-mode-hook))
 
 (provide 'sisu-mode)
diff --git a/data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim b/data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim
index 4bf5a045..e1077034 100644
--- a/data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim
+++ b/data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim
@@ -1,6 +1,6 @@
 "SiSU Vim syntax file
 "SiSU Maintainer: Ralph Amissah 
-"SiSU Markup:     SiSU (sisu-2.7.10, 2010-12-16)
+"SiSU Markup:     SiSU (sisu-2.8.2, 2011-03-11)
 "(originally looked at Ruby Vim by Mirko Nasato)
 
 if version < 600
@@ -33,7 +33,7 @@ if !exists("sisu_no_identifiers")
   syn match   sisu_sub_header_creator                                     "^\s\+:\(author\|contributor\|illustrator\|photographer\|translator\|digitized_by\|prepared_by\|audio\|video\):\s"                               " &hon &institution
   syn match   sisu_sub_header_rights                                      "^\s\+:\(copyright\|text\|translation\|illustrations\|photographs\|preparation\|digitization\|audio\|video\|license\|all\):\s"                   " access_rights license
   syn match   sisu_sub_header_classify                                    "^\s\+:\(topic_register\|coverage\|format\|identifier\|keywords\|relation\|subject\|type\|dewey\|loc\|oclc\|pg\|isbn\):\s"
-  syn match   sisu_sub_header_dates                                       "^\s\+:\(added_to_site\|available\|created\|issued\|modified\|published\|valid\|translated\|original_publication\):\s"
+  syn match   sisu_sub_header_date                                       "^\s\+:\(added_to_site\|available\|created\|issued\|modified\|published\|valid\|translated\|original_publication\):\s"
   syn match   sisu_sub_header_original                                    "^\s\+:\(publisher\|date\|language\|lang_char\|institution\|nationality\|source\):\s"
   syn match   sisu_sub_header_make                                        "^\s\+:\(headings\|num_top\|breaks\|language\|italics\|bold\|emphasis\|plaintext_wrap\|texpdf_font\|skin\|stamp\|promo\|ad\|manpage\):\s"
   syn match   sisu_sub_header_notes                                       "^\s\+:\(abstract\comment\|description\|history\|prefix\|prefix_[ab]\|suffix\):\s"
@@ -61,15 +61,14 @@ syn region sisu_link contains=sisu_error,sisu_error_wspace matchgroup=sisu_actio
 "header
 syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_title matchgroup=sisu_header start="^[@]title:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
 syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_creator matchgroup=sisu_header start="^[@]creator:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
+syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_date matchgroup=sisu_header start="^[@]date:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
+syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_publisher matchgroup=sisu_header start="^[@]publisher:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
 syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_rights matchgroup=sisu_header start="^[@]rights:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
 syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_classify matchgroup=sisu_header start="^[@]classify:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_dates matchgroup=sisu_header start="^[@]date:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_make matchgroup=sisu_header start="^[@]make:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_publisher matchgroup=sisu_header start="^[@]publisher:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_notes matchgroup=sisu_header start="^[@]notes:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
 syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_original matchgroup=sisu_header start="^[@]original:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_source matchgroup=sisu_header start="^[@]source:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
+syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_notes matchgroup=sisu_header start="^[@]notes:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
 syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_linked,sisu_sub_header_links matchgroup=sisu_header start="^[@]links:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
+syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_make matchgroup=sisu_header start="^[@]make:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
 "headings
 syn region sisu_heading contains=sisu_mark_endnote,sisu_content_endnote,sisu_marktail,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_ocn,sisu_error,sisu_error_wspace matchgroup=sisu_structure start="^\([1-8]\|:\?[A-C]\)\~\(\S\+\|[^-]\)" end="$"
 "block/group text
@@ -156,15 +155,14 @@ hi def link sisu_header                PreProc
 hi def link sisu_header_content        Normal
 hi def link sisu_sub_header_title      Statement
 hi def link sisu_sub_header_creator    Statement
+hi def link sisu_sub_header_date       Statement
+hi def link sisu_sub_header_publisher  Statement
 hi def link sisu_sub_header_rights     Statement
 hi def link sisu_sub_header_classify   Statement
-hi def link sisu_sub_header_dates      Statement
-hi def link sisu_sub_header_make       Statement
+hi def link sisu_sub_header_original   Statement
 hi def link sisu_sub_header_links      Statement
-hi def link sisu_sub_header_publisher  Statement
 hi def link sisu_sub_header_notes      Statement
-hi def link sisu_sub_header_original   Statement
-hi def link sisu_sub_header_source     Statement
+hi def link sisu_sub_header_make       Statement
 hi def link sisu_heading               Title
 hi def link sisu_structure             Operator
 hi def link sisu_contain               Include
diff --git a/data/sisu/v2/v/version.yml b/data/sisu/v2/v/version.yml
index a3fdf0dc..db91e9eb 100644
--- a/data/sisu/v2/v/version.yml
+++ b/data/sisu/v2/v/version.yml
@@ -1,5 +1,5 @@
 ---
 :version: 2.8.2
-:date_stamp: 2011w10/4
-:date: "2011-03-10"
+:date_stamp: 2011w10/5
+:date: "2011-03-11"
 :project: SiSU
diff --git a/data/sisu/v3/conf/editor-syntax-etc/emacs/sisu-mode.el b/data/sisu/v3/conf/editor-syntax-etc/emacs/sisu-mode.el
index ba2633d3..e8a668da 100644
--- a/data/sisu/v3/conf/editor-syntax-etc/emacs/sisu-mode.el
+++ b/data/sisu/v3/conf/editor-syntax-etc/emacs/sisu-mode.el
@@ -1,7 +1,7 @@
 ;;; sisu-mode.el --- a major-mode for highlighting a hierarchy structured text.
 ;; @Author: Ambrose Kofi Laing (& Ralph Amissah)
 ;; @Keywords: text, processes, tools
-;; @Version: 0.70.1 2008-12-14
+;; @Version: 3.0.3 2011-03-11 (2008-12-14)
 ;; @License: GPLv3
 ;; @Home URL: SiSU:   http://www.jus.uio.no/sisu
 ;; originally looked at (based on) doc-mode, with kind permission of the author
@@ -128,118 +128,127 @@
     (list
 
      ;;grouped text
-     (cons "^group\{\\|^\}group"	'general-font-lock-red2)
-     (cons "^code\{\\|^\}code"          'general-font-lock-red2)
-     (cons "^poem\{\\|^\}poem"		'general-font-lock-red2)
-     (cons "^alt\{\\|^\}alt"		'general-font-lock-red2)
-     (cons "^table\{.+\\|^\}table"	'general-font-lock-red2)
-     (cons "^\{table[^}]+\}"		'general-font-lock-red2)
+     (cons "^group\{\\|^\}group"       'general-font-lock-red2)
+     (cons "^block\{\\|^\}block"       'general-font-lock-red2)
+     (cons "^code\{\\|^\}code"         'general-font-lock-red2)
+     (cons "^poem\{\\|^\}poem"         'general-font-lock-red2)
+     (cons "^alt\{\\|^\}alt"           'general-font-lock-red2)
+     (cons "^table\{.+\\|^\}table"     'general-font-lock-red2)
+     (cons "^\{table[^}]+\}"           'general-font-lock-red2)
 
      ;; footnote/endnote
-       ;(cons "\~\{.+?\}\~"	'general-font-lock-green1)
-     (cons "\~\{\\*\\*\\|\~\{\\*\\|\~\{\\|\}\~"	'general-font-lock-red2)
-     (cons "\~\\[\\+\\|\~\\[\\*\\|\~\\[\\|\\]\~"	'general-font-lock-red2)
+       ;(cons "\~\{.+?\}\~"  'general-font-lock-green1)
+     (cons "\~\{\\*\\*\\|\~\{\\*\\|\~\{\\|\}\~"   'general-font-lock-red2)
+     (cons "\~\\[\\+\\|\~\\[\\*\\|\~\\[\\|\\]\~"  'general-font-lock-red2)
 
      (cons "\~\\^ \\|^\\^\~ " 'general-font-lock-red2)
 
      (list (concat
       "\\(\*\~\\)"
-	    "\\([^ \r\t\n]+\\)")
-	   '(1 general-font-lock-red1 t)
-	   '(2 general-font-lock-blue2 t))
+      "\\([^ \r\t\n]+\\)")
+     '(1 general-font-lock-red1 t)
+     '(2 general-font-lock-blue2 t))
 
-     ;; bold
+     ;; emphasis (can be program configured to be bold italics or underscore)
      (list (concat
-	    "\\([*]\{\\)"
-	    "\\([^\}]+\\)"
-	    "\\(\}[*]\\)")
-	   '(1 general-font-lock-red1 t)
-	   '(2 general-font-lock-red1 t)
+      "\\([*]\{\\)"
+      "\\([^\}]+\\)"
+      "\\(\}[*]\\)")
+     '(1 general-font-lock-red1 t)
+     '(2 general-font-lock-red1 t)
      '(3 general-font-lock-red1 t))
 
+     ;; bold
      (list (concat
-	    "\\([!]\{\\)"
-	    "\\([^\}]+\\)"
-	    "\\(\}[!]\\)")
-	   '(1 general-font-lock-red1 t)
-	   '(2 general-font-lock-red1 t)
+      "\\([!]\{\\)"
+      "\\([^\}]+\\)"
+      "\\(\}[!]\\)")
+     '(1 general-font-lock-red1 t)
+     '(2 general-font-lock-red1 t)
      '(3 general-font-lock-red1 t))
-     (cons "\\*[^ ]+\\*"	'general-font-lock-red1)
-     (cons "^!_ .+"		'general-font-lock-red1)
-
+     (cons "\\*[^ ]+\\*"               'general-font-lock-red1)
+     (cons "^!_ .+"                    'general-font-lock-red1)
 
      ;;; italics
      (list (concat
-	    "\\([/]\{\\)"
-	    "\\([^\}]+\\)"
-	    "\\(\}[/]\\)")
-	   '(1 general-font-lock-red1 t)
-	   '(2 general-font-lock-blue1 t)
+      "\\([/]\{\\)"
+      "\\([^\}]+\\)"
+      "\\(\}[/]\\)")
+     '(1 general-font-lock-red1 t)
+     '(2 general-font-lock-blue1 t)
            '(3 general-font-lock-red1 t))
 
-
      ;; underscore
      (list (concat
-	    "\\([_]\{\\)"
-	    "\\([^\}]+\\)"
-	    "\\(\}[_]\\)")
-	   '(1 general-font-lock-red1 t)
-	   '(2 general-font-lock-red1 t)
+      "\\([_]\{\\)"
+      "\\([^\}]+\\)"
+      "\\(\}[_]\\)")
+     '(1 general-font-lock-red1 t)
+     '(2 general-font-lock-red1 t)
+           '(3 general-font-lock-red1 t))
+
+     ;; monospace
+     (list (concat
+      "\\([#]\{\\)"
+      "\\([^\}]+\\)"
+      "\\(\}[#]\\)")
+     '(1 general-font-lock-red1 t)
+     '(2 general-font-lock-red1 t)
            '(3 general-font-lock-red1 t))
 
      ;; citation
      (list (concat
-	    "\\([\"]\{\\)"
-	    "\\([^\}]+\\)"
-	    "\\(\}[\"]\\)")
-	   '(1 general-font-lock-red1 t)
-	   '(2 general-font-lock-red1 t)
+      "\\([\"]\{\\)"
+      "\\([^\}]+\\)"
+      "\\(\}[\"]\\)")
+     '(1 general-font-lock-red1 t)
+     '(2 general-font-lock-red1 t)
            '(3 general-font-lock-red1 t))
 
      ;; inserted text
      (list (concat
-	    "\\([\+]\{\\)"
-	    "\\([^\}]+\\)"
-	    "\\(\}[\+]\\)")
-	   '(1 general-font-lock-red1 t)
-	   '(2 general-font-lock-red1 t)
+      "\\([\+]\{\\)"
+      "\\([^\}]+\\)"
+      "\\(\}[\+]\\)")
+     '(1 general-font-lock-red1 t)
+     '(2 general-font-lock-red1 t)
            '(3 general-font-lock-red1 t))
 
      ;; strike through
      (list (concat
-	    "\\(\\-\{\\)"
-	    "\\([^\}]+\\)"
-	    "\\(\}\\-\\)")
-	   '(1 general-font-lock-red1 t)
-	   '(2 general-font-lock-red1 t)
+      "\\(\\-\{\\)"
+      "\\([^\}]+\\)"
+      "\\(\}\\-\\)")
+     '(1 general-font-lock-red1 t)
+     '(2 general-font-lock-red1 t)
            '(3 general-font-lock-red1 t))
 
      ;; superscript
      (list (concat
-	    "\\(\\^\{\\)"
-	    "\\([^\}]+\\)"
-	    "\\(\}\\^\\)")
-	   '(1 general-font-lock-red1 t)
-	   '(2 general-font-lock-red1 t)
+      "\\(\\^\{\\)"
+      "\\([^\}]+\\)"
+      "\\(\}\\^\\)")
+     '(1 general-font-lock-red1 t)
+     '(2 general-font-lock-red1 t)
            '(3 general-font-lock-red1 t))
 
      ;; subscript
      (list (concat
-	    "\\([,]\{\\)"
-	    "\\([^\}]+\\)"
-	    "\\(\}[,]\\)")
-	   '(1 general-font-lock-red1 t)
-	   '(2 general-font-lock-red1 t)
+      "\\([,]\{\\)"
+      "\\([^\}]+\\)"
+      "\\(\}[,]\\)")
+     '(1 general-font-lock-red1 t)
+     '(2 general-font-lock-red1 t)
            '(3 general-font-lock-red1 t))
 
      ;;numbered list
-     (cons "^# \\|^_# "	'general-font-lock-red1)
+     (cons "^# \\|^_# "                'general-font-lock-red1)
 
      ;;bullet text
-     (cons "^_\\*[1-9] \\|^_\\* "		'general-font-lock-red1)
+     (cons "^_\\*[1-9] \\|^_\\* "      'general-font-lock-red1)
 
      ;;indented text
-     (cons "^_[1-9] "		'general-font-lock-red1)
+     (cons "^_[1-9] "                  'general-font-lock-red1)
 
      ;;url
      (cons "\\(^\\|[ ]\\)http:[/][/][^ \t\n\r<]+" 'general-font-lock-blue2)
@@ -247,118 +256,67 @@
 ;; \\|\$
 
      ;; Comment Lines
-     (cons "^% .*"		'general-font-lock-blue1)
+     (cons "^% .*"                     'general-font-lock-blue1)
      ;; line break
-     (cons "
    "	'general-font-lock-red1)
+     (cons "
    "                      'general-font-lock-red1)
 
      ;; Section titles
      (list "^\\(\\([1-8]\\|:?[A-C]\\)\\~\\)\\(.*\\)"
-	   '(1 sisu-title-1 t)
-	   '(3 sisu-title-2 t))
+     '(1 sisu-title-1 t)
+     '(3 sisu-title-2 t))
 
      ;; hyper-links
      (list (concat
-	    "\\(\{~^\\|\{\\)"
-	    "\\([^\}\{]+\\)"
-	    "\\(\}http:[/][/][^ \r\n\t<]+\\)")
-	   '(1 general-font-lock-blue2 t)
-	   '(2 general-font-lock-red1 t)
+      "\\(\{~^\\|\{\\)"
+      "\\([^\}\{]+\\)"
+      "\\(\}http:[/][/][^ \r\n\t<]+\\)")
+     '(1 general-font-lock-blue2 t)
+     '(2 general-font-lock-red1 t)
      '(3 general-font-lock-blue2 t))
 
      ;; book index
-     (cons "^\=\{.+\}"	'general-font-lock-green1)
+     (cons "^\=\{.+\}"                 'general-font-lock-green1)
 
      ;; numbers
-     (cons "\\<[.0-9]+\\>"	'general-font-lock-green2)
+     (cons "\\<[.0-9]+\\>"             'general-font-lock-green2)
 
      ;; bullets sisu_normal (nearly copied regexp)
      (cons "^_\\([1-9*]\\|[1-9]\\*\\) " 'general-font-lock-blue2)
 
      ;; image links
      (list (concat
-	    "\\(\{\\)"
-	    "\\([^\}\{]+\\)"
-	    "\\(\}image\\)")
-	   '(1 general-font-lock-blue2 t)
-	   '(2 general-font-lock-red1 t)
+      "\\(\{\\)"
+      "\\([^\}\{]+\\)"
+      "\\(\}image\\)")
+     '(1 general-font-lock-blue2 t)
+     '(2 general-font-lock-red1 t)
            '(3 general-font-lock-blue2 t))
 
      ;; insert file links
      (list (concat
-	    "\\(<< \\)"
-	    "\\([^ \r\t\n]+\\.ss\\)"
-	    "\\(i\\|t\\)")
-	   '(1 general-font-lock-blue2 t)
-	   '(2 general-font-lock-blue2 t)
+      "\\(<< \\)"
+      "\\([^ \r\t\n]+\\.ss\\)"
+      "\\(i\\|t\\)")
+     '(1 general-font-lock-blue2 t)
+     '(2 general-font-lock-blue2 t)
            '(3 general-font-lock-blue2 t))
 
      ;; raw keywords
      (list (concat
-	    "^\\(\\@\\("
-	    "title\\|"
-	    "subtitle\\|"
-	    "author.title\\|"
-	    "author.nationality\\|"
-	    "author\\|creator\\|"
-	    "translator\\|translated_by\\|"
-	    "illustrator\\|illustrated_by\\|"
-	    "prepared_by\\|"
-	    "digitized_by\\|"
-	    "contributor\\|"
-	    "publisher\\|"
-	    "topic_register\\|"
-	    "subject\\|"
-	    "description\\|"
-	    "comment\\|"
-	    "type\\|"
-	    "format\\|"
-	    "source\\|"
-	    "language\.original\\|"
-	    "language\.document\\|"
-	    "language\\|"
-	    "rights\\|"
-	    "relation\\|"
-	    "coverage\\|"
-	    "keywords\\|"
-	    "comments\\|"
-	    "papersize\\|"
-	    "tags\\|"
-	    "catalogue\\|"
-	    "date.created\\|"
-	    "date.issued\\|"
-	    "date.available\\|"
-	    "date.modified\\|"
-	    "date.valid\\|"
-	    "date.added_to_site\\|"
-	    "date\\|"
-	    "original_publication.date\\|"
-	    "original_publication.nationality\\|"
-	    "original_publication.institution\\|"
-	    "original_publication\\|"
-	    "writing_focus.nationality\\|"
-	    "classify_loc\\|"
-	    "classify_dewey\\|"
-	    "classify_isbn\\|"
-	    "classify_pg\\|"
-	    "prefix\\|"
-	    "suffix\\|"
-	    "contact\\|"
-	    "links\\|"
-	    "structure\\|"
-	    "toc\\|"
-	    "level\\|"
-	    "page\\|"
-	    "markup\\|"
-	    "css\\|stylesheet\\|"
-	    "skin\\|"
-	    "abstract\\|"
-	    "bold\\|"
-	    "italics\\|"
-	    "doc_cont_idx\\|"
-	    "doc_content_index\\|"
-	    "\\):\\)\\(.*\\)")
-	   '(1 sisu-title-2 keep)
-	   '(3 sisu-title-3 keep))
+      "^\\(\\@\\("
+      "title\\|"
+      "creator\\|"
+      "date\\|"
+      "publisher\\|"
+      "rights\\|"
+      "classify\\|"
+      "original\\|"
+      "notes\\|"
+      "links\\|"
+      "make\\|"
+      "\\):\\)\\(.*\\)")
+     '(1 sisu-title-2 keep)
+     '(3 sisu-title-3 keep))
 
      ))
  "Default expressions to highlight in AsciiSisu mode.")
@@ -386,11 +344,11 @@
 
   (make-local-variable 'font-lock-defaults)
   (setq font-lock-defaults
-	'(sisu-font-lock-keywords
-	  nil				; KEYWORDS-ONLY: no
-	  nil				; CASE-FOLD: no
-	  ((?_ . "w"))			; SYNTAX-ALIST
-	  ))
+  '(sisu-font-lock-keywords
+    nil        ; KEYWORDS-ONLY: no
+    nil        ; CASE-FOLD: no
+    ((?_ . "w"))      ; SYNTAX-ALIST
+    ))
   (run-hooks 'sisu-mode-hook))
 
 (provide 'sisu-mode)
diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/syntax/sisu.vim b/data/sisu/v3/conf/editor-syntax-etc/vim/syntax/sisu.vim
index 2b67ee1b..aa24113d 100644
--- a/data/sisu/v3/conf/editor-syntax-etc/vim/syntax/sisu.vim
+++ b/data/sisu/v3/conf/editor-syntax-etc/vim/syntax/sisu.vim
@@ -1,6 +1,6 @@
 "SiSU Vim syntax file
 "SiSU Maintainer: Ralph Amissah 
-"SiSU Markup:     SiSU (sisu-3.0.0, 2011-01-21)
+"SiSU Markup:     SiSU (sisu-3.0.3, 2011-03-11)
 "(originally looked at Ruby Vim by Mirko Nasato)
 
 if version < 600
@@ -18,11 +18,11 @@ if !exists("sisu_no_identifiers")
   syn match   sisu_mark_endnote                                           "\~^"
   syn match   sisu_break               contains=@NoSpell                  "
    \|
    "
   syn match   sisu_control             contains=@NoSpell                  "^<:p[bn]>\s*$"
-  syn match   sisu_control             contains=@NoSpell                  "^<\(br\)\?:\(pg\|pgn\|pn\)>\s*$"
-  syn match   sisu_control             contains=@NoSpell                  "^\[\(br\)\?:\(pg\|pgn\|pn\)\]\s*$"
+ "syn match   sisu_control             contains=@NoSpell                  "^<\(br\)\?:\(pg\|pgn\|pn\)>\s*$"
+ "syn match   sisu_control             contains=@NoSpell                  "^\[\(br\)\?:\(pg\|pgn\|pn\)\]\s*$"
   syn match   sisu_control             contains=@NoSpell                  "^<:\(bo\|---\)>\s*$"
-  syn match   sisu_control             contains=@NoSpell                  "^<\(br\)\?:\(pr\|o\)>\s*$"
-  syn match   sisu_control             contains=@NoSpell                  "^\[\(br\)\?:\(pr\|o\)\]\s*$"
+ "syn match   sisu_control             contains=@NoSpell                  "^<\(br\)\?:\(pr\|o\)>\s*$"
+ "syn match   sisu_control             contains=@NoSpell                  "^\[\(br\)\?:\(pr\|o\)\]\s*$"
   syn match   sisu_marktail                                               "[~-]#"
   syn match   sisu_control                                                "\""
   syn match   sisu_underline                                              "\(^\| \)_[a-zA-Z0-9]\+_\([ .,]\|$\)"
@@ -37,7 +37,7 @@ if !exists("sisu_no_identifiers")
   syn match   sisu_sub_header_creator                                     "^\s\+:\(author\|contributor\|illustrator\|photographer\|translator\|digitized_by\|prepared_by\|audio\|video\):\s"                               " &hon &institution
   syn match   sisu_sub_header_rights                                      "^\s\+:\(copyright\|text\|translation\|illustrations\|photographs\|preparation\|digitization\|audio\|video\|license\|all\):\s"                   " access_rights license
   syn match   sisu_sub_header_classify                                    "^\s\+:\(topic_register\|coverage\|format\|identifier\|keywords\|relation\|subject\|type\|dewey\|loc\|oclc\|pg\|isbn\):\s"
-  syn match   sisu_sub_header_dates                                       "^\s\+:\(added_to_site\|available\|created\|issued\|modified\|published\|valid\|translated\|original_publication\):\s"
+  syn match   sisu_sub_header_date                                       "^\s\+:\(added_to_site\|available\|created\|issued\|modified\|published\|valid\|translated\|original_publication\):\s"
   syn match   sisu_sub_header_original                                    "^\s\+:\(publisher\|date\|language\|lang_char\|institution\|nationality\|source\):\s"
   syn match   sisu_sub_header_make                                        "^\s\+:\(headings\|num_top\|breaks\|language\|italics\|bold\|emphasis\|plaintext_wrap\|texpdf_font\|skin\|stamp\|promo\|ad\|manpage\):\s"
   syn match   sisu_sub_header_notes                                       "^\s\+:\(abstract\comment\|description\|history\|prefix\|prefix_[ab]\|suffix\):\s"
@@ -65,15 +65,14 @@ syn region sisu_link contains=sisu_error,sisu_error_wspace matchgroup=sisu_actio
 "header
 syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_title matchgroup=sisu_header start="^[@]title:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
 syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_creator matchgroup=sisu_header start="^[@]creator:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
+syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_date matchgroup=sisu_header start="^[@]date:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
+syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_publisher matchgroup=sisu_header start="^[@]publisher:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
 syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_rights matchgroup=sisu_header start="^[@]rights:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
 syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_classify matchgroup=sisu_header start="^[@]classify:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_dates matchgroup=sisu_header start="^[@]date:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_make matchgroup=sisu_header start="^[@]make:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_publisher matchgroup=sisu_header start="^[@]publisher:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_notes matchgroup=sisu_header start="^[@]notes:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
 syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_original matchgroup=sisu_header start="^[@]original:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_source matchgroup=sisu_header start="^[@]source:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
+syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_notes matchgroup=sisu_header start="^[@]notes:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
 syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_linked,sisu_sub_header_links matchgroup=sisu_header start="^[@]links:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
+syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_make matchgroup=sisu_header start="^[@]make:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
 "headings
 syn region sisu_heading contains=sisu_mark_endnote,sisu_content_endnote,sisu_marktail,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_ocn,sisu_error,sisu_error_wspace matchgroup=sisu_structure start="^\([1-8]\|:\?[A-C]\)\~\(\S\+\|[^-]\)" end="$"
 "block/group text
@@ -160,15 +159,14 @@ hi def link sisu_header                PreProc
 hi def link sisu_header_content        Normal
 hi def link sisu_sub_header_title      Statement
 hi def link sisu_sub_header_creator    Statement
+hi def link sisu_sub_header_date       Statement
+hi def link sisu_sub_header_publisher  Statement
 hi def link sisu_sub_header_rights     Statement
 hi def link sisu_sub_header_classify   Statement
-hi def link sisu_sub_header_dates      Statement
-hi def link sisu_sub_header_make       Statement
+hi def link sisu_sub_header_original   Statement
 hi def link sisu_sub_header_links      Statement
-hi def link sisu_sub_header_publisher  Statement
 hi def link sisu_sub_header_notes      Statement
-hi def link sisu_sub_header_original   Statement
-hi def link sisu_sub_header_source     Statement
+hi def link sisu_sub_header_make       Statement
 hi def link sisu_heading               Title
 hi def link sisu_structure             Operator
 hi def link sisu_contain               Include
-- 
cgit v1.2.3


From bfa2a017e12232450a062aa9500f4a2ab2e72a9d Mon Sep 17 00:00:00 2001
From: Ralph Amissah 
Date: Fri, 11 Mar 2011 08:20:26 -0500
Subject: v2, v3: changelog git.sisudoc.org tag-points [3.0.3-1]

---
 data/doc/sisu/CHANGELOG_v2 | 20 +++++---------------
 data/doc/sisu/CHANGELOG_v3 |  1 +
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2
index 0997a951..21ce50c5 100644
--- a/data/doc/sisu/CHANGELOG_v2
+++ b/data/doc/sisu/CHANGELOG_v2
@@ -12,11 +12,8 @@ Reverse Chronological:
 
 %% STABLE Branch
 
-%% 2.8.2.orig.tar.gz (2011-03-11:10/5)
-http://www.jus.uio.no/sisu/pkg/src/sisu_2.8.2.orig.tar.gz
-  sisu_2.8.2.orig.tar.gz
-  sisu_2.8.2-1.dsc
-  sisu_2.8.2-1.diff.gz
+%% 2.8.2.orig.tar.gz (2011-03-11:10/5) [see 3.0.3]
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.3-1
 
   * dal_syntax and affected downstream output modules, revised pattern match
     for mail, (removes occasional interference with urls having embedded email
@@ -52,11 +49,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.8.2.orig.tar.gz
     * emacs sisu headers updated (subheaders omitted for now) sisu-mode.el
     * vim cleaning sisu.vim
 
-%% 2.8.1.orig.tar.gz (2011-03-05:09/6)
-http://www.jus.uio.no/sisu/pkg/src/sisu_2.8.1.orig.tar.gz
-  sisu_2.8.1.orig.tar.gz
-  sisu_2.8.1-1.dsc
-  sisu_2.8.1-1.diff.gz
+%% 2.8.1.orig.tar.gz (2011-03-05:09/6) [see 3.0.2]
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.2-1
 
   * make sisu: v2 require >=ruby1.8.7; v3 require >=ruby1.9.2
 
@@ -71,12 +65,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.8.1.orig.tar.gz
     * tidy
     * small fixes
 
-%% 2.8.0.orig.tar.gz (2011-02-01:05/2)
+%% 2.8.0.orig.tar.gz (2011-02-01:05/2) [see 3.0.0]
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.0-1
-http://www.jus.uio.no/sisu/pkg/src/sisu_2.8.0.orig.tar.gz
-  sisu_2.8.0.orig.tar.gz
-  sisu_2.8.0-1.dsc
-  sisu_2.8.0-1.diff.gz
 
   [post Debian Squeeze]
 
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index dc148689..9a134932 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -14,6 +14,7 @@ Reverse Chronological:
 v3 branch once stable will supersede & replace current stable v2 branch
 
 %% 3.0.3.orig.tar.gz (2011-03-11:10/5)
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.3-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.3.orig.tar.gz
   sisu_3.0.3.orig.tar.gz
   sisu_3.0.3-1.dsc
-- 
cgit v1.2.3