From bd5e94912c594372eca319e75e15c364b7e124ea Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Wed, 5 Feb 2014 00:27:47 -0500
Subject: v5 v6: wrappers round require

---
 lib/sisu/v6/html.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'lib/sisu/v6/html.rb')

diff --git a/lib/sisu/v6/html.rb b/lib/sisu/v6/html.rb
index 8a909677..148672e5 100644
--- a/lib/sisu/v6/html.rb
+++ b/lib/sisu/v6/html.rb
@@ -61,7 +61,11 @@
 
 =end
 module SiSU_HTML
-  require 'pstore'
+  begin
+    require 'pstore'
+  rescue LoadError
+    SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error('pstore NOT FOUND (LoadError)')
+  end
   require_relative 'particulars'                        # particulars.rb
     include SiSU_Particulars
   require_relative 'defaults'                           # defaults.rb
-- 
cgit v1.2.3


From a151893efedaebc26d26a8f8611fb688a6de6d4f Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Wed, 5 Feb 2014 00:56:10 -0500
Subject: v5 v6: ocn: strict html; turn on/off rules for txt & odf

---
 lib/sisu/v6/html.rb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'lib/sisu/v6/html.rb')

diff --git a/lib/sisu/v6/html.rb b/lib/sisu/v6/html.rb
index 148672e5..f1651326 100644
--- a/lib/sisu/v6/html.rb
+++ b/lib/sisu/v6/html.rb
@@ -245,6 +245,7 @@ module SiSU_HTML
       def initialize(md=nil,data='')
         @data,@md=data,md
         @vz=SiSU_Viz::Defaults.new
+        @ocn_html_identifier=SiSU_Env::ProcessingSettings.new(@md).ocn_html_identifier
         @tell=SiSU_Screen::Ansi.new(@md.opt.act[:color_state][:set]) if @md
       end
       def songsheet #extracts toc for scroll & seg
@@ -356,7 +357,7 @@ WOK
         title=if dob.ocn ==0 then linkname
         else
           @@toc[:scr] <<  '<br />'
-          %{<b><a href="##{dob.ocn}">#{linkname}</a></b>}
+          %{<b><a href="##{@ocn_html_identifier}#{dob.ocn}">#{linkname}</a></b>}
         end
         txt_obj={ txt: title }
         format_toc=SiSU_HTML_Format::FormatToc.new(@md,txt_obj)
@@ -398,7 +399,7 @@ WOK
           end
         else
           @@toc[:scr] <<  '<br />'
-          %{<b><a href="##{dob.ocn}">#{linkname}</a></b>}
+          %{<b><a href="##{@ocn_html_identifier}#{dob.ocn}">#{linkname}</a></b>}
         end
         txt_obj={ txt: title }
         format_toc=SiSU_HTML_Format::FormatToc.new(@md,txt_obj)
@@ -515,7 +516,7 @@ WOK
           }
           f=@md.file.base_filename.html_seg(fnh)
           p_num=SiSU_HTML_Format::ParagraphNumber.new(@md,ocn)
-          lnk_n_txt=%{  <a href="#{f}##{ocn}">
+          lnk_n_txt=%{  <a href="#{f}##{@ocn_html_identifier}#{ocn}">
     #{linkname}
   </a>}
           txt_obj={ txt: lnk_n_txt }
@@ -540,7 +541,7 @@ WOK
           }
           f=@md.file.base_filename.html_seg(fnh)
           p_num=SiSU_HTML_Format::ParagraphNumber.new(@md,ocn)
-          lnk_n_txt=%{  <a href="#{f}##{ocn}">
+          lnk_n_txt=%{  <a href="#{f}##{@ocn_html_identifier}#{ocn}">
   #{linkname}
 </a>}
           txt_obj={ txt: lnk_n_txt }
-- 
cgit v1.2.3


From d79d6050ce31f7d8d65a87be4008e11fae368770 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Wed, 5 Feb 2014 01:09:02 -0500
Subject: v5 v6: html, (output) cleaning

---
 lib/sisu/v6/html.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib/sisu/v6/html.rb')

diff --git a/lib/sisu/v6/html.rb b/lib/sisu/v6/html.rb
index f1651326..8c9869e2 100644
--- a/lib/sisu/v6/html.rb
+++ b/lib/sisu/v6/html.rb
@@ -623,7 +623,8 @@ WOK
         toc_shared << format_txt_obj.center_bold
         @segtoc << format_txt_obj.center_bold
         if defined? @md.creator.author
-          creator_endnote=@md.creator.author.gsub(/(\*+)/,
+          creator=SiSU_HTML_Tune::CleanHTML.new(@md.creator.author).clean_for_html
+          creator_endnote=creator.gsub(/(\*+)/,
             %{&nbsp;<sup><a href="#notes">\\1</a></sup>})
           tmp_head=creator_endnote + "\n"
           txt_obj={ txt: tmp_head }
-- 
cgit v1.2.3