diff options
| author | Ralph Amissah <ralph@amissah.com> | 2015-04-19 14:44:38 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2015-05-01 18:49:40 -0400 |
| commit | 1323f18af45ea0d3aaef5cd9ead0efb5de8b9729 (patch) | |
| tree | e1abd6d04547c269666f276d8bdb24afa9d7dfee /lib/sisu/current/html_format.rb | |
| parent | setup.rb s/Config/RbConfig/ (diff) | |
c<-d: sync, roll develop into current dir branch (5==6)
* two dir branches, same library contents
(v5 synced & updated with v6)
Diffstat (limited to 'lib/sisu/current/html_format.rb')
| -rw-r--r-- | lib/sisu/current/html_format.rb | 50 |
1 files changed, 17 insertions, 33 deletions
diff --git a/lib/sisu/current/html_format.rb b/lib/sisu/current/html_format.rb index 8f83219f..b350170f 100644 --- a/lib/sisu/current/html_format.rb +++ b/lib/sisu/current/html_format.rb @@ -60,7 +60,6 @@ module SiSU_HTML_Format def initialize(md,ocn) @md,@ocn=md,ocn.to_s @ocn ||='' - @ocn_html_identifier=SiSU_Env::ProcessingSettings.new(@md).ocn_html_identifier @make=SiSU_Env::ProcessingSettings.new(@md) end def ocn_display @@ -69,7 +68,7 @@ module SiSU_HTML_Format or @ocn.empty? '' else - %{<label class="ocn"><a href="##{@ocn_html_identifier}#{@ocn}" class="lnkocn">#{@ocn}</a></label>} + %{<label class="ocn"><a href="##{@ocn}" class="lnkocn">#{@ocn}</a></label>} end else '' @@ -84,10 +83,12 @@ module SiSU_HTML_Format end end def id #w3c? "tidy" complains about numbers as identifiers ! annoying - (@ocn==nil || @ocn.empty?) ? '' : %{id="#{Mx[:ocn_id_char]}#{@ocn}"} + (@ocn==nil || @ocn.empty?) \ + ? '' : %{id="#{Mx[:ocn_id_char]}#{@ocn}"} end def goto - (@ocn==nil || @ocn.empty?) ? '' : %{<a href="##{@ocn_html_identifier}#{@ocn}">} + (@ocn==nil || @ocn.empty?) \ + ? '' : %{<a href="##{@ocn}">} end end class HeadInformation @@ -99,8 +100,9 @@ module SiSU_HTML_Format @md=md # DublinCore 1 - title @bits=SiSU_Proj_HTML::Bits.new - @seg_name_html=(SiSU_HTML::Source::Seg.new.seg_name_html || []) - @seg_name_html_tracker=(SiSU_HTML::Source::Seg.new.seg_name_html_tracker || []) + @per=SiSU_HTML_Persist::Persist.new + @per.seg_name_x=SiSU_HTML::Seg.new.seg_name_x + @per.seg_name_x_tracker=SiSU_HTML::Seg.new.seg_name_x_tracker @tocband_scroll,@tocband_segtoc=nil,nil @stylesheet=SiSU_Style::CSS_HeadInfo.new(md).stylesheet @o_str ||=SiSU_Env::ProcessingSettings.new(md).output_dir_structure @@ -403,7 +405,7 @@ WOK <head> <meta charset="utf-8"> <title> - #{@md.html_title} + #{@md.title.full} </title> <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> #{rdf.metatag_html} @@ -615,9 +617,9 @@ WOK super(md) end def dot_control_pre_next - pre="#{@seg_name_html[@seg_name_html_tracker-1]}#{@md.lang_code_insert}#{Sfx[:html]}" + pre="#{@per.seg_name_x[@per.seg_name_x_tracker-1]}#{@md.lang_code_insert}#{Sfx[:html]}" up=@toc - nxt="#{@seg_name_html[@seg_name_html_tracker+1]}#{@md.lang_code_insert}#{Sfx[:html]}" + nxt="#{@per.seg_name_x[@per.seg_name_x_tracker+1]}#{@md.lang_code_insert}#{Sfx[:html]}" if nxt=~/sisu_manifest\.html/ @file=SiSU_Env::FileOp.new(@md) if @md if @file.output_dir_structure.by_language_code? \ @@ -643,7 +645,7 @@ WOK #{the_table_close}} end def dot_control_pre - pre="#{@seg_name_html[@seg_name_html_tracker-2]}#{@md.lang_code_insert}#{Sfx[:html]}" + pre="#{@per.seg_name_x[@per.seg_name_x_tracker-2]}#{@md.lang_code_insert}#{Sfx[:html]}" up=@toc nxt="#{@md.file.base_filename.html_segtoc}" %{<table summary="segment hidden control pre" width="100%" border="0" cellpadding="0" bgcolor=#{the_color.grey_pale} align="center"> @@ -671,12 +673,12 @@ WOK </a> </td>} pre=%{<td align="center" bgcolor=#{the_color.band1}> - <a href="#{@seg_name_html[@seg_name_html_tracker-use]}#{@md.lang_code_insert}#{Sfx[:html]}" target="_top"> + <a href="#{@per.seg_name_x[@per.seg_name_x_tracker-use]}#{@md.lang_code_insert}#{Sfx[:html]}" target="_top"> #{png_nav.pre} </a> </td>} if f_pre==true nxt=%{<td align="center" bgcolor=#{the_color.band1}> - <a href="#{@seg_name_html[@seg_name_html_tracker+1]}#{@md.lang_code_insert}#{Sfx[:html]}" target="_top"> + <a href="#{@per.seg_name_x[@per.seg_name_x_tracker+1]}#{@md.lang_code_insert}#{Sfx[:html]}" target="_top"> #{png_nav.nxt} </a> </td>} if f_nxt==true @@ -721,23 +723,6 @@ WOK else '' end end - def navigation_table - %{<table summary="navigation segment table" width=#{the_width.table1} border="0" bgcolor="white" cellpadding="0"> -<tr><th width="#{@@indent['leve_1']}" align="right"> -</td> -<td valign="top"> - <font size=2>} - end - def navigation_table1 - %{<table summary="navigation segment table1" width=#{the_width.table1} border="0" cellpadding=#{the_table_cellpad_box} bgcolor=#{the_color.table1} align="left"> -<tr><td valign="top"> - <font size="2">} - end - def navigation_table2 - %{<table summary="navigation segment table2" width=#{the_width.table2} border="0" cellpadding=#{the_table_cellpad_box} bgcolor=#{the_color.table2} align="left"> -<tr><td valign="top"> - <font size="2">} - end def credit %{ <div class="main_column"> @@ -799,8 +784,8 @@ WOK <head> <meta charset="utf-8"> <title> - #{@seg_name_html[@seg_name_html_tracker]} - - #{@md.html_title} + #{@per.seg_name_x[@per.seg_name_x_tracker]} - + #{@md.title.main} </title> <meta http-equiv="Content-Type" content="text/html;charset=utf-8"> #{rdf.metatag_html} @@ -1161,7 +1146,6 @@ WOK end def subtoc_lev(tag,attrib) @txt=clean(@txt) - @ocn_html_identifier=SiSU_Env::ProcessingSettings.new(@md).ocn_html_identifier txt=if @txt \ and @txt =~/<\/?i>|<a\s+name="\S+?">/mi @txt.gsub(/<\/?i>|<a\s+name="\S+?">/mi,'') #removes name markers from subtoc, go directly to substantive text @@ -1175,7 +1159,7 @@ WOK gsub(/<a[\s]+name="-\d+"[\s]+href="#_\d+"> <sup>\d+<\/sup> /m,'') end %{<#{tag} class="#{attrib}"> - <a href="##{@ocn_html_identifier}#{@ocn}"><i>#{txt}</i></a> #{note} + <a href="##{@ocn}"><i>#{txt}</i></a> #{note} </#{tag}>} end def subtoc_lev5 |