From 17dfb02b30980c40a5b1227789aff1f070d57948 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sat, 6 Oct 2007 00:45:59 +0100
Subject: param, multi-line parse, fixing @link: header

---
 lib/sisu/v0/param.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/sisu/v0/param.rb b/lib/sisu/v0/param.rb
index e3b42933..8a652fa0 100644
--- a/lib/sisu/v0/param.rb
+++ b/lib/sisu/v0/param.rb
@@ -367,7 +367,7 @@ module SiSU_Param
             when /^(?:0~comments?|@comments?:?)\s+(.+?)$/m;  @comments=$1                           #% metainfo DC
             when /^(?:0~abstract|@abstract)\s+(.+?)$/m;      @abstract=$1                           #% metainfo DC
             when /^(?:0~tags?|@tags?:)\s+\S/m                                                       #% metainfo
-              tags=para.match(/^(?:0~tags?|@tags?:)\s+(.+)$/m)[1]
+              tags=para.match(/^(?:0~tags?|@tags?:)\s+(.+)\Z/m)[1]
               tags.split(/,|$/).each do |tag|
                 tag.strip!
                 @tags << tag
@@ -387,7 +387,7 @@ module SiSU_Param
             when /^(?:0~class(?:ify)?_pg|@class(?:ify)?_pg)\s+(.+?)$/m;                @cls_pg=$1   #% metainfo
             when /^(?:0~(?:class(?:ify)?_)?isbn|@(?:class(?:ify)?_)?isbn)\s+(\S+?)$/m; @cls_isbn=$1 #% metainfo
             when /^(?:0~images?|@images?:)\s+(.+?)$/m;                                 @image=$1    #% processing
-            when /^(?:0~(?:toc|structure)|@(?:toc|structure):)\s+(.+?)$/m                           #% processing
+            when /^(?:0~(?:toc|structure)|@(?:toc|structure):)\s+(.+?)\Z/m                           #% processing
               doc_toc_str=$1
               @toc=doc_toc_str.split(/;\s*/)
               @toc=[ @toc ] if @toc == String
@@ -405,7 +405,7 @@ module SiSU_Param
               lv6=@toc[5] ||='6~ '
               @lv6=/^#{lv6}\b/
             when /^(?:0~(?:level|page|markup)|@(?:level|page|markup):)\s+(.+?)$/m                   #% processing revisit..., use syntax 0~level new=1,2,3; break=4
-              if para =~/(?:0~|@)(?:markup|level|page):?\s+(.+?)$/m
+              if para =~/(?:0~|@)(?:markup|level|page):?\s+(.+?)\Z/m
                 page_break_str=$1
                 pagebreaks=page_break_str.split(/;\s*/)
                 #pagebreaks=[ pagebreaks ] if pagebreaks == String
@@ -459,7 +459,7 @@ module SiSU_Param
                 @vocabulary=$1                                                   #not actually used by concordance
             when /^(?:0~skin|@skin:)\s+(.+?)$/; @doc_skin=$1.strip                                  #% processing
             when /^(?:0~(?:css|stylesheet)|@(?:css|stylesheet):)\s+(.+?)$/; @doc_css=$1.strip       #% processing
-            when /^(?:0~links|@links:)\s+(.+?)$/m                                                   #% processing
+            when /^(?:0~links|@links:)\s+(.+?)\Z/m                                                   #% processing
               doc_links_str=$1
               @lnk=[]
               if doc_links_str=~/\{.+?\}(?:(?:https?|file|ftp):\/|\.\.)\/\S+(?:\s|$)/
-- 
cgit v1.2.3


From 3be4b9a549f97a11dad3eb3af5f8084fd4f491ff Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sat, 6 Oct 2007 00:46:22 +0100
Subject: document header, link to markup and book examples

---
 .../sisu/sisu_markup_samples/sisu_manual/_sisu/skin/yml/promo.yml | 2 +-
 data/doc/sisu/sisu_markup_samples/sisu_manual/sisu.ssm            | 2 +-
 data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_commands.sst   | 2 +-
 data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_complete.sst   | 2 +-
 data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_config.ssi     | 2 +-
 .../sisu/sisu_markup_samples/sisu_manual/sisu_configuration.ssm   | 2 +-
 .../sisu_markup_samples/sisu_manual/sisu_content_directories.ssi  | 2 +-
 data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_css.ssi        | 2 +-
 .../doc/sisu/sisu_markup_samples/sisu_manual/sisu_description.sst | 2 +-
 data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_doc.sst        | 2 +-
 data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi   | 2 +-
 data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_examples.ssi   | 4 ++--
 data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_examples.sst   | 4 ++--
 data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_faq.sst        | 2 +-
 data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_filetypes.sst  | 2 +-
 data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_help.sst       | 2 +-
 .../sisu/sisu_markup_samples/sisu_manual/sisu_help_sources.sst    | 2 +-
 data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_homepages.ssi  | 2 +-
 data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_how.ssi        | 2 +-
 data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_howto.sst      | 8 ++++----
 .../sisu/sisu_markup_samples/sisu_manual/sisu_hyperestraier.ssi   | 2 +-
 .../sisu/sisu_markup_samples/sisu_manual/sisu_installation.ssi    | 2 +-
 .../sisu_markup_samples/sisu_manual/sisu_interesting_to_whom.ssi  | 2 +-
 .../sisu/sisu_markup_samples/sisu_manual/sisu_introduction.ssi    | 2 +-
 .../sisu/sisu_markup_samples/sisu_manual/sisu_introduction.ssm    | 2 +-
 data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_manual.ssm     | 2 +-
 data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_markup.sst     | 6 +++---
 .../sisu/sisu_markup_samples/sisu_manual/sisu_output_overview.sst | 2 +-
 data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_pdf.sst        | 2 +-
 data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_postgresql.sst | 2 +-
 data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_quickstart.sst | 4 ++--
 data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_remote.sst     | 6 +++---
 data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search.ssm     | 2 +-
 data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search_cgi.ssi | 2 +-
 .../sisu/sisu_markup_samples/sisu_manual/sisu_search_examples.ssi | 2 +-
 .../sisu/sisu_markup_samples/sisu_manual/sisu_search_intro.ssi    | 2 +-
 .../sisu_manual/sisu_short_feature_summary.ssi                    | 2 +-
 data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_skin.sst       | 2 +-
 data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_sql.ssi        | 2 +-
 data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_sqlite.sst     | 2 +-
 .../sisu_markup_samples/sisu_manual/sisu_syntax_highlighting.sst  | 2 +-
 data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_vim.sst        | 2 +-
 data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_webrick.sst    | 2 +-
 .../sisu_manual/sisu_work_needed_and_wishlist.ssi                 | 2 +-
 44 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/skin/yml/promo.yml b/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/skin/yml/promo.yml
index 7dfc5ec5..fa9aaa54 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/skin/yml/promo.yml
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/skin/yml/promo.yml
@@ -51,7 +51,7 @@ site:
       url:      SiSU/1.html#summary
     -
       title:    SiSU Book Samples and Markup Examples
-      url:      SiSU/2.html
+      url:      SiSU/examples.html
     -
       title:    Markup
       url:      sisu_markup/
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu.ssm b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu.ssm
index 1a71f299..1363bc20 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu.ssm
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu.ssm
@@ -34,7 +34,7 @@ sisu [-CcFLSVvW]
 @bold: /Gnu|Debian|Ruby|SiSU/
 
 @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
-{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+{ 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/
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_commands.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_commands.sst
index 3d4d86aa..8b339c4d 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_commands.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_commands.sst
@@ -29,7 +29,7 @@
 @bold: /Gnu|Debian|Ruby|SiSU/
 
 @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
-{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+{ 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/
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_complete.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_complete.sst
index 61019cb0..0e601011 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_complete.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_complete.sst
@@ -33,7 +33,7 @@ name=sisu - documents: structuring, publishing in multiple formats, and search;
 synopsis=package for the installation of the whole of sisu with all its dependencies
 
 @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
-{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+{ 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/
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_config.ssi b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_config.ssi
index 3696f362..1512d6a4 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_config.ssi
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_config.ssi
@@ -29,7 +29,7 @@
 @bold: /Gnu|Debian|Ruby|SiSU/
 
 @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
-{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+{ 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/
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_configuration.ssm b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_configuration.ssm
index 586ce4d0..e9f53be1 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_configuration.ssm
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_configuration.ssm
@@ -31,7 +31,7 @@
 @bold: /Gnu|Debian|Ruby|SiSU/
 
 @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
-{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+{ 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/
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_content_directories.ssi b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_content_directories.ssi
index ba869922..217eade6 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_content_directories.ssi
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_content_directories.ssi
@@ -29,7 +29,7 @@
 @bold: /Gnu|Debian|Ruby|SiSU/
 
 @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
-{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+{ 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/
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_css.ssi b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_css.ssi
index 684aaf60..46f01cda 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_css.ssi
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_css.ssi
@@ -29,7 +29,7 @@
 @bold: /Gnu|Debian|Ruby|SiSU/
 
 @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
-{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+{ 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/
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_description.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_description.sst
index 05930df7..34bccfdf 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_description.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_description.sst
@@ -29,7 +29,7 @@
 @bold: /Gnu|Debian|Ruby|SiSU/
 
 @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
-{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+{ 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/
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_doc.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_doc.sst
index d29874b6..20e00d5f 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_doc.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_doc.sst
@@ -29,7 +29,7 @@
 @bold: /Gnu|Debian|Ruby|SiSU/
 
 @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
-{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+{ 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/
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 c10ab30d..beb5d28f 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
@@ -29,7 +29,7 @@
 @bold: /Gnu|Debian|Ruby|SiSU/
 
 @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
-{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+{ 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/
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_examples.ssi b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_examples.ssi
index 107087d7..5a7a2eb3 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_examples.ssi
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_examples.ssi
@@ -29,7 +29,7 @@
 @bold: /Gnu|Debian|Ruby|SiSU/
 
 @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
-{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+{ 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/
@@ -49,7 +49,7 @@
 
 2~ Markup examples *~markup
 
-Current markup examples and document output samples are provided at http://www.jus.uio.no/sisu/SiSU/2.html
+Current markup examples and document output samples are provided at http://www.jus.uio.no/sisu/SiSU/examples.html
 
 Some markup with syntax highlighting may be found under http://www.jus.uio.no/sisu/sample/syntax but is not as up to date.
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_examples.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_examples.sst
index eb1d641d..dd566091 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_examples.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_examples.sst
@@ -29,7 +29,7 @@
 @bold: /Gnu|Debian|Ruby|SiSU/
 
 @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
-{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+{ 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/
@@ -49,7 +49,7 @@
 
 2~ Markup examples *~markup
 
-Current markup examples and document output samples are provided at http://www.jus.uio.no/sisu/SiSU/2.html
+Current markup examples and document output samples are provided at http://www.jus.uio.no/sisu/SiSU/examples.html
 
 Some markup with syntax highlighting may be found under http://www.jus.uio.no/sisu/sample/syntax but is not as up to date.
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_faq.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_faq.sst
index 73ce274d..795367d3 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_faq.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_faq.sst
@@ -29,7 +29,7 @@
 @bold: /Gnu|Debian|Ruby|SiSU/
 
 @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
-{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+{ 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/
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_filetypes.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_filetypes.sst
index 3a3fb37a..3c5a46e2 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_filetypes.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_filetypes.sst
@@ -29,7 +29,7 @@
 @bold: /Gnu|Debian|Ruby|SiSU/
 
 @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
-{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+{ 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/
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_help.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_help.sst
index 2fd78e3c..9eee7886 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_help.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_help.sst
@@ -29,7 +29,7 @@
 @bold: /Gnu|Debian|Ruby|SiSU/
 
 @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
-{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+{ 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/
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_help_sources.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_help_sources.sst
index 860b2173..908bcc40 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_help_sources.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_help_sources.sst
@@ -29,7 +29,7 @@
 @bold: /Gnu|Debian|Ruby|SiSU/
 
 @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
-{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+{ 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/
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_homepages.ssi b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_homepages.ssi
index 1ecb0c3a..3bc6782b 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_homepages.ssi
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_homepages.ssi
@@ -29,7 +29,7 @@
 @bold: /Gnu|Debian|Ruby|SiSU/
 
 @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
-{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+{ 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/
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_how.ssi b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_how.ssi
index 58f6840c..0620b178 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_how.ssi
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_how.ssi
@@ -29,7 +29,7 @@
 @bold: /Gnu|Debian|Ruby|SiSU/
 
 @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
-{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+{ 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/
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 d4a892c1..550b59f6 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
@@ -29,7 +29,7 @@
 @bold: /Gnu|Debian|Ruby|SiSU/
 
 @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
-{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+{ 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/
@@ -1016,7 +1016,7 @@ gvim free_as_in_freedom.rms_and_free_software.sam_williams.sst
 
 additional markup samples in
 
-_1 http://www.jus.uio.no/sisu/SiSU/2.html
+_1 http://www.jus.uio.no/sisu/SiSU/examples.html
 
 For help
 
@@ -1155,7 +1155,7 @@ _1 http://www.jus.uio.no/sisu/SiSU/download.html#sisu-markup-samples
 
 Many more are available online off:
 
-_1 http://www.jus.uio.no/sisu/SiSU/2.html
+_1 http://www.jus.uio.no/sisu/SiSU/examples.html
 
 2~ Additional Things
 
@@ -1249,7 +1249,7 @@ gvim free_as_in_freedom.rms_and_free_software.sam_williams.sst
 
 additional markup samples in
 
-_1 http://www.jus.uio.no/sisu/SiSU/2.html
+_1 http://www.jus.uio.no/sisu/SiSU/examples.html
 
 it should also be possible to run sisu against sisupods (prepared zip files, created by running the command sisu -S [filename]), whether stored locally or remotely.
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_hyperestraier.ssi b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_hyperestraier.ssi
index 277cb360..e84476a8 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_hyperestraier.ssi
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_hyperestraier.ssi
@@ -29,7 +29,7 @@
 @bold: /Gnu|Debian|Ruby|SiSU/
 
 @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
-{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+{ 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/
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_installation.ssi b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_installation.ssi
index 931bb17d..b57cdef6 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_installation.ssi
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_installation.ssi
@@ -29,7 +29,7 @@
 @bold: /Gnu|Debian|Ruby|SiSU/
 
 @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
-{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+{ 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/
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_interesting_to_whom.ssi b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_interesting_to_whom.ssi
index 1ee6551c..93248d29 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_interesting_to_whom.ssi
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_interesting_to_whom.ssi
@@ -29,7 +29,7 @@
 @bold: /Gnu|Debian|Ruby|SiSU/
 
 @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
-{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+{ 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/
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_introduction.ssi b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_introduction.ssi
index a9b148be..000a3fd5 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_introduction.ssi
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_introduction.ssi
@@ -29,7 +29,7 @@
 @bold: /Gnu|Debian|Ruby|SiSU/
 
 @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
-{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+{ 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/
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_introduction.ssm b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_introduction.ssm
index a0c25a78..72ec0e97 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_introduction.ssm
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_introduction.ssm
@@ -29,7 +29,7 @@
 @bold: /Gnu|Debian|Ruby|SiSU/
 
 @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
-{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+{ 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/
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_manual.ssm b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_manual.ssm
index 0aab18c8..ae89748b 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_manual.ssm
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_manual.ssm
@@ -29,7 +29,7 @@
 @bold: /Gnu|Debian|Ruby|SiSU/
 
 @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
-{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+{ 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/
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_markup.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_markup.sst
index 7b2aa7be..9c797dcc 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_markup.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_markup.sst
@@ -29,7 +29,7 @@
 @bold: /Gnu|Debian|Ruby|SiSU/
 
 @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
-{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+{ 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/
@@ -77,7 +77,7 @@ Some interactive help on markup is available, by typing sisu and selecting marku
 
 3~ Online
 
-Online markup examples are available together with the respective outputs produced from http://www.jus.uio.no/sisu/SiSU/2.html or from http://www.jus.uio.no/sisu/sisu_examples/
+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/
 
@@ -142,7 +142,7 @@ code{
 @bold: /Gnu|Debian|Ruby|SiSU/
 
 @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
-{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+{ 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/
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_output_overview.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_output_overview.sst
index 054851a1..4a5cfad9 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_output_overview.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_output_overview.sst
@@ -29,7 +29,7 @@
 @bold: /Gnu|Debian|Ruby|SiSU/
 
 @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
-{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+{ 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/
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_pdf.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_pdf.sst
index b7e4e0a7..384734b7 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_pdf.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_pdf.sst
@@ -33,7 +33,7 @@ name=sisu - package to install what sisu needs to generate pdf (latex to pdf dep
 synopsis=sisu -pv [filename/wildcard ]
 
 @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
-{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+{ 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/
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_postgresql.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_postgresql.sst
index e0f3651b..7a0e4281 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_postgresql.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_postgresql.sst
@@ -34,7 +34,7 @@ synopsis=sisu -Dv [filename/wildcard ]
 sisu -Dv [instruction]
 
 @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
-{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+{ 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/
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_quickstart.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_quickstart.sst
index 0725fb77..35fd55ef 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_quickstart.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_quickstart.sst
@@ -29,7 +29,7 @@
 @bold: /Gnu|Debian|Ruby|SiSU/
 
 @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
-{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+{ 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/
@@ -264,7 +264,7 @@ http://www.jus.uio.no/sisu/SiSU
 
 A number of markup samples (along with output) are available off:
 
-http://www.jus.uio.no/sisu/SiSU/2.html
+http://www.jus.uio.no/sisu/SiSU/examples.html
 
 Additional markup samples are packaged separately in the file:
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_remote.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_remote.sst
index 5ffdf948..793380c9 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_remote.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_remote.sst
@@ -29,7 +29,7 @@
 @bold: /Gnu|Debian|Ruby|SiSU/
 
 @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
-{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+{ 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/
@@ -59,7 +59,7 @@ sisu -3 http://[provide url to valid .sst or .ssm file]
 
 }code
 
-Any of the source documents in the sisu examples page can be used in this way, see http://www.jus.uio.no/sisu/SiSU/2.html and use the url 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 for the desired document.
 
 NOTE: to set up a remote machine to serve SiSU documents in this way, images should be in the directory relative to the document source ../_sisu/image
 
@@ -75,7 +75,7 @@ sisu -3 http://[provide url to valid sisupod.zip or .ssp file]
 
 }code
 
-Any of the source documents in the sisu examples page can be used in this way, see http://www.jus.uio.no/sisu/SiSU/2.html and use the url 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 for the desired document.
 
 :C~ Remote Document Output
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search.ssm b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search.ssm
index 1dccc48f..d1abbca3 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search.ssm
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search.ssm
@@ -29,7 +29,7 @@
 @bold: /Gnu|Debian|Ruby|SiSU/
 
 @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
-{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+{ 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/
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search_cgi.ssi b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search_cgi.ssi
index dbad2520..4b3b9e86 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search_cgi.ssi
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search_cgi.ssi
@@ -29,7 +29,7 @@
 @bold: /Gnu|Debian|Ruby|SiSU/
 
 @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
-{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+{ 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/
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search_examples.ssi b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search_examples.ssi
index 2bfc4b74..f2fbe243 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search_examples.ssi
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search_examples.ssi
@@ -29,7 +29,7 @@
 @bold: /Gnu|Debian|Ruby|SiSU/
 
 @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
-{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+{ 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/
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search_intro.ssi b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search_intro.ssi
index bb9b33b3..d8fef831 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search_intro.ssi
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search_intro.ssi
@@ -29,7 +29,7 @@
 @bold: /Gnu|Debian|Ruby|SiSU/
 
 @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
-{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+{ 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/
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_short_feature_summary.ssi b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_short_feature_summary.ssi
index 3a12db7a..e1c57ec7 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_short_feature_summary.ssi
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_short_feature_summary.ssi
@@ -29,7 +29,7 @@
 @bold: /Gnu|Debian|Ruby|SiSU/
 
 @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
-{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+{ 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/
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_skin.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_skin.sst
index 587400fb..8d19ba76 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_skin.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_skin.sst
@@ -29,7 +29,7 @@
 @bold: /Gnu|Debian|Ruby|SiSU/
 
 @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
-{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+{ 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/
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_sql.ssi b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_sql.ssi
index fb742883..00399816 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_sql.ssi
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_sql.ssi
@@ -29,7 +29,7 @@
 @bold: /Gnu|Debian|Ruby|SiSU/
 
 @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
-{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+{ 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/
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_sqlite.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_sqlite.sst
index ed79957c..1a2b90b0 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_sqlite.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_sqlite.sst
@@ -34,7 +34,7 @@ synopsis=sisu -dv [filename/wildcard ]
 sisu -dv [instruction]
 
 @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
-{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+{ 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/
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_syntax_highlighting.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_syntax_highlighting.sst
index 8afd72da..9d319abb 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_syntax_highlighting.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_syntax_highlighting.sst
@@ -29,7 +29,7 @@
 @bold: /Gnu|Debian|Ruby|SiSU/
 
 @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
-{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+{ 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/
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_vim.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_vim.sst
index e7220b46..a1c324aa 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_vim.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_vim.sst
@@ -29,7 +29,7 @@
 @bold: /Gnu|Debian|Ruby|SiSU/
 
 @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
-{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+{ 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/
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 d74191c5..5c588c68 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
@@ -32,7 +32,7 @@
 name=sisu - documents: structuring, publishing in multiple formats, and search;
 synopsis=sisu -W
 
-@links: { Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+@links: { 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/
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_work_needed_and_wishlist.ssi b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_work_needed_and_wishlist.ssi
index fb5d5574..52578a95 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_work_needed_and_wishlist.ssi
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_work_needed_and_wishlist.ssi
@@ -29,7 +29,7 @@
 @bold: /Gnu|Debian|Ruby|SiSU/
 
 @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
-{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+{ 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/
-- 
cgit v1.2.3


From 2386d74a25bcbeff7e3022001ed7d14dc0538792 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sat, 6 Oct 2007 13:27:01 +0100
Subject: dal, fix shortcult for listing available generated output (without
 source); html, keep ocn id where no visible ocn

---
 CHANGELOG                  | 15 +++++++++++++++
 lib/sisu/v0/dal.rb         |  2 +-
 lib/sisu/v0/html_format.rb | 15 ++++++++++-----
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 7ce273ff..1fb7284b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,21 @@ Reverse Chronological:
 
 %% STABLE MANIFEST
 
+%% sisu_0.60.1.orig.tar.gz (2007-10-07:40/7)
+http://www.jus.uio.no/sisu/pkg/src/sisu_0.60.1.orig.tar.gz
+  sisu_0.60.1.orig.tar.gz
+  sisu_0.60.1-1.dsc
+  sisu_0.60.1-1.diff.gz
+
+  * param, multi-line parse, fixing @link: header
+
+  * dal, fix to shortcut for listing available generated output (without source)
+
+  * html, where no ocn selected, keep ocn id, just remove visible reference to
+    ocn, as search result links will continue to function
+
+  * sisu_manual, link to markup and book examples updated/corrected
+
 %% sisu_0.60.0.orig.tar.gz (2007-10-03:40/3)
 http://www.jus.uio.no/sisu/pkg/src/sisu_0.60.0.orig.tar.gz
   1d8d5b58c96bf403961fd4f5b78a5e7d 1474187 sisu_0.60.0.orig.tar.gz
diff --git a/lib/sisu/v0/dal.rb b/lib/sisu/v0/dal.rb
index 0af589f2..15d1c55c 100644
--- a/lib/sisu/v0/dal.rb
+++ b/lib/sisu/v0/dal.rb
@@ -376,7 +376,7 @@ module SiSU_DAL
           para.gsub!(/^@(\S+?):([+-])\s+/,'0~\1\2 ')
         end
         if para !~/^%+\s/ and
-           para =~/^(?:_\*\s+)?\{(?:~\^\s+)?(.+?)\s\[(?:\d(?:[sS]+))\]\}(?:\.\.\/\S+?\/|\S+?\.(?:sst|ssm)\b)(?:\s+~\{.+?\}~)?(?:\s+\*~\S+)*\s*$/
+           para =~/^(?:_\*\s+)?\{(?:~\^\s+)?(.+?)\s\[(?:\d(?:[sS]*))\]\}(?:\.\.\/\S+?\/|\S+?\.(?:sst|ssm)\b)(?:\s+~\{.+?\}~)?(?:\s+\*~\S+)*\s*$/
           txt,cmd,source,url_dir,note,manifest=nil,nil,nil,nil,nil,nil
           url_and_stub=SiSU_Env::Info_env.new.url
           if defined? url_and_stub.remote
diff --git a/lib/sisu/v0/html_format.rb b/lib/sisu/v0/html_format.rb
index 5a28c271..e1109a6a 100644
--- a/lib/sisu/v0/html_format.rb
+++ b/lib/sisu/v0/html_format.rb
@@ -63,16 +63,21 @@ module SiSU_HTML_Format
       @md=md
       @paranum=paranum[/(\d+)/m,1]
       @paranum ||=''
-      @paranum='' if @md.mod.inspect =~/--no-ocn/
     end
     def ocn_display
-      ocn_class=if @md.mod.inspect =~/--no-ocn/; 'ocn_off'
-      else                                 'ocn'
-      end
-      @paranum.gsub(/^(\d+|)$/,
+      if @md.markup.inspect =~/no_ocn/ or @md.mod.inspect =~/--no-ocn/
+        ocn_class='ocn_off'
+        @paranum.gsub(/^(\d+|)$/,
+        %{  <p class="#{ocn_class}">
+    &nbsp;
+  </p>})
+      else
+        ocn_class='ocn'
+        @paranum.gsub(/^(\d+|)$/,
         %{  <p class="#{ocn_class}">
     &nbsp;&nbsp;\\1
   </p>})
+      end
     end
     def name
       %{<a name="#@paranum" />}
-- 
cgit v1.2.3


From 3804f096e2dd3c82ace274463df6b9b0767fbb60 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sun, 7 Oct 2007 14:09:03 +0100
Subject: cleaning, and make sure in xml &#160; rather than &nbsp; is used

---
 CHANGELOG                       |  2 ++
 lib/sisu/v0/html_segments.rb    | 10 +++-------
 lib/sisu/v0/html_tune.rb        |  7 +++----
 lib/sisu/v0/shared_html_lite.rb | 10 ++++------
 lib/sisu/v0/shared_xml.rb       | 26 +++++++-------------------
 lib/sisu/v0/texpdf_format.rb    |  7 +------
 lib/sisu/v0/xhtml.rb            | 19 -------------------
 lib/sisu/v0/xml.rb              | 21 ---------------------
 8 files changed, 20 insertions(+), 82 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 1fb7284b..732a1076 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -16,6 +16,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.60.1.orig.tar.gz
   * html, where no ocn selected, keep ocn id, just remove visible reference to
     ocn, as search result links will continue to function
 
+  * xml, make sure &#160; is used instead of &nbsp;
+
   * sisu_manual, link to markup and book examples updated/corrected
 
 %% sisu_0.60.0.orig.tar.gz (2007-10-03:40/3)
diff --git a/lib/sisu/v0/html_segments.rb b/lib/sisu/v0/html_segments.rb
index fe2966df..18ed11ec 100644
--- a/lib/sisu/v0/html_segments.rb
+++ b/lib/sisu/v0/html_segments.rb
@@ -178,10 +178,10 @@ module SiSU_HTML_seg
               markup(pg)
             end
           end
-          Seg.new(para,@md).txt
+          #Seg.new(para,@md).txt
           if testforartnum[tracking-1] =~/endnote/
             if printed_endnote_seg == 'n'
-              Seg.new(para,@md).endnote
+              #Seg.new(para,@md).endnote
               printed_endnote_seg='y'
             end
           end
@@ -344,15 +344,11 @@ module SiSU_HTML_seg
         end
       end
     end
-    def txt
-    end
-    def endnote
-    end
     def tail
       format_head_seg=SiSU_HTML_Format_type::Head_seg.new(@md)
       if @md.flag_auto_endnotes
         @@seg[:tail] << format_head_seg.endnote_mark
-        @@seg[:tail] << @@seg_endnotes[@@get_hash_fn] #endnotes deposited at end of individual segments||@|EXTRACTION OF ENDNOTES|
+        @@seg[:tail] << @@seg_endnotes[@@get_hash_fn] #endnotes deposited at end of individual segments ||@|EXTRACTION OF ENDNOTES|
       end
       @@seg[:tail] << '<table summary="whitespace"><tr><td>&nbsp;</td></tr></table>'
       ads=SiSU_HTML_promo::Ad.new(@md)
diff --git a/lib/sisu/v0/html_tune.rb b/lib/sisu/v0/html_tune.rb
index 0b861526..b98f19d8 100644
--- a/lib/sisu/v0/html_tune.rb
+++ b/lib/sisu/v0/html_tune.rb
@@ -278,7 +278,7 @@ module SiSU_Tune
         end
         word
       end
-      @words
+      @words=@words.join(' ')
     end
     def url_markup
       data=@data
@@ -306,9 +306,8 @@ module SiSU_Tune
           end
           if para =~/\{.+?\}((?:https?|file|ftp)\S+|image)/
             @word_mode=para.scan(/\{.+?\}(?:(?:https?|file|ftp)\S+|image)|\S+/)
-            word_mode=urls(@word_mode)
-            words=word_mode.join(' ')
-            para.gsub!(/.+/,words)
+            words=urls(@word_mode)
+            para.gsub!(/.+/m,words)
           end
           if (para !~/^0~|^<:code>/)
             para.gsub!(/\\copyright/i,%{<sup>&copy;</sup>})
diff --git a/lib/sisu/v0/shared_html_lite.rb b/lib/sisu/v0/shared_html_lite.rb
index f258f0a9..85368a28 100644
--- a/lib/sisu/v0/shared_html_lite.rb
+++ b/lib/sisu/v0/shared_html_lite.rb
@@ -93,7 +93,7 @@ module SiSU_Format_Shared
           else m,u=/\{(.+?)\}((?:https?|file|ftp)\S+|image)/.match(word).captures
             d=''
           end
-          case m
+          word=case m
           when /\.png|\.jpg|\.gif|c=|\d+x\d+/
             w,h=/(\d+)x(\d+)/.match(m).captures if m =~/\d+x\d+/
             w=%{width="#{w}"} if w
@@ -117,20 +117,18 @@ module SiSU_Format_Shared
             #ins=%{#{link} <a href="#{u}">[link]</a>#{d}}
             word.gsub!(/\{.+?\}(?:https?|file|ftp)\S+/,ins)
           end
-          word
         else word
         end
         word
       end
-      @words
+      @words=@words.join(' ')
     end
     def markup(para)
       if para !~/^<:code>/
         if para =~/\{.+?\}((?:https?|file|ftp)\S+|image)/
           wm=para.scan(/\{.+?\}(?:(?:https?|file|ftp)\S+|image)|\S+/)
-          word_mode=urls(wm)
-          words=word_mode.join(' ')
-          para.gsub!(/.+/,words)
+          words=urls(wm)
+          para.gsub!(/.+/m,words)
         end
         para.gsub!(/\b[_\\]((?:https?|file|ftp):\/\/\S+?\.[^'"><\s]+?)([;.,]?(?:\s|$))/,'<a href="\1" target="_top">\1</a>\2') #http ftp matches escaped, no decoration
         para.gsub!(/((?:^|\s)[}])((?:https?|file|ftp):\/\/\S+?\.[^'"><\s]+?)([;.,]?(?:\s|$))/,'\1<a href="\2" target="_top">\2</a>\3') #special case \{ e.g. \}http://url
diff --git a/lib/sisu/v0/shared_xml.rb b/lib/sisu/v0/shared_xml.rb
index 135f368e..4b9ccb12 100644
--- a/lib/sisu/v0/shared_xml.rb
+++ b/lib/sisu/v0/shared_xml.rb
@@ -355,22 +355,18 @@ module SiSU_XML_munge
       para.gsub!(/<0;\w\d+;[um]\d+><#@dp:#@dp>/,'')
       if para !~/^<:code>/
         #embeds a red-bullet image -->
-        #para.gsub!(/^(<:i[1-9]>\s*_\*)\s+/,'\1 <image xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:actuate="onLoad" xlink:show="embed" xlink:href="/usr/share/sisu/image/bullet_09.png" width="12" height="12" alt="*" /> ')
-        #para.gsub!(/^_\*\s+/,'<image xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:actuate="onLoad" xlink:show="embed" xlink:href="/usr/share/sisu/image/bullet_09.png" width="12" height="12" alt="*" /> ')
         para.gsub!(/(^|\s)\{\s*(\S+?\.(?:jpg|png|gif))\s+(\d+)x(\d+)(\s+[^}]+)?\}(https?:\/\/\S+)/,%{\\1<image xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:actuate="onLoad" xlink:show="embed" xlink:href="#{@dir.url.images_local}/\\2" width="\\3" height="\\4" />[\\2] \\5})
         para.gsub!(/(^|\s)\{\s*(\S+?\.(?:jpg|png|gif))(\s+[^}]+)?\}(https?:\/\/\S+)/,%{\\1<image xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:actuate="onLoad" xlink:show="embed" xlink:href="#{@dir.url.images_local}/\\2"/>\\2})
         para.gsub!(/(^|\s)\{([^}]+)\}(https?:\/\/[^"><]+?)([,.:;"><]?(?=\s|$))/,
           '\1<link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="\3">\2</link>\4') #watch, compare html_tune
-        #para.gsub!(/\B\{([^}]+)\}(https?:\/\/[^"><]+?)([,.:;"><]?(?:\s|$))/,
-        #  '<link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="\2">\1</link>\3') #watch, compare html_tune
         para.gsub!(/(^|\s)((?:https?|file|ftp):\/\/\S+?\.[^'"><\s]+?)([;.,]?(?=\s|$))/,
           %{\\1#{@url_brace.xml_open}<link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="\\2">\\2</link>#{@url_brace.xml_close}\\3})
-        #para.gsub!(/\b((?:https?|file|ftp):\/\/\S+?\.[^'"><\s]+?)([.,]?(?:\s|$))/, #also works
-          #%{#{@url_brace.xml_open}<link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="\\1">\\1</link>#{@url_brace.xml_close}\\2})
         para.gsub!(/\b[_\\]((?:https?|file|ftp):\/\/\S+?\.[^'"><\s]+?)([;.,]?(?:\s|$))/,'<link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="\1">\1</link>\2') #escaped urls not linked, deal with later
-        #para.gsub!(/(^|\s)[_\\]((?:https?|ftp):\/\/\S+?\.[^'"><\s]+?)([.,]?(?:\s|$))/,'\1<link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="\2">\2</link>\3') #escaped urls not linked, deal with later
-        para.gsub!(/&nbsp;/,' ') #clean
-      else para.gsub!(/_</m,'&lt;'); para.gsub!(/_>/m,'&gt;') #code-block: angle brackets special characters
+        para.gsub!(/&nbsp;/,'&#160;')
+        #para.gsub!(/&nbsp;/,' ') #clean
+      else
+        para.gsub!(/_</m,'&lt;'); para.gsub!(/_>/m,'&gt;') #code-block: angle brackets special characters
+        para.gsub!(/&nbsp;/,'&#160;')
       end
       para
     end
@@ -386,7 +382,8 @@ module SiSU_XML_munge
       para.gsub!(/&([^;]{1,5})/,'&amp;\1') #sort, rough estimate, revisit #WATCH found in node not sax
       para.gsub!(/\{(\S+?\.(?:png|jpg|gif)) .+?\}(?:(?:https?|file|ftp):\/\/\S+|image)/,
         "<image.path>#{@dir.url.images_local}\/\\1</image.path>")
-      para.gsub!(/&nbsp;/,' ')
+      para.gsub!(/&nbsp;/,'&#160;')
+      #para.gsub!(/&nbsp;/,' ') #clean
       wordlist=para.scan(/\S+|\n/) #\n needed for tables, check though added 2005w17
       para=tidywords(wordlist).join(' ').strip
       para
@@ -412,15 +409,6 @@ module SiSU_XML_tags #Format
       if @md.dc_title                                                            # DublinCore 1 - title
         @rdf_title=%{    dc.title="#{seg_name}#{@md.dc_title}"\n}
         @dc_title=%{  <meta name="dc.title" content="#{seg_name}#{@md.dc_title}" />\n}
-        #if @md.subtitle
-        #  @rdf_title=%{    dc.title="#{seg_name}#{@md.title} - #{@md.subtitle}"\n}
-        #  @title=%{<meta name="dc.title" } +
-        #    %{content="#{seg_name}#{@md.title} - #{@md.subtitle}" />\n}
-        #else
-        #  @rdf_title=%{    dc.title="#{seg_name}#{@md.title}"\n}
-        #  @title=%{<meta name="dc.title" } +
-        #    %{content="#{seg_name}#{@md.title}" />\n}
-        #end
       end
       if @md.dc_creator                                                          # DublinCore 2 - creator/author (author)
         @rdf_creator=%{    dc.creator="#{@md.dc_creator}"\n}
diff --git a/lib/sisu/v0/texpdf_format.rb b/lib/sisu/v0/texpdf_format.rb
index 55f1e19a..51681ce7 100644
--- a/lib/sisu/v0/texpdf_format.rb
+++ b/lib/sisu/v0/texpdf_format.rb
@@ -798,9 +798,6 @@ WOK
           if word =~/\\\{(.+?)\\\}((?:https?|file|ftp):\/\/\S+?\.[^'"><\s]+?)([;.,]?(?:\s|$))/
             r=%r/\\\{(.+?)\\?\}((?:https?|file|ftp):\/\/\S+?\.[^'"><\s]+?)(?:[;.,]?(?:\s|$)|(?:\s|$))/
             d=/\\\{.+?\\?\}(?:https?|file|ftp):\/\/\S+?\.[^'"><\s]+?([;.,]?(?:\s|$))/.match(word).captures.to_s
-#          if word =~/\\\{(.+?)\\\}((?:https?|file|ftp)\S+?)([;.,]?(?:\s|$))/
-#            r=%r/\\\{(.+?)\\?\}((?:https?|file|ftp):\S+?)(?:[;.,]?(?:\s|$)|(?:\s|$))/
-#            d=/\\\{.+?\\?\}(?:https?|file|ftp):\S+?([;.,]?(?:\s|$))/.match(word).captures.to_s
           else
             r=%r/\\\{(.+?)\\?\}((?:https?|file|ftp):\S+)/
             d=''
@@ -820,8 +817,6 @@ WOK
             when /a5/;     @tx.a5
             else           @tx.a4
             end
-            ##dm=SiSU_Env::Get_init.instance.tex(@md.papersize).dimensions #test!
-            #dm=SiSU_Viz::TeX.new(@md.papersize).dimensions
             width=if orientation =~/portrait/ #value is not currently passed
               width=if width.to_i > dm.portrait.img_px; dm.portrait.img_px
               else                                      width
@@ -875,7 +870,7 @@ WOK
       @words.join
     end
     def http(orientation)
-      wm=@string.dup.scan(/\\\{.+?\\\}(?:(?:https?|file|ftp):\S+|image)|\w+\s*|./m) #first match of interest others passed through
+      wm=@string.dup.scan(/\\\{.+?\\\}(?:(?:https?|file|ftp):\S+|image)|\w+\s*|./m)
       @string=SiSU_TeX_Pdf::Format_text_object.new(@md,wm).http_word_mode(orientation)
     end
     def language
diff --git a/lib/sisu/v0/xhtml.rb b/lib/sisu/v0/xhtml.rb
index 1d7d63d1..6b91f34f 100644
--- a/lib/sisu/v0/xhtml.rb
+++ b/lib/sisu/v0/xhtml.rb
@@ -190,25 +190,6 @@ WOK
         else ''
         end
       end
-      def xml_structure_ee(para='',lv='',ocn='',hname='') #embedded endnotes
-        lv=lv.to_i
-        n=lv - 1
-        n3=lv + 2
-        lv=nil if lv == 0
-        embedded_endnotes(para)
-        if para[@regx]
-          paragraph="#{para[@regx,2]}"
-          util=SiSU_text_utils::Wrap.new(paragraph,70)
-          wrapped=util.line_wrap
-        end
-        @@xml[:body] << "#{@tab*0}<object>" << "\n" if para[@regx]
-        @@xml[:body] << "#{@tab*1}<ocn>#{para[@regx,3]}</ocn>" << "\n" if para[@regx,3]
-        @@xml[:body] << if lv; %{#{@tab*1}<text class="h#{lv}">#{wrapped}</text>\n} << "\n"
-        else                   %{#{@tab*1}<text class="norm">#{wrapped}</text>\n} # main text, contents, body KEEP
-        end
-        ##@@xml[:body] << "#{@tab*1}<text>#{para[@regx,2]}</text>\n" if para[@regx,2] # old unwrapped main text, contents, body KEEP
-        @@xml[:body] << "#{@tab*0}</object>" << "\n" if para[@regx]
-      end
       def xml_structure(para='',lv='',ocn='',hname='',type='norm') #extracted endnotes
         lv=lv.to_i
         n=lv - 1
diff --git a/lib/sisu/v0/xml.rb b/lib/sisu/v0/xml.rb
index 2dd25491..b230ec9f 100644
--- a/lib/sisu/v0/xml.rb
+++ b/lib/sisu/v0/xml.rb
@@ -214,26 +214,6 @@ WOK
         end
         @@xml[:sc]=sc
       end
-      def xml_structure_ee(para='',lv='',ocn='',hname='') #embedded endnotes
-        lv=lv.to_i
-        n=lv - 1
-        n3=lv + 2
-        lv=nil if lv == 0
-        embedded_endnotes(para)
-        if para[@regx]
-          paragraph="#{para[@regx,2]}"
-          util=SiSU_text_utils::Wrap.new(paragraph,70)
-          wrapped=util.line_wrap
-        end
-        @@xml[:body] << "#{@tab*0}<object>" << "\n" if para[@regx]
-        @@xml[:body] << "#{@tab*1}<ocn>#{para[@regx,3]}</ocn>" << "\n" if para[@regx,3]
-        @@xml[:body] << if lv; %{#{@tab*1}<text class="h#{lv}">#{wrapped}</text>\n} << "\n"
-        else                   %{#{@tab*1}<text class="norm">#{wrapped}</text>\n} # main text, contents, body KEEP
-        end
-        #@@xml[:body] << "#{@tab*1}<text>#{wrapped}</text>\n" # main text, contents, body KEEP
-        ##@@xml[:body] << "#{@tab*1}<text>#{para[@regx,2]}</text>\n" if para[@regx,2] # old unwrapped main text, contents, body KEEP
-        @@xml[:body] << "#{@tab*0}</object>" << "\n" if para[@regx]
-      end
       def xml_structure(para='',lv='',ocn='',hname='',type='norm') #extracted endnotes
         lv=lv.to_i
         n=lv - 1
@@ -249,7 +229,6 @@ WOK
         @@xml[:body] << if para[@regx,3]; %{#{@tab*0}<object id="#{para[@regx,3]}">} << "\n"
         else                              "#{@tab*0}<object>" << "\n" if para[@regx]
         end
-        #@@xml[:body] << "#{@tab*1}<heading>#{lv}</heading>" << "\n" if lv
         @@xml[:body] << "#{@tab*1}<ocn>#{para[@regx,3]}</ocn>" << "\n" if para[@regx,3]
         @@xml[:body] << if lv; %{#{@tab*1}<text class="h#{lv}">\n#{@tab*2}#{wrapped}\n#{@tab*1}</text>\n} << "\n"
         else                   %{#{@tab*1}<text class="#{type}">\n#{@tab*2}#{wrapped}\n#{@tab*1}</text>\n} # main text, contents, body KEEP
-- 
cgit v1.2.3