diff options
| author | Ralph Amissah <ralph@amissah.com> | 2012-06-06 22:52:26 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2012-06-06 22:52:46 -0400 |
| commit | 7b13cb9a7b1eefb4b2b4415a970d59aba779d4de (patch) | |
| tree | 1b53a1bdc343af91749d0760dde097277f6b2366 | |
| parent | v3: html, excludes (options) --exc-html-top-band, touch (diff) | |
v3: html_segments, @make.build.html_navigation?, fix, (excludes --exc-html-)
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v3 | 2 | ||||
| -rw-r--r-- | lib/sisu/v3/html_segments.rb | 13 |
2 files changed, 11 insertions, 4 deletions
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index 2a395864..c6c1d1c2 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -28,6 +28,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.2.12.orig.tar.xz * v3: excludes --exc-html- * html (toc & scroll), (html_segments, concordance,) exclude top band, touch sisu --exc-top-band --html --concordance filename.sst + * html_segments, @make.build.html_navigation? fix + v3: screen reporting, ansi colors, cosmetic * Rake, Rant installer sisu installer require ruby >= 1.9.3 diff --git a/lib/sisu/v3/html_segments.rb b/lib/sisu/v3/html_segments.rb index cf6f2cfd..b527eaba 100644 --- a/lib/sisu/v3/html_segments.rb +++ b/lib/sisu/v3/html_segments.rb @@ -350,11 +350,16 @@ module SiSU_HTML_Seg def head(dob) clean=/<!.*?!>|<:.*?>/ format_head_seg=SiSU_HTML_Format::HeadSeg.new(@md) - if @@tracker < @@seg_total-1 - if @@tracker==0; @@segtocband=format_head_seg.toc_next2 #if format_head_seg.toc_next2 - else @@segtocband=format_head_seg.toc_pre_next2 #if format_head_seg.toc_pre_next2 + if @make.build.html_navigation? + if @@tracker < @@seg_total-1 + @@segtocband=if @@tracker==0 + format_head_seg.toc_next2 #if format_head_seg.toc_next2 + else + format_head_seg.toc_pre_next2 #if format_head_seg.toc_pre_next2 + end + else @@segtocband=format_head_seg.toc_pre2 #if format_head_seg.toc_pre2 end - else @@segtocband=format_head_seg.toc_pre2 #if format_head_seg.toc_pre2 + else @@segtocband='' end @p_num ||= '' if @@is1==1 |