From 53b74bac29e476d4000b76d10acc0c31e2376669 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sun, 12 Oct 2014 10:46:48 -0400
Subject: v6: '*_parts', remove defaults.rb & some relics related to sisu
 skins, long gone

* old code removed & substituted as required by *_parts
* attending code changes, fairly wide ranging, test
---
 lib/sisu/v6/html_lite_shared.rb | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

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

diff --git a/lib/sisu/v6/html_lite_shared.rb b/lib/sisu/v6/html_lite_shared.rb
index dc54fdb9..e54ee952 100644
--- a/lib/sisu/v6/html_lite_shared.rb
+++ b/lib/sisu/v6/html_lite_shared.rb
@@ -59,11 +59,10 @@
 
 =end
 module SiSU_FormatShared
-  require_relative 'defaults'                           # defaults.rb
-    include SiSU_Viz
+  require_relative 'html_parts'                         # html_parts.rb
   class CSS_Format
-    require_relative 'defaults'                         # defaults.rb
     require_relative 'se_hub_particulars'               # se_hub_particulars.rb
+    include SiSU_Parts_HTML
     @@fns=nil
     def initialize(md,t_o)
       @md,@t_o=md,t_o
@@ -79,10 +78,8 @@ module SiSU_FormatShared
       else @@hname
       end
       @tab="\t"
-      @brace_url=SiSU_Viz::Defaults.new.url_decoration
       @ocn_html_identifier=SiSU_Env::ProcessingSettings.new(@md).ocn_html_identifier
       @@tablehead,@@tablefoot=[],[]
-      @vz=SiSU_Viz::Defaults.new
       @env=SiSU_Env::InfoEnv.new(@md.fns)
       @base_url="#{@env.url.root}/#{@md.fnb}/#{@hname}.html"
     end
@@ -172,7 +169,7 @@ module SiSU_FormatShared
           gsub(/#{Mx[:gl_o]}#([a-z]{2,4})#{Mx[:gl_c]}/u,'&\1;').
           gsub(/#{Mx[:url_o]}[_\\](\S+?)#{Mx[:url_c]}/,'<a href="\1" target="_top">\1</a>'). #http ftp matches escaped, no decoration
           gsub(/(#{Mx[:lnk_c]})#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/,'\1<a href="\2" target="_top">\2</a>'). #special case \{ e.g. \}http://url
-          gsub(/(^|#{Mx[:gl_c]}|\s)#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/,%{\\1#{@brace_url.xml_open}<a href="\\2" target="_top">\\2</a>#{@brace_url.xml_close}\\3}) #http ftp matches with decoration
+          gsub(/(^|#{Mx[:gl_c]}|\s)#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/,%{\\1#{the_url_decoration.xml_open}<a href="\\2" target="_top">\\2</a>#{the_url_decoration.xml_close}\\3}) #http ftp matches with decoration
       else
         s.gsub(/</m,'&lt;').
           gsub(/>/m,'&gt;')
@@ -190,7 +187,7 @@ module SiSU_FormatShared
         gsub(/#{Mx[:gl_o]}#([a-z]{2,4})#{Mx[:gl_c]}/u,'&\1;').
         gsub(/#{Mx[:url_o]}_(\S+?)#{Mx[:url_c]}/,'<a href="\1" target="_top">\1</a>\2'). #http ftp matches escaped, no decoration
         gsub(/(#{Mx[:lnk_c]})#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/,'\1<a href="\2" target="_top">\2</a>'). #special case \{ e.g. \}http://url
-        gsub(/#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/,%{#{@brace_url.xml_open}<a href="\\1" target="_top">\\1</a>#{@brace_url.xml_close}}) #http ftp matches with decoration
+        gsub(/#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/,%{#{the_url_decoration.xml_open}<a href="\\1" target="_top">\\1</a>#{the_url_decoration.xml_close}}) #http ftp matches with decoration
     end
     def paragraph
       %{<p class="h#{@lv}" type="substantive" header="#{@hname}">#{@txt}</p>\n} # << "\n"
@@ -252,7 +249,7 @@ GSUB
       tag_para(h)
     end
     def para_table
-      %{<p class="norm" align="left"><font #{@vz.font_small} #{@vz.font_color} #{@vz.font_face}>}
+      %{<p class="norm" align="left"><font #{the_font.set_small} #{the_font.set_color} #{the_font.set_face}>}
     end
     def ocn
       %{<label class="ocn">#{@ocn}</label>} << "\n"
@@ -271,7 +268,7 @@ GSUB
           @@tablefoot.each {|x| tablefoot << %{<p align="center"><font size=2><i>#{x}</i></font></p>\n}}
           @@tablefoot=[]
           parablock=parablock.gsub(/#{Mx[:gr_o]}TZ#{Mx[:gr_c]}/,
-            %{#{@vz.table_close}\n}) # +
+            %{#{the_table_close}\n}) # +
         end
         if @@tablehead==1
           if parablock =~/#{Mx[:tc_p]}#{Mx[:tc_p]}/u
-- 
cgit v1.2.3