From 1323f18af45ea0d3aaef5cd9ead0efb5de8b9729 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 19 Apr 2015 14:44:38 -0400 Subject: c<-d: sync, roll develop into current dir branch (5==6) * two dir branches, same library contents (v5 synced & updated with v6) --- lib/sisu/current/html_format.rb | 50 ++++++++++++++--------------------------- 1 file changed, 17 insertions(+), 33 deletions(-) (limited to 'lib/sisu/current/html_format.rb') 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 - %{} + %{} 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?) ? '' : %{} + (@ocn==nil || @ocn.empty?) \ + ? '' : %{} 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 - #{@md.html_title} + #{@md.title.full} #{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}" %{ @@ -671,12 +673,12 @@ WOK } pre=%{} if f_pre==true nxt=%{} if f_nxt==true @@ -721,23 +723,6 @@ WOK else '' end end - def navigation_table - %{
- + #{png_nav.pre} - + #{png_nav.nxt}
-
- - - } - end - def navigation_table1 - %{ -
- } - end - def navigation_table2 - %{ -
- } - end def credit %{
@@ -799,8 +784,8 @@ WOK - #{@seg_name_html[@seg_name_html_tracker]} - - #{@md.html_title} + #{@per.seg_name_x[@per.seg_name_x_tracker]} - + #{@md.title.main} #{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>|/mi @txt.gsub(/<\/?i>|/mi,'') #removes name markers from subtoc, go directly to substantive text @@ -1175,7 +1159,7 @@ WOK gsub(/ \d+<\/sup> /m,'') end %{<#{tag} class="#{attrib}"> - #{txt} #{note} + #{txt} #{note} } end def subtoc_lev5 -- cgit v1.2.3