From 0ec2677657a7199d5210d9e013fe62334c83f71a Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sun, 17 Aug 2008 01:18:19 -0400
Subject: html segments structure and info provided (a bit verbose), and css

---
 lib/sisu/v0/html_segments.rb | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'lib/sisu/v0/html_segments.rb')

diff --git a/lib/sisu/v0/html_segments.rb b/lib/sisu/v0/html_segments.rb
index c4d136b7..db387105 100644
--- a/lib/sisu/v0/html_segments.rb
+++ b/lib/sisu/v0/html_segments.rb
@@ -221,11 +221,11 @@ module SiSU_HTML_seg
       if @@is1 == 1
         @dc_creator=%{<b>#{@md.dc_creator}</b>\n} if @md.dc_creator.to_s =~/\S/
         @@seg[:tocband_banner] << format_head_seg.navigation_band(@@segtocband,@@seg[:dot_nav])
-        endnote_section_close=unless @@get_hash_fn =~/metadata/
-          format_head_seg.endnote_section_close
+        conditional_div_close=unless @@get_hash_fn =~/metadata/ #watch
+          '</div>'
         else ''
         end
-          @@seg[:tocband_bannerless] << endnote_section_close << format_head_seg.navigation_band_bottom(@@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::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
@@ -270,6 +270,7 @@ module SiSU_HTML_seg
     end
     def markup(para)
       @debug=[]
+      para.gsub!(/(?:\s*#{Mx[:br_page]}\s*|\s*#{Mx[:br_page_new]}\s*)+/m,'')
       format_head_seg=SiSU_HTML_Format::Head_seg.new(@md)
       if para !~/^#{Rx[:meta]}/
         m=para[/.+?#{Mx[:id_o]}~(\d+);(?:[ohm]|[0-6]:)\d+;\w\d+#{Mx[:id_c]}#{Mx[:id_o]}#@dp:#@dp#{Mx[:id_c]}$/]
@@ -386,9 +387,9 @@ module SiSU_HTML_seg
         filename_seg=[]
         filename_seg << @@seg[:title] << @@seg[:tocband_banner]
         if type !~/endnote/
-          filename_seg << @@minitoc << @@seg[:main]
+          filename_seg << @@minitoc <<  @@seg[:headers] << @@seg[:main]
         else
-          filename_seg << @@seg[:header_endnotes] << @@minitoc  << %{\n<div class="content">\n} << @@seg[:endnote_all]
+          filename_seg << @@seg[:header_endnotes] << @@minitoc << @@seg[:headers] << %{\n<div class="content">\n} << @@seg[:endnote_all] #<< '</div>'
         end
         filename_seg << @@seg[:tail] << @@seg[:tocband_bannerless] << @@seg[:credits]
         filename_seg.flatten!.compact!
@@ -477,8 +478,8 @@ module SiSU_HTML_seg
               try.each do |e|
                 format_seg=SiSU_HTML_Format::Format_seg.new(@md,e)
                 note_match=if e =~/#{Mx[:pa_o]}i[1-9]#{Mx[:pa_c]}/
-                  format_seg.endnote_body_seg_tail_indent
-                else format_seg.endnote_body_seg_tail
+                  format_seg.endnote_body_indent
+                else format_seg.endnote_body
                 end
                 @@seg_endnotes_array << note_match
               end
-- 
cgit v1.2.3