v4 (v3): html, includes book index fix, rest cosmetic

6 files changed, 32 insertions, 28 deletions

diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index 5bb22bd9..6c1c2f27 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -37,6 +37,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.3.8.orig.tar.xz
 
 * v3: sysenv, on --redirect, stop creation of redundant dir
 
+* v3: html, includes book index fix, rest cosmetic
+
 %% 3.3.7.orig.tar.xz (2013-01-31:04/4)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_3.3.7
 http://www.jus.uio.no/sisu/pkg/src/sisu_3.3.7.orig.tar.xz
diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4
index de1d868e..4cba3498 100644
--- a/data/doc/sisu/CHANGELOG_v4
+++ b/data/doc/sisu/CHANGELOG_v4
@@ -26,6 +26,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.5.orig.tar.xz
 
 * v4: sysenv, on --redirect, stop creation of redundant dir
 
+* v4: html, includes book index fix, rest cosmetic
+
 %% 4.0.4.orig.tar.xz (2013-01-31:04/4)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.4
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.4-1
diff --git a/lib/sisu/v3/html.rb b/lib/sisu/v3/html.rb
index 2dbb688b..7faf8f99 100644
--- a/lib/sisu/v3/html.rb
+++ b/lib/sisu/v3/html.rb
@@ -542,14 +542,16 @@ WOK
         toc_shared << format_head_toc.scroll_head_title_banner_open
         @segtoc << format_head_toc.seg_head_title_banner_open
         tmp_head=nil
-        doc_title_endnote=@md.title.full.gsub(/(\*+)/,'<sup><a href="#endnotes">\1</a></sup>')
+        doc_title_endnote=@md.title.full.gsub(/(\*+)/,
+          '<sup><a href="#endnotes">\1</a></sup>')
         tmp_head=doc_title_endnote + "\n"
         txt_obj={ txt: tmp_head }
         format_txt_obj=SiSU_HTML_Format::FormatTextObject.new(@md,txt_obj)
         toc_shared << format_txt_obj.center_bold
         @segtoc << format_txt_obj.center_bold
         if defined? @md.creator.author
-          creator_endnote=@md.creator.author.gsub(/(\*+)/,%{&nbsp;<sup><a href="#notes">\\1</a></sup>})
+          creator_endnote=@md.creator.author.gsub(/(\*+)/,
+            %{&nbsp;<sup><a href="#notes">\\1</a></sup>})
           tmp_head=creator_endnote + "\n"
           txt_obj={ txt: tmp_head }
           format_txt_obj=SiSU_HTML_Format::FormatTextObject.new(@md,txt_obj)
@@ -657,11 +659,9 @@ WOK
         ensure
           @filename_html_segtoc.close
           pwd_set=Dir.pwd
-          idx_lnk=if @o_str.dump_or_redirect?
-            @file.base_filename.manifest
-          else
-            @file.base_filename.html_segtoc
-          end
+          idx_lnk=(@o_str.dump_or_redirect?) \
+          ? @file.base_filename.manifest
+          : @file.base_filename.html_segtoc
           mlnk=@file.base_filename.html_seg_index
           Dir.chdir(@file.output_path.html_seg.dir)
           FileUtils::rm_f(mlnk)
diff --git a/lib/sisu/v3/html_scroll.rb b/lib/sisu/v3/html_scroll.rb
index 15bea9eb..07fa5d98 100644
--- a/lib/sisu/v3/html_scroll.rb
+++ b/lib/sisu/v3/html_scroll.rb
@@ -86,7 +86,8 @@ module SiSU_HTML_Scroll
         dob.obj=dob.obj.gsub(/#{@md.file.output_path.html_seg.rel_image}/m,@md.file.output_path.html_scroll.rel_image)
         if defined? dob.name and dob.name =~/^meta/ \
         and dob.obj =~/Document Information/
-          dob.obj=dob.obj.gsub(/(Document Information(?: \(metadata\))?)/,'\1<a name="docinfo"></a>')
+          dob.obj=dob.obj.gsub(/(Document Information(?: \(metadata\))?)/,
+            '\1<a name="docinfo"></a>')
         end
         if dob.obj =~/^Metadata$/ \
         and dob.lv =='B'
@@ -152,7 +153,8 @@ module SiSU_HTML_Scroll
               sto.heading_body4
               book_idx=SiSU_Particulars::CombinedSingleton.instance.get_idx_html(@md.opt).html_idx
               book_idx.each do |x| #takes book index prepared for segments & strips segment identifying info
-                x=x.gsub(/<a href="\S+?\.html#(\d+)">(\1(?:-\d+)?)<\/a>/,'<a href="#\1">\2</a>')
+                x.gsub!(/<a href="\S+?\.html#(\d+)">(\1(?:-\d+)?)<\/a>/,
+                  '<a href="#\1">\2</a>')
               end
               book_idx.join("\n")
             elsif dob.ln==5
@@ -170,11 +172,9 @@ module SiSU_HTML_Scroll
             and dob.indent =~/[0-9]/ \
             and dob.hang =~/[0-9]/
               if dob.bullet_
-                if dob.indent =~/[1-9]/
-                  sto.format('li',"i#{dob.indent}")
-                else
-                  sto.format('li','bullet')
-                end
+                (dob.indent =~/[1-9]/) \
+                ? sto.format('li',"i#{dob.indent}")
+                : sto.format('li','bullet')
               elsif dob.indent == dob.hang
                 sto.format('p',"i#{dob.indent}")
               elsif dob.indent != dob.hang
diff --git a/lib/sisu/v4/html.rb b/lib/sisu/v4/html.rb
index 57ac79c1..9233a5f2 100644
--- a/lib/sisu/v4/html.rb
+++ b/lib/sisu/v4/html.rb
@@ -541,14 +541,16 @@ WOK
         toc_shared << format_head_toc.scroll_head_title_banner_open
         @segtoc << format_head_toc.seg_head_title_banner_open
         tmp_head=nil
-        doc_title_endnote=@md.title.full.gsub(/(\*+)/,'<sup><a href="#endnotes">\1</a></sup>')
+        doc_title_endnote=@md.title.full.gsub(/(\*+)/,
+          '<sup><a href="#endnotes">\1</a></sup>')
         tmp_head=doc_title_endnote + "\n"
         txt_obj={ txt: tmp_head }
         format_txt_obj=SiSU_HTML_Format::FormatTextObject.new(@md,txt_obj)
         toc_shared << format_txt_obj.center_bold
         @segtoc << format_txt_obj.center_bold
         if defined? @md.creator.author
-          creator_endnote=@md.creator.author.gsub(/(\*+)/,%{&nbsp;<sup><a href="#notes">\\1</a></sup>})
+          creator_endnote=@md.creator.author.gsub(/(\*+)/,
+            %{&nbsp;<sup><a href="#notes">\\1</a></sup>})
           tmp_head=creator_endnote + "\n"
           txt_obj={ txt: tmp_head }
           format_txt_obj=SiSU_HTML_Format::FormatTextObject.new(@md,txt_obj)
@@ -656,11 +658,9 @@ WOK
         ensure
           @filename_html_segtoc.close
           pwd_set=Dir.pwd
-          idx_lnk=if @o_str.dump_or_redirect?
-            @file.base_filename.manifest
-          else
-            @file.base_filename.html_segtoc
-          end
+          idx_lnk=(@o_str.dump_or_redirect?) \
+          ? @file.base_filename.manifest
+          : @file.base_filename.html_segtoc
           mlnk=@file.base_filename.html_seg_index
           Dir.chdir(@file.output_path.html_seg.dir)
           FileUtils::rm_f(mlnk)
diff --git a/lib/sisu/v4/html_scroll.rb b/lib/sisu/v4/html_scroll.rb
index f8d104bb..a8d84c9d 100644
--- a/lib/sisu/v4/html_scroll.rb
+++ b/lib/sisu/v4/html_scroll.rb
@@ -86,7 +86,8 @@ module SiSU_HTML_Scroll
         dob.obj=dob.obj.gsub(/#{@md.file.output_path.html_seg.rel_image}/m,@md.file.output_path.html_scroll.rel_image)
         if defined? dob.name and dob.name =~/^meta/ \
         and dob.obj =~/Document Information/
-          dob.obj=dob.obj.gsub(/(Document Information(?: \(metadata\))?)/,'\1<a name="docinfo"></a>')
+          dob.obj=dob.obj.gsub(/(Document Information(?: \(metadata\))?)/,
+            '\1<a name="docinfo"></a>')
         end
         if dob.obj =~/^Metadata$/ \
         and dob.lv =='B'
@@ -152,7 +153,8 @@ module SiSU_HTML_Scroll
               sto.heading_body4
               book_idx=SiSU_Particulars::CombinedSingleton.instance.get_idx_html(@md.opt).html_idx
               book_idx.each do |x| #takes book index prepared for segments & strips segment identifying info
-                x=x.gsub(/<a href="\S+?\.html#(\d+)">(\1(?:-\d+)?)<\/a>/,'<a href="#\1">\2</a>')
+                x.gsub!(/<a href="\S+?\.html#(\d+)">(\1(?:-\d+)?)<\/a>/,
+                  '<a href="#\1">\2</a>')
               end
               book_idx.join("\n")
             elsif dob.ln==5
@@ -170,11 +172,9 @@ module SiSU_HTML_Scroll
             and dob.indent =~/[0-9]/ \
             and dob.hang =~/[0-9]/
               if dob.bullet_
-                if dob.indent =~/[1-9]/
-                  sto.format('li',"i#{dob.indent}")
-                else
-                  sto.format('li','bullet')
-                end
+                (dob.indent =~/[1-9]/) \
+                ? sto.format('li',"i#{dob.indent}")
+                : sto.format('li','bullet')
               elsif dob.indent == dob.hang
                 sto.format('p',"i#{dob.indent}")
               elsif dob.indent != dob.hang