diff options
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v4 | 2 | ||||
| -rw-r--r-- | lib/sisu/v4/epub_format.rb | 15 | ||||
| -rw-r--r-- | lib/sisu/v4/html_format.rb | 30 | ||||
| -rw-r--r-- | lib/sisu/v4/html_scroll.rb | 2 | ||||
| -rw-r--r-- | lib/sisu/v4/html_segments.rb | 2 |
5 files changed, 24 insertions, 27 deletions
diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4 index 12a289a4..0f0ea8e2 100644 --- a/data/doc/sisu/CHANGELOG_v4 +++ b/data/doc/sisu/CHANGELOG_v4 @@ -35,6 +35,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.10.orig.tar.xz * v4: sysenv, set default output (directory layout) type where none configured (also turned off reporting where imagemagick & graphicsmagick not installed) +* v4: html, epub, minor "cleaning" of output + %% 4.0.9.orig.tar.xz (2013-02-22:07/5) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.9 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.9-1 diff --git a/lib/sisu/v4/epub_format.rb b/lib/sisu/v4/epub_format.rb index 49139667..683228c3 100644 --- a/lib/sisu/v4/epub_format.rb +++ b/lib/sisu/v4/epub_format.rb @@ -70,25 +70,26 @@ module SiSU_EPUB_Format make=SiSU_Env::ProcessingSettings.new(@md) if make.build.ocn? ocn_class='ocn' - if @ocn.to_i==0 - @ocn.gsub(/^(\d+|)$/,'') + if @ocn==nil \ + or @ocn.to_i==0 \ + or @ocn.empty? + %{<label class="ocn_off"></label>} else @ocn.gsub(/^(\d+|)$/, %{<label class="#{ocn_class}"><a href="#o\\1" class="lnk#{ocn_class}">\\1</a></label>}) end else - ocn_class='ocn_off' - @ocn.gsub(/^(\d+|)$/,'') + %{<label class="ocn_off"></label>} end end def name - %{<a name="#{@ocn}"></a>} + (@ocn==nil || @ocn.empty?) ? '' : %{<a name="#{@ocn}"></a>} end def id #w3c? "tidy" complains about numbers as identifiers ! annoying - (@ocn.empty?) ? '' : %{id="o#{@ocn}"} + (@ocn==nil || @ocn.empty?) ? '' : %{id="o#{@ocn}"} end def goto - %{<a href="##{@ocn}">} + (@ocn==nil || @ocn.empty?) ? '' : %{<a href="##{@ocn}">} end end class CSS diff --git a/lib/sisu/v4/html_format.rb b/lib/sisu/v4/html_format.rb index 25a8dbee..f96db380 100644 --- a/lib/sisu/v4/html_format.rb +++ b/lib/sisu/v4/html_format.rb @@ -70,27 +70,25 @@ module SiSU_HTML_Format make=SiSU_Env::ProcessingSettings.new(@md) if make.build.ocn? ocn_class='ocn' - if @ocn.to_i==0 - @ocn.gsub(/^(\d+|)$/, - %{<label class="#{ocn_class}"><a name="#{@ocn}"> </a></label>}) + if @ocn.to_i==0 \ + or @ocn.empty? + %{<label class="ocn_off"> </label>} else @ocn.gsub(/^(\d+|)$/, %{<label class="#{ocn_class}"><a name="#{@ocn}" href="##{@ocn}" class="lnk#{ocn_class}">\\1</a></label>}) end else - ocn_class='ocn_off' - @ocn.gsub(/^(\d+|)$/, - %{<label class="#{ocn_class}"> </label>}) + %{<label class="ocn_off"> </label>} end end def name - %{<a name="#{@ocn}"></a>} + (@ocn==nil || @ocn.empty?) ? '' : %{<a name="#{@ocn}"></a>} end def id #w3c? "tidy" complains about numbers as identifiers ! annoying - %{id="o#{@ocn}"} + (@ocn==nil || @ocn.empty?) ? '' : %{id="o#{@ocn}"} end def goto - %{<a href="##{@ocn}">} + (@ocn==nil || @ocn.empty?) ? '' : %{<a href="##{@ocn}">} end end class HeadInformation @@ -517,15 +515,13 @@ WOK %{<p class="small_left">Prefix: #{@md.prefix_b}<p />} end def scroll_head_title_banner_open - %{<center> -#{@md.icon} -</center> + icon=@md.icon ? %{<center>\n#{@md.icon}\n</center>} : '' + %{#{icon} #{@vz.banner_instrument_cover_band_scr}} end def seg_head_title_banner_open - %{<center> - #{@md.icon} -</center> + icon=@md.icon ? %{<center>\n#{@md.icon}\n</center>} : '' + %{#{icon} #{@vz.banner_instrument_cover_band_seg}} end def make_scroll @@ -619,8 +615,6 @@ WOK <a name="stop" id="stop"></a> <a name="credits"></a> </div> -</div> -</div> } end def seg_navigation_tail #this is a bug area, look up and "tidy" @@ -1029,7 +1023,7 @@ WOK end def heading_normal(tag,attrib) section_break=(tag=~/h[1-4]/) \ - ? '<p><hr width=90% /></p>' + ? '<br /><hr width=90% /><br />' : '' %{#{section_break} <div class="substance"> diff --git a/lib/sisu/v4/html_scroll.rb b/lib/sisu/v4/html_scroll.rb index 84ec0515..f3711460 100644 --- a/lib/sisu/v4/html_scroll.rb +++ b/lib/sisu/v4/html_scroll.rb @@ -129,7 +129,7 @@ module SiSU_HTML_Scroll end elsif dob.is==:break \ and dob.from==:markup - '<p><hr width=90% /></p>' + '<br /><hr width=90% /><br />' elsif dob.is==:heading_insert x=if dob.ln==1 unless dob.obj.empty? diff --git a/lib/sisu/v4/html_segments.rb b/lib/sisu/v4/html_segments.rb index 21fdc7cc..55335845 100644 --- a/lib/sisu/v4/html_segments.rb +++ b/lib/sisu/v4/html_segments.rb @@ -480,7 +480,7 @@ module SiSU_HTML_Seg sto.table elsif dob.is==:break \ and dob.from==:markup - '<p><hr width=90% /></p>' + '<br /><hr width=90% /><br />' end if @md.flag_separate_endnotes dob.obj=dob.obj.gsub(/"\s+href="#_(\d+)">/,%{" href=\"endnotes#{Sfx[:html]}#_\\1">}) #endnote- twice #removed file type |