From 32fd8f3908bc8632e2d8ab4d872f6e4362fe031b Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sun, 12 Oct 2014 10:52:35 -0400
Subject: v5: merge v6: remove defaults.rb & some relics related to sisu skins

---
 lib/sisu/v5/html.rb | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

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

diff --git a/lib/sisu/v5/html.rb b/lib/sisu/v5/html.rb
index 76dbe2a2..1a8d6608 100644
--- a/lib/sisu/v5/html.rb
+++ b/lib/sisu/v5/html.rb
@@ -66,9 +66,8 @@ module SiSU_HTML
   end
   require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
-  require_relative 'defaults'                           # defaults.rb
-    include SiSU_Viz
   require_relative 'html_table'                         # html_table.rb
+  require_relative 'html_parts'                         # html_parts.rb
   require_relative 'html_format'                        # html_format.rb
     include SiSU_HTML_Format
   require_relative 'html_segments'                      # html_segments.rb
@@ -181,7 +180,6 @@ module SiSU_HTML
       def initialize(particulars)
         @particulars=particulars
         @md,@env=particulars.md,particulars.env
-        @vz=SiSU_Viz::Defaults.new
         @env,@css=particulars.env,SiSU_Style::CSS.new
       end
       def tuned_file_instructions
@@ -267,7 +265,6 @@ module SiSU_HTML
       @@firstseg=nil
       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
@@ -334,7 +331,7 @@ module SiSU_HTML
         @@toc[:seg] <<<<WOK
 <center>
 <table><tr><td>
-<p><font color="#222222" #{@font.face} size="2">
+<p><font color="#222222" #{the_font.set_face} size="2">
 (relatively static) RSS feeds for DOCUMENTS:<br>
 <a href="../rssfeed/documents.xml"><img border="0" height="14" width="36" src="../_sisu/image/rss.png" alt="RSS feed"></a>&nbsp;http://www.jus.uio.no/lm/rssfeed/documents.xml<br>
 <a href="../rssfeed/tradelaw.xml"><img border="0" height="14" width="36" src="../_sisu/image/rss.png" alt="RSS feed"></a>&nbsp;http://www.jus.uio.no/lm/rssfeed/tradelaw.xml<br>
@@ -607,9 +604,9 @@ WOK
       end
     end
     class ScrollHeadAndSegToc < Toc
+      include SiSU_Parts_HTML
       def initialize(md='',toc='',links_guide_toc='')
         @md,@toc,@links_guide_toc=md,toc,links_guide_toc
-        @vz=SiSU_Viz::Defaults.new
         @make=SiSU_Env::ProcessingSettings.new(@md)
       end
       def in_common
@@ -662,8 +659,8 @@ WOK
           toc_shared << format_txt_obj.center_bold
           @segtoc << format_txt_obj.center_bold
         end
-        toc_shared << "#{@vz.table_close*1}\n"
-        @segtoc << "#{@vz.table_close*1}\n"
+        toc_shared << "#{the_table_close*1}\n"
+        @segtoc << "#{the_table_close*1}\n"
         tmp_head=nil
         if @md.prefix_a
           tmp_head ||= %{<p>#{@md.prefix_a}\n}
-- 
cgit v1.2.3