html increased use of css; dal, middle layer, url representation, interim commit

1 files changed, 16 insertions, 10 deletions

diff --git a/lib/sisu/v0/html_segments.rb b/lib/sisu/v0/html_segments.rb
index a15c302e..e632c835 100644
--- a/lib/sisu/v0/html_segments.rb
+++ b/lib/sisu/v0/html_segments.rb
@@ -69,7 +69,7 @@ module SiSU_HTML_seg
     @@loop_count=@@seg_total=@@tracker=0
     @@is4=@@is3=@@is2=@@is1=0
     @@header1=@@header2=@@header3=@@header4=0
-    @@seg[:tocband],@@seg[:title],@@seg[:headers],@@seg[:main],@@seg[:tail],@@seg[:credits],@@seg_subtoc_array,@@seg_endnotes_array,@@seg[:endnote_all]=Array.new(9){[]}
+    @@seg[:tocband_banner],@@seg[:tocband_bannerless],@@seg[:title],@@seg[:headers],@@seg[:main],@@seg[:tail],@@seg[:credits],@@seg_subtoc_array,@@seg_endnotes_array,@@seg[:endnote_all]=Array.new(10){[]}
     @@seg[:header_endnotes]=''
     @@tablehead,@@number_of_cols=0,0
     @@flag_alt=false
@@ -85,6 +85,7 @@ module SiSU_HTML_seg
     end
     def songsheet
       begin
+        @@minitoc=SiSU_HTML::Source::Toc.new(@data,@md).minitoc
         data=get_subtoc_endnotes(@data)
         data=articles(data)
         Seg.new.cleanup # (((( added ))))
@@ -192,6 +193,8 @@ module SiSU_HTML_seg
           end
         end
       end
+      @@seg[:main] << '</div>'
+      data
     end
     def header_art(para)
       format_head_seg=SiSU_HTML_Format_type::Head_seg.new(@md)
@@ -215,7 +218,8 @@ module SiSU_HTML_seg
       @p_num ||= ''
       if @@is1 == 1
         @dc_creator=%{<b>#{@md.dc_creator}</b>\n} if @md.dc_creator.to_s =~/\S/
-        @@seg[:tocband] << format_head_seg.navigation_band(@@segtocband,@@seg[:dot_nav])
+        @@seg[:tocband_banner] << format_head_seg.navigation_band(@@segtocband,@@seg[:dot_nav])
+        @@seg[:tocband_bannerless] << format_head_seg.navigation_band_bottom(@@segtocband,@@seg[:dot_nav])
         @@seg[:headers] << format_head_seg.seg_head_escript if SiSU_HTML_Format_type::Head_seg.method_defined? :seg_head_escript #debug PHP move up in text #bug
         @@seg[:headers] << format_head_seg.title_banner(@md.title,@md.subtitle,@dc_creator).gsub(clean,'')
         paranum=if @@header1[/.+?#{Mx[:id_o]}~(\d+);(?:[oh]|[0-6]:)\d+;\w\d+#{Mx[:id_c]}#{Mx[:id_o]}#@dp:#@dp#{Mx[:id_c]}$/]; $1
@@ -320,14 +324,16 @@ module SiSU_HTML_seg
             elsif para !~/#{@vz.margin_txt_0}|#{@vz.margin_txt_1}|#{@vz.margin_txt_2}/ \
             and para =~/^#{Mx[:gr_o]}TZ#{Mx[:gr_c]}/
               format_txt_obj.gsub_body
-              @sto.seg_lev_para_ocn.table_end
+              @sto.seg_lev_para_ocn.table_css_end
             else para
             end
           else para
           end
         elsif para =~/#{Mx[:tc_p]}|#{Mx[:gr_o]}T[hZ]?/u
+          @sto=nil
           table=SiSU_HTML_shared::Table.new(para)
           para=table.table
+        else @sto=nil
         end
         if @md.flag_separate_endnotes
           para.gsub!(/"\s+href="#_(\d+)">/,%{" href=\"endnotes#{@md.sfx}#_\\1">})       #endnote- twice #removed file type
@@ -345,8 +351,9 @@ module SiSU_HTML_seg
             para=format_seg.no_paranum
           end
         end
-        if @sto.format=~/4:\S+/
+        if @sto and @sto.format=~/4:\S+/
           para.gsub!(/^\s*4:\S+\s*|<:[-_\w\d]?(-.+?-)?>|4~!.+/m,'')              #sort seg headers
+          @@seg[:main] << '<div class="content">'
           @@seg[:main] << para
           @@seg[:main] << @@seg_subtoc[@@get_hash_fn]                       #% insertion of sub-toc
         else
@@ -361,20 +368,19 @@ module SiSU_HTML_seg
         @@seg[:tail] << format_head_seg.endnote_mark
         @@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)
       @@seg[:credits] << format_head_seg.credit << ads.div.close << ads.display << format_head_seg.html_close
     end
     def output(type='')
       if @@seg[:title] =~/\S/ #kludge (for exception file better.ways, how ironic) get a real ruby test, e.g. test that not array or...
         filename_seg=[]
-        filename_seg << @@seg[:title] << @@seg[:tocband]
+        filename_seg << @@seg[:title] << @@seg[:tocband_banner]
         if type !~/endnote/
-          filename_seg << @@seg[:headers] << @@seg[:main]
+          filename_seg << @@minitoc << @@seg[:main]
         else
-          filename_seg << @@seg[:header_endnotes] << @@seg[:endnote_all]
+          filename_seg << @@seg[:header_endnotes] << @@minitoc  << '<div class="content">' << @@seg[:endnote_all]
         end
-        filename_seg << @@seg[:tail] << @@seg[:tocband] << @@seg[:credits]
+        filename_seg << @@seg[:tail] << @@seg[:tocband_bannerless] << @@seg[:credits]
         filename_seg.flatten!.compact!
         filename_seg.each do |para|
           unless para =~/\A\s*\Z/
@@ -386,7 +392,7 @@ module SiSU_HTML_seg
       end
     end
     def reinitialise
-      @@seg[:title],@@seg[:dot_nav],@@seg[:tocband],@@seg[:headers],@@seg[:main],@@seg[:tail],@@seg[:credits]=Array.new(7){[]}
+      @@seg[:title],@@seg[:dot_nav],@@seg[:tocband_banner],@@seg[:tocband_bannerless],@@seg[:headers],@@seg[:main],@@seg[:tail],@@seg[:credits]=Array.new(8){[]}
       @@segtocband=nil
     end
     def cleanup