From 5787bd8ec03e93e90dd90d5fbcb66bdb49a07a84 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Mon, 18 Aug 2008 23:41:37 -0400
Subject: a bit of a cleanup, and change reference to null to ordinary

---
 lib/sisu/v0/html_format.rb | 67 ++++++++--------------------------------------
 1 file changed, 11 insertions(+), 56 deletions(-)

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

diff --git a/lib/sisu/v0/html_format.rb b/lib/sisu/v0/html_format.rb
index 8fcd1e25..af36dc30 100644
--- a/lib/sisu/v0/html_format.rb
+++ b/lib/sisu/v0/html_format.rb
@@ -79,6 +79,9 @@ module SiSU_HTML_Format
         ocn_class='ocn_off'
         @paranum.gsub(/^(\d+|)$/,
         %{<label class="#{ocn_class}">&nbsp;</label>})
+      elsif @paranum.to_i == 0
+        @paranum.gsub(/^(\d+|)$/,
+        %{<label class="#{ocn_class}"><a name="#@paranum">&nbsp;</a></label>})
       else
         ocn_class='ocn'
         @paranum.gsub(/^(\d+|)$/,
@@ -798,51 +801,6 @@ WOK
 </tr></table>}
       end
     end
-    def toc_pre_next3 #used with seg_doc_types in seg_nav_band #with pdf & other doc types #knxjs
-      %{<table summary="segment navigation pre/next" border="0" cellpadding="3" cellspacing="0">
-<tr><td align="center" bgcolor=#{@vz.color_band1}>
-  <a href="#{@md.fnl[:pre]}#{@seg_name_html[@seg_name_html_tracker-1]}#{@md.fnl[:mid]}#@sfx#{@md.fnl[:post]}" target="_top" #{@vz.js_prev}>
-    #{@vz.png_nav_previous}
-  </a>
-</td>
-<td align="center" bgcolor=#{@vz.color_band1}>
-  <a href="#{@md.fnl[:pre]}#@index#{@md.fnl[:mid]}#@sfx#{@md.fnl[:post]}" target="_top" #{@vz.js_toc}>
-    #{@vz.png_nav_toc}
-  </a>
-</td>
-<td align="center" bgcolor=#{@vz.color_band1}>
-  <a href="#{@md.fnl[:pre]}#{@seg_name_html[@seg_name_html_tracker+1]}#{@md.fnl[:mid]}#@sfx#{@md.fnl[:post]}" target="_top" #{@vz.js_next}>
-    #{@vz.png_nav_next}
-  </a>
-#{@vz.table_close}}
-    end
-    def toc_next3 #used with seg_doc_types in seg_nav_band #with pdf & other doc types #knxjs
-      %{<table summary="segment navigation next" border="0" cellpadding="3" cellspacing="0">
-<tr>
-<td align="center" bgcolor=#{@vz.color_band1}>
-  <a href="#{@md.fnl[:pre]}#@index#{@md.fnl[:mid]}#@sfx#{@md.fnl[:post]}" target="_top" #{@vz.js_toc}>
-    #{@vz.png_nav_toc}
-  </a>
-</td>
-<td align="center" bgcolor=#{@vz.color_band1}>
-  <a href="#{@md.fnl[:pre]}#{@seg_name_html[@seg_name_html_tracker+1]}#{@md.fnl[:mid]}#@sfx#{@md.fnl[:post]}" target="_top" #{@vz.js_next}>
-    #{@vz.png_nav_next}
-  </a>
-#{@vz.table_close}}
-    end
-    def toc_pre3 #used with seg_doc_types in seg_nav_band #with pdf and other doc types #knxjs
-    # note endnotes is now two back, with insertion between end of text and metadata, but what happens where no endnote?
-      %{<table summary="segment navigation pre" border="0" cellpadding="3" cellspacing="0">
-<tr><td align="center" bgcolor=#{@vz.color_band1}>
-  <a href="#{@md.fnl[:pre]}#{@seg_name_html[@seg_name_html_tracker-2]}#{@md.fnl[:mid]}#@sfx#{@md.fnl[:post]}" target="_top" #{@vz.js_prev}>
-    #{@vz.png_nav_previous}
-  </a></td>
-<td align="center" bgcolor=#{@vz.color_band1}>
-  <a href="#{@md.fnl[:pre]}#@index#{@md.fnl[:mid]}#@sfx#{@md.fnl[:post]}" target="_top" #{@vz.js_toc}>
-    #{@vz.png_nav_toc}
-  </a>
-#{@vz.table_close}}
-    end
     def title_endnote(title,subtitle,creator,table_top_control)
 #      %{#{@vz.banner_instrument_cover_band_seg}
 #  <h1 class="banner">
@@ -1088,19 +1046,12 @@ WOK
       @dp=@@dp ||=SiSU_Env::Info_env.new.digest.pattern
       rgx=/(?:#{Mx[:en_a_o]}|#{Mx[:en_b_o]})[\d*+]+\s+(.+?)#{Mx[:id_o]}#@dp#{Mx[:id_c]}(?:#{Mx[:en_a_c]}|#{Mx[:en_b_c]})/ #problem introduced
       @one_stripped=@one.gsub(rgx,'\1') if @one =~rgx #problem introduced
-      @link,@linkname=txt[0],txt[1]
-      @format,parablock=txt[0],txt[1]
-      @parablock=parablock
-      ##performance hit does not justify action:
-      #@parablock=if parablock=~/\S+/ and parablock !~/<!Th?¡ /um
-      #  wrap=SiSU_text_utils::Wrap.new(parablock,70,4)
-      #  wrap.line_wrap
-      #else parablock
-      #end
+      @format,@parablock=txt[0],txt[1]
+      @one.gsub!(/#{Mx[:mk_o]}[-~]##{Mx[:mk_c]}/,'') if @one
+      @parablock.gsub!(/#{Mx[:mk_o]}[-~]##{Mx[:mk_c]}/,'') if @parablock
       if txt[2]=~/\d+/
         @paranum=txt[2][/(\d+)/m,1] # unless paranum =~/#/
         @p_num=Paragraph_number.new(@md,@paranum)
-        #@p_num=SiSU_HTML_Format::Paragraph_number.new(@md,@paranum)
         @para_id=Paragraph_id_ocn.new(@md,@paranum) #used by table version
       end
       @headname=''
@@ -1428,6 +1379,7 @@ WOK
   class Format_toc < Format_text_object
     def initialize(md='',*txt)
       super(md,*txt)
+      @link,@linkname=@one,@two
     end
     def links_guide
       #@three distinguishes between _top and external, can be used e.g. for different colour scheme
@@ -1439,10 +1391,13 @@ WOK
 }
     end
     def lev(tag,attrib)
-  %{<#{tag} class="#{attrib}">
+      if @one
+        %{<#{tag} class="#{attrib}">
     #@one
   </#{tag}>
 }
+      else ''
+      end
     end
     def lev1
       lev('h1','toc')
-- 
cgit v1.2.3