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

1 files changed, 40 insertions, 90 deletions

diff --git a/lib/sisu/v0/html_format.rb b/lib/sisu/v0/html_format.rb
index 03d97a8d..5e261649 100644
--- a/lib/sisu/v0/html_format.rb
+++ b/lib/sisu/v0/html_format.rb
@@ -85,7 +85,7 @@ module SiSU_HTML_Format
         ocn_class='ocn'
         @paranum.gsub(/^(\d+|)$/,
         %{  <p class="#{ocn_class}">
-    &nbsp;&nbsp;\\1
+    \\1
   </p>})
       end
     end
@@ -639,52 +639,7 @@ WOK
 <tr><td valign="top">
 #{@vz.paragraph_txt}}
     end
-    def toc_endnote
-      %{#{@vz.margin_txt_3}
-#{@vz.paragraph_font_small}
-  <a href="#endnotes">
-    Endnotes
-  </a>
-#{@vz.table_close}}
-    end
     def title_endnote
-      %{#{@vz.margin_txt_0}
-  #{@vz.paragraph_txt}
-  <a name="endnotes" id="endnotes"></a>
-#{@vz.margin_num}
-  &nbsp;
-#{@vz.table_close}}
-    end
-    def tail
-      %{<br />
-#{@vz.margin_txt_0}
-<table summary="scroll tail" bgcolor="#777777">
-<tr><td width="20%">
-#{@vz.banner_band}
-</td>
-<td width="60%">
-<center>#@tocband_scroll</center>
-</td></tr>
-</table>
-<br />
-#{@vz.paragraph_txt}
-  <center>
-    #{@vz.credits_splash}
-    #{@vz.credits_sisu}
-  </center>
-#{@vz.margin_num}
-#{@vz.table_close}
-<a name="bottom id="finish"></a>
-<a name="down" id="down"></a>
-<a name="end" id="end"></a>
-<a name="finish" id="finish"></a>
-<a name="stop" id="stop"></a>
-<a name="credits" id="credits"></a>
-<font color="white" size="0">
-  #{@md.title*10}
-</font>
-</body>
-</html>}
     end
   end
   class Head_seg < Head_information
@@ -861,24 +816,7 @@ WOK
   </a>
 #{@vz.table_close}}
     end
-    def toc_endnote
-    end
     def title_endnote(title,subtitle,creator,table_top_control)
-      %{#{@vz.banner_instrument_cover_band_seg}
-  <h1 class="banner">
-    #{title}
-  </h1>
-  <h1 class="subbanner">
-   #{subtitle}
-  </h1>
-  <h1 class="subbanner">
-    #{creator}
-  </h1>
-  <h4 class="banner">
-    Endnotes
-  </h4>
-#{@vz.table_close}
-<h1>Endnotes</h1>}
     end
     def navigation_table
       %{<table summary="navigation segment table" width=#{@vz.table_width_1} border="0" bgcolor="white" cellpadding="0">
@@ -934,18 +872,17 @@ WOK
 </center>}
     end
     def credit
-      %{<br/>
-#{@vz.credits_splash}
+      %{#{@vz.credits_splash}
 #{@vz.credits_sisu}
 <a name="bottom" id="bottom"></a>
 <a name="down" id="down"></a>
 <a name="end" id="end"></a>
 <a name="finish" id="finish"></a>
 <a name="stop" id="stop"></a>
-<a name="credits" id="credits"></a>}
+<a name="credits" id="credits"></a></div>}
     end
-    def navigation_band(segtocband,seg_table_top_control)
-      %{<table summary="segment navigation band" bgcolor=#{@vz.color_band1} width="100%"><tr>
+    def navigation_band(segtocband,seg_table_top_control) #change name to navigaion_band_banner
+      %{<table summary="segment navigation band with banner" bgcolor=#{@vz.color_band1} width="100%"><tr>
 <td width="20%" align="left">
 #{@vz.banner_band}
 </td>
@@ -958,9 +895,22 @@ WOK
 </table>
 #{seg_table_top_control}}
     end
+    def navigation_band_bottom(segtocband,seg_table_top_control) #change name to navigaion_band_bannerless
+      %{<div class="substance">
+<p class="content">
+<table summary="segment navigation band" bgcolor=#{@vz.color_band1} width="100%"><tr>
+<td width="70%" align="center">
+  #{doc_types}
+</td>
+<td width="30%" align="right">
+  #{segtocband}
+</td></tr>
+</table>
+#{seg_table_top_control}
+</p></div>}
+    end
     def endnote_mark
 %{<p class="center" id="endnotes">
-<a href="#top"><hr width=90% /></a>
 </p>} #revisit
     end
   end
@@ -998,51 +948,51 @@ WOK
       end
       @vz=SiSU_Env::Get_init.instance.skin
     end
-    def para_form(tag,attrib)                                                        # regular paragraphs shaped here
+    def para_form_css(tag,attrib)                                                    # regular paragraphs shaped here
       ul=ulc=''
       ul,ulc="<ul>\n  ","\n  </ul>" if @tag =~/li/
-      %{#{@vz.margin_css}
-  #{ul}<#{tag} class="#{attrib}" #{@p_num.id}>#{@p_num.name}
+      %{<div class="substance">
+  #{@p_num.ocn_display}
+#{ul}<#{tag} class="#{attrib}" #{@p_num.id}>#{@p_num.name}
     #@parablock
   </#{tag}>#{ulc}
-#{@vz.margin_num_css}
-  #{@p_num.ocn_display}
-#{@vz.table_close}
+</div>
 }
     end
     def para
-      para_form('p','norm')
+      para_form_css('p','norm')
     end
     def code
-      para_form('p','code')
+      para_form_css('p','code')
     end
     def center
-      para_form('p','center')
+      para_form_css('p','center')
     end
     def bold
-      para_form('p','bold')
+      para_form_css('p','bold')
     end
     def bullet
-      para_form('li','bullet')
+      para_form_css('li','bullet')
     end
     def format(tag,atrib)
-      para_form(tag,atrib)
+      para_form_css(tag,atrib)
     end
     def dl
       "<dl><b>#@one</b> #@two</dl>"
     end
-    def table_end                                                                #<!TZ!>
-      %{</table>
-  #{@vz.margin_num_css.strip}
-    #{@p_num.ocn_display}
-  #{@vz.table_close}}
+    def table_css_end      #<!TZ!>
+      '</table>
+    </p>
+  </div>'
     end
     def no_paranum
-      %{#{@vz.margin_css}
-#{@vz.paragraph_txt}
+      %{<div class="substance">
+<p class="ocn">&nbsp;</p>
+<p class="norm">
   #@one #@two
-#{@vz.margin_num}
-#{@vz.table_close}}
+  </p>
+</div>
+}
     end
     def gsub_body
       case @one