Merge branch 'upstream' into debian/sid

8 files changed, 54 insertions, 147 deletions

diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/Rantfile b/data/doc/sisu/sisu_markup_samples/sisu_manual/Rantfile
index 30eb65d7..2ca8ea19 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/Rantfile
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/Rantfile
@@ -149,11 +149,11 @@ def files_all
   files
 end
 def filelist_docs
-  files='sisu_manual.ssm sisu_introduction.sst sisu_help.sst sisu_help_sources.sst sisu_commands.sst sisu_markup.sst sisu_filetypes.sst sisu_config.ssi sisu_skin.sst sisu_css.ssi sisu_content_directories.ssi sisu_homepages.ssi sisu_examples.sst sisu_output_overview.sst sisu_search.sst sisu_webrick.sst sisu_quickstart.sst sisu_faq.sst sisu_syntax_highlighting.sst sisu_configuration.ssm sisu_description.sst sisu_remote.sst sisu_complete.sst sisu_postgresql.sst sisu_sqlite.sst sisu_pdf.sst sisu_search.ssm sisu_vim.sst sisu_doc.sst' # sisu_output_types.ssm sisu_sql.sst sisu_hyperestraier.sst sisu_latex.sst sisu_odf.sst sisu_xml.sst sisu_concordance.sst sisu_document_digest_certificate.sst document_digest_certificate.sst sisu_markup_source.sst sisupod.sst
+  files='sisu_manual.ssm sisu_introduction.sst sisu_help.sst sisu_help_sources.sst sisu_commands.sst sisu_markup.sst sisu_filetypes.sst sisu_config.ssi sisu_skin.sst sisu_css.ssi sisu_content_directories.ssi sisu_homepages.ssi sisu_examples.sst sisu_output_overview.sst sisu_webrick.sst sisu_quickstart.sst sisu_faq.sst sisu_syntax_highlighting.sst sisu_configuration.ssm sisu_description.sst sisu_remote.sst sisu_complete.sst sisu_postgresql.sst sisu_sqlite.sst sisu_pdf.sst sisu_search.ssm sisu_vim.sst sisu_doc.sst' # sisu_outpuman/man7/sisu_doc.7t_types.ssm sisu_sql.sst sisu_hyperestraier.sst sisu_latex.sst sisu_odf.sst sisu_xml.sst sisu_concordance.sst sisu_document_digest_certificate.sst document_digest_certificate.sst sisu_markup_source.sst sisupod.sst
   files
 end
 def filelist_manpage
-  files='sisu.ssm sisu_introduction.sst sisu_help.sst sisu_help_sources.sst sisu_commands.sst sisu_markup.sst sisu_filetypes.sst sisu_config.ssi sisu_skin.sst sisu_css.ssi sisu_content_directories.ssi sisu_homepages.ssi sisu_examples.ssi sisu_output_overview.sst sisu_search.ssi sisu_webrick.sst sisu_download.ssi sisu_installation.ssi sisu_quickstart.sst sisu_howto.sst sisu_faq.sst sisu_syntax_highlighting.sst sisu_configuration.ssm sisu_remote.sst sisu_complete.sst sisu_postgresql.sst sisu_sqlite.sst sisu_pdf.sst sisu_search.ssm sisu_vim.sst sisu_doc.sst' # sisu_output_types.ssm sisu_sql.sst sisu_hyperestraier.sst sisu_latex.sst sisu_odf.sst sisu_xml.sst sisu_concordance.sst sisu_document_digest_certificate.sst document_digest_certificate.sst sisu_markup_source.sst sisupod.sst
+  files='sisu.ssm sisu_introduction.sst sisu_help.sst sisu_help_sources.sst sisu_commands.sst sisu_markup.sst sisu_filetypes.sst sisu_config.ssi sisu_skin.sst sisu_css.ssi sisu_content_directories.ssi sisu_homepages.ssi sisu_examples.ssi sisu_output_overview.sst sisu_webrick.sst sisu_download.ssi sisu_installation.ssi sisu_quickstart.sst sisu_howto.sst sisu_faq.sst sisu_syntax_highlighting.sst sisu_configuration.ssm sisu_remote.sst sisu_complete.sst sisu_postgresql.sst sisu_sqlite.sst sisu_pdf.sst sisu_search.ssm sisu_vim.sst sisu_doc.sst' # sisu_output_types.ssm sisu_sql.sst sisu_hyperestraier.sst sisu_latex.sst sisu_odf.sst sisu_xml.sst sisu_concordance.sst sisu_document_digest_certificate.sst document_digest_certificate.sst sisu_markup_source.sst sisupod.sst
   #puts files + "\n\n"
   files
 end
@@ -170,7 +170,7 @@ def man_section(files_array,man_no='1')
 end
 def manpage_move
   files_man1=['sisu.1','sisu_commands.1','sisu_markup.1','sisu_configuration.1','sisu_webrick.1','sisu_help.1','sisu_help_sources.1','sisu_skin.1']
-  files_man7=['sisu_complete.1','sisu_doc.1','sisu_postgresql.1','sisu_sqlite.1','sisu_pdf.1', 'sisu_vim.1'] # 'sisu_output_types.1' 'sisu_sql.1', 'sisu_hyperestraier.1', 'sisu_latex.1', 'sisu_odf.1', 'sisu_xml.1', 'sisu_concordance.1', 'sisu_document_digest_certificate.1', 'sisu_markup_source.1', 'sisupod.1'
+  files_man7=['sisu_complete.1','sisu_doc.1','sisu_postgresql.1','sisu_sqlite.1','sisu_pdf.1','sisu_vim.1'] # 'sisu_output_types.1' 'sisu_sql.1','sisu_hyperestraier.1','sisu_latex.1','sisu_odf.1','sisu_xml.1','sisu_concordance.1','sisu_document_digest_certificate.1','sisu_markup_source.1','sisupod.1'
   files_man8=['sisu_quickstart.1','sisu_howto.1','sisu_faq.1','sisu_syntax_highlighting.1','sisu_remote.1','sisu_search.1']
   man_section(files_man1,'1')
   man_section(files_man7,'7')
@@ -195,16 +195,18 @@ def files_manpage
   files
 end
 def manual
+  system("sisu -CC")
   files_array_docs.each do |x|
-    puts %{sisu -3sS #{x}; sisu -3sS #{x} &}
-    system("sisu -3sS #{x}; sisu -3sS #{x} & ")
+    puts "sisu -3sS #{x}"
+    system("sisu -3sS #{x}")
   end
 end
 def manual_rsync
   file_array=files_array_docs
   puts file_array.join(' ')
+  system("sisu -CC")
   file_array.each do |x|
-    puts %{sisu -3sS #{x}; sisu -R #{x} &}
+    puts "sisu -3sS #{x}; sisu -R #{x} &"
     system("sisu -3sS #{x}; sisu -R #{x} & ")
   end
 end
@@ -215,7 +217,7 @@ end
 def search_update
   file_array=filelist_search.scan(/\S+/)
   file_array.each do |x|
-    puts %{sisu -Dv --update #{x}}
+    puts "sisu -Dv --update #{x}"
     system("sisu -Dv --update #{x}")
   end
 end
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/sisurc.yml b/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/sisurc.yml
index e3fe2a90..06257125 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/sisurc.yml
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/sisurc.yml
@@ -24,7 +24,8 @@
 #% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name)
 webserv:
   url_root:     'http://www.jus.uio.no/sisu' #without dir stub, e.g. this dir would map to http://www.jus.uio.no/sisu
-  path:         '~/grotto/theatre/dbld/sisu-dev/sisu/data/doc/manuals_generated' # /var/www either (i) / [full path from root] or (ii) ~/ [home] or (iii) ./ [pwd] or (iv) will be made from home
+  path:         '~/grotto/theatre/dbld/builds/sisu/sisu/data/doc/manuals_generated' # /var/www either (i) / [full path from root] or (ii) ~/ [home] or (iii) ./ [pwd] or (iv) will be made from home
+  #path:         '~/grotto/theatre/dbld/sisu-dev/sisu/data/doc/manuals_generated' # /var/www either (i) / [full path from root] or (ii) ~/ [home] or (iii) ./ [pwd] or (iv) will be made from home
   #images:       'sisu/image'
   #man:          'man'
   #php:          'php'
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
index acae3741..b248496a 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
@@ -18,9 +18,9 @@
 
 @date.available: 2007-08-28
 
-@date.modified: 2007-09-23
+@date.modified: 2007-09-25
 
-@date: 2007-09-23
+@date: 2007-09-25
 
 @level: new=C; break=1; num_top=1
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_howto.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_howto.sst
index 80ad314d..d4a892c1 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_howto.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_howto.sst
@@ -842,10 +842,10 @@ Standards-Version: 3.7.2
 
 Package: sisu
 Architecture: all
-Depends: ruby (>= 1.8.2), libwebrick-ruby, unzip, zip
+Depends: ruby (>= 1.8.2), ruby (<< 1.9), libwebrick-ruby, unzip, zip
 Conflicts: vim-sisu, sisu-vim, sisu-remote
 Replaces: vim-sisu, sisu-vim
-Recommends: sisu-pdf, sisu-sqlite, sisu-postgresql, hyperestraier, keychain, librmagick-ruby, librexml-ruby, openssl, openssh-client | lsh-client, rsync, tidy, vim-addon-manager
+Recommends: sisu-doc, sisu-pdf, sisu-sqlite, sisu-postgresql, hyperestraier, keychain, librmagick-ruby, librexml-ruby, openssl, openssh-client | lsh-client, rsync, tidy, vim-addon-manager
 Suggests: kdissert, lv, rcs | cvs, pinfo, texinfo, trang
 Description: documents - structuring, publishing in multiple formats and search
  SiSU is a lightweight markup based, command line oriented, document
@@ -889,13 +889,14 @@ code{
 
 Package: sisu-complete
 Architecture: all
-Depends: ruby (>= 1.8.2), sisu, sisu-pdf, sisu-postgresql, sisu-sqlite
+Depends: ruby (>= 1.8.2), ruby (<< 1.9), sisu, sisu-doc, sisu-pdf, sisu-postgresql, sisu-sqlite
 Recommends: hyperestraier
 Description: installs all SiSU related packages
  This package installs SiSU and related packages that enable sisu to produce
  pdf and to populate postgresql and sqlite databases.
  .
- SiSU is a lightweight markup based document publishing framework.
+ SiSU is a lightweight markup based document structuring, publishing and search
+ framework for document collections.
  .
  See sisu for a description of the package.
  .
@@ -905,14 +906,32 @@ Description: installs all SiSU related packages
 
 code{
 
+Package: sisu-doc
+Architecture: all
+Depends: sisu
+Recommends: sisu-pdf, sisu-postgresql, sisu-sqlite
+Description: sisu manual and other documentation for sisu
+ Multiple file formats generated output of sisu documentation generated from
+ sisu markup source documents included in the main package
+ .
+ SiSU is a lightweight markup based document structuring, publishing and search
+ framework for document collections.
+ .
+  Homepage: <http://www.jus.uio.no/sisu>
+
+}code
+
+code{
+
 Package: sisu-pdf
 Architecture: all
 Depends: sisu, texlive-latex-base, texlive-fonts-recommended, texlive-latex-recommended, texlive-latex-extra
-#Suggests: evince, xpdf
+Recommends: sisu-doc
 Description: dependencies to convert SiSU LaTeX output to pdf
  This package enables the conversion of SiSU LaTeX output to pdf.
  .
- SiSU is a lightweight markup based document publishing framework.
+ SiSU is a lightweight markup based document structuring, publishing and search
+ framework for document collections.
  .
   Homepage: <http://www.jus.uio.no/sisu>
 
@@ -923,7 +942,7 @@ code{
 Package: sisu-postgresql
 Architecture: all
 Depends: sisu, libdbd-pg-ruby, libdbi-ruby, libdbm-ruby, postgresql
-Recommends: libfcgi-ruby
+Recommends: sisu-doc, libfcgi-ruby
 Suggests: postgresql-contrib
 Description: SiSU dependencies for use with postgresql database
  This package enables SiSU to populate a postgresql database. This is done at
@@ -935,7 +954,8 @@ Description: SiSU dependencies for use with postgresql database
  identified by object citation number, from which an index of documents
  matched and each matched paragraph within them can be displayed.
  .
- SiSU is a lightweight markup based document publishing framework.
+ SiSU is a lightweight markup based document structuring, publishing and search
+ framework for document collections.
  .
   Homepage: <http://www.jus.uio.no/sisu>
 
@@ -946,7 +966,7 @@ code{
 Package: sisu-sqlite
 Architecture: all
 Depends: sisu, sqlite, libdbd-sqlite-ruby, libdbi-ruby, libdbm-ruby
-Recommends: libfcgi-ruby
+Recommends: sisu-doc, libfcgi-ruby
 Description: SiSU dependencies for use with sqlite database
  This package enables SiSU to populate an sqlite database. This is done at an
  object/paragraph level, making granular searches of documents possible.
@@ -957,7 +977,8 @@ Description: SiSU dependencies for use with sqlite database
  identified by object citation number, from which an index of documents
  matched and each matched paragraph within them can be displayed.
  .
- SiSU is a lightweight markup based document publishing framework.
+ SiSU is a lightweight markup based document structuring, publishing and search
+ framework for document collections.
  .
   Homepage: <http://www.jus.uio.no/sisu>
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_webrick.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_webrick.sst
index bd8a074c..c7d450f2 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_webrick.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_webrick.sst
@@ -82,7 +82,7 @@ or man sisu
 
 2~ Author
 
-Ralph Amissah <ralph@amissah.com> or <ralph.amissah@gmail.com>
+Ralph Amissah ralph@amissah.com or ralph.amissah@gmail.com
 
 2~ SEE ALSO
 
@@ -92,124 +92,3 @@ _1 sisu_vim(7)
 
 _1 sisu(8)
 
-
-
-% .\"  Name: SiSU information Structuring Universe
-% .\"  Author: Ralph Amissah
-% .\"  Description: sisu webrick manpage
-% .\"  arch-tag: sisu manpage
-% .\"  License: GPL 3 or later
-% .\"  Notes: Process this file with
-% .\"    groff -man -Tascii sisu.1
-% .\"    nroff -man sisu.1 | most
-% .\"  |sisu.1|@|^|<url:sisu.1>
-% .TH sisu_webrick 1  "December 17, 2005" "version 0.34" "sisu \-W"
-% .SH NAME
-% .B SiSU
-% \- Structured information, Serialized Units \- a document publishing system
-% .SH SYNOPSIS
-% .B sisu_webrick
-% .I [port]
-% .PP
-% or
-% .PP
-% .B sisu
-% .B \-W
-% .I [port]
-% .\"%% Description
-% .SH DESCRIPTION
-% .B sisu_webrick
-% .I is part of SiSU (man sisu)
-% sisu_webrick starts Ruby\'s Webrick web\-server and points it to the directories to which
-% .I SiSU
-% output is written, providing a list of these directories (assuming
-% .I SiSU
-% is in use and they exist).
-% .PP
-% The default port for sisu_webrick is set to 8081, this may be modified in the yaml file:
-% .I ~/.sisu/sisurc.yaml
-% a sample of which is provided as
-% .I /etc/sisu/sisurc.yaml
-% (or in the equivalent directory on your system).
-% .\"%% Summary
-% .SH Summary of man page
-% .PP
-% sisu_webrick, may be started on it\'s own with the command:
-% .B sisu_webrick
-% .I [port]
-% or using the sisu command with the \-W flag:
-% .B sisu \-W
-% .I [port]
-% .PP
-% where no port is given and settings are unchanged the default port is 8081
-% .\"%% Flags
-% .SH DOCUMENT PROCESSING COMMAND FLAGS
-% .PP
-% .BI sisu \ \-W \ [port]
-% starts Ruby Webrick web\-server, serving
-% .I SiSU
-% output directories, on the port provided, or if no port is provided and the defaults have not been changed in
-% .I ~/.sisu/sisurc.yaml
-% then on port 8081
-% .\"%% Further Information
-% .SH FURTHER INFORMATION
-% .PP
-% For more information on
-% .I SiSU
-% see:
-% .I <http://www.jus.uio.no/sisu>
-% .PP
-% or
-% .I man sisu
-% .SH AUTHOR
-% Ralph Amissah
-% .I <ralph@amissah.com>
-% or
-% .I <ralph.amissah@gmail.com>
-% .SH SEE ALSO
-% .BR sisu(1),
-% .BR sisu_vim(7),
-% .BR sisu(8)
-
-% sisu_webrick(1)                                          sisu -W                                          sisu_webrick(1)
-% 
-% NAME
-%        SiSU - Structured information, Serialized Units - a document publishing system
-% 
-% SYNOPSIS
-%        sisu_webrick [port]
-% 
-%        or
-% 
-%        sisu -W [port]
-% 
-% DESCRIPTION
-%        sisu_webrick  is part of SiSU (man sisu) sisu_webrick starts Ruby´s Webrick web-server and points it to the direc-
-%        tories to which 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.yaml a
-%        sample of which is provided as /etc/sisu/sisurc.yaml (or in the equivalent directory on your system).
-% 
-% 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
-% 
-% 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
-% 
-% FURTHER INFORMATION
-%        For more information on SiSU see: <http://www.jus.uio.no/sisu>
-% 
-%        or man sisu
-% 
-% AUTHOR
-%        Ralph Amissah <ralph@amissah.com> or <ralph.amissah@gmail.com>
-% 
-% SEE ALSO
-%        sisu(1), sisu_vim(7) sisu(8),
-% 
-% version 0.34                                        December 17, 2005                                     sisu_webrick(1)
diff --git a/lib/sisu/v0/html.rb b/lib/sisu/v0/html.rb
index 89c6d463..b23a24b9 100644
--- a/lib/sisu/v0/html.rb
+++ b/lib/sisu/v0/html.rb
@@ -390,6 +390,10 @@ WOK
         end
         toc={}
         format_toc=SiSU_HTML_Format_type::Format_toc.new(@md,title)
+        toc[:seg]=if para =~/^\d~\s+Document Information/
+          format_toc.lev0
+        else format_toc.lev1
+        end
         title=if para =~/(<~0;(?:\w|[0-6]:)\d+;\w\d+><#@dp:#@dp>)$/
           m=/#{$1}/
           para.gsub!(m,'')
@@ -405,10 +409,9 @@ WOK
           %{<b><a href="##{link}">#{linkname}</a></b>}
         end
         format_toc=SiSU_HTML_Format_type::Format_toc.new(@md,title)
-        if para =~/^\d~\s+Document Information/
-          toc[:seg]=toc[:scr]=format_toc.lev0
-        else
-          toc[:seg]=toc[:scr]=format_toc.lev1
+        toc[:scr]=if para =~/^\d~\s+Document Information/
+          format_toc.lev0
+        else format_toc.lev1
         end
         toc
       end
diff --git a/lib/sisu/v0/odf.rb b/lib/sisu/v0/odf.rb
index 15b95a3c..d4d4fd2f 100644
--- a/lib/sisu/v0/odf.rb
+++ b/lib/sisu/v0/odf.rb
@@ -470,6 +470,7 @@ module SiSU_ODF
             para=para.strip
           end
           para.gsub!(/_</m,'&lt;'); para.gsub!(/_>/m,'&gt;') #code-block: angle brackets special characters
+          #para.gsub!(/</,'&lt;'); para.gsub!(/>/,'&gt;')
           para.gsub!(/^(<:i[1-9]>\s+)?_\*\s+/,'\1<draw:frame draw:style-name="gr1" text:anchor-type="as-char" svg:width="0.22cm" svg:height="0.22cm" draw:z-index="2"><draw:image xlink:href="Pictures/bullet_09.png" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/></draw:frame> ') # bullet_09.png
           #para.gsub!(/^(<:i[1-9]>\s+)?_\*\s+/,'\1<text:span text:style-name="T6">●</text:span> ')     #bullet
           #para.gsub!(/^(<:i[1-9]>\s+)?_\*\s+/,'\1● ') # bullet utf8, make smaller if used
diff --git a/lib/sisu/v0/urls.rb b/lib/sisu/v0/urls.rb
index 2a69040a..5d5d8795 100644
--- a/lib/sisu/v0/urls.rb
+++ b/lib/sisu/v0/urls.rb
@@ -228,7 +228,7 @@ module SiSU_urls
         tell=case x
         when /^m/
           SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@env.program.text_editor} ~#{y}/#@fnb.#{y}")
-        when /^[abBcdhHNopswxXy]/
+        when /^[abBcdhNopswxXy]/
           tellx=SiSU_Screen::Ansi.new(@opt.cmd,"-p (LaTeX)","#{@env.program.text_editor} ~work/tex_rz/#@fnb.tex") if y=~/landscape/
           SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#@browser #@webserv_url/#@fnb/#{y}")
         when /^Y/