From d98f27086318452017b80952a297f2ccb05bc4b1 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Mon, 1 Oct 2012 16:09:17 -0400
Subject: v3: some fixes, cleaning, removing

---
 lib/sisu/v3/epub.rb | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

(limited to 'lib/sisu/v3/epub.rb')

diff --git a/lib/sisu/v3/epub.rb b/lib/sisu/v3/epub.rb
index f3b94e3d..a4dce6ab 100644
--- a/lib/sisu/v3/epub.rb
+++ b/lib/sisu/v3/epub.rb
@@ -142,7 +142,6 @@ module SiSU_EPUB
       def tuned_file_instructions
         @tell=SiSU_Screen::Ansi.new(@md.opt.cmd)
         @md.opt.cmd=@md.opt.cmd.gsub(/H/,'h')
-        @md.file_type='html' if @md.opt.cmd =~/[hon]/
         directories
         dal_array=@particulars.dal_array # dal file drawn here
         @tuned_file_array=SiSU_EPUB_Tune::Tune.new(dal_array,@md).songsheet
@@ -490,10 +489,6 @@ module SiSU_EPUB
         dochead=dochead.gsub(/toc\.(html)/,'doc.\1') #kludge
         toc_shared << dochead #<< ads.div.major
         segtoc << format_head_toc.head #<< ads.div.major
-        if SiSU_EPUB_Format::HeadToc.method_defined? :toc_head_escript
-          toc_shared << format_head_toc.toc_head_escript
-          segtoc << format_head_toc.toc_head_escript
-        end
         if defined? @md.rights.all \
         and @md.rights.all
           rights=format_head_toc.rights.all
@@ -504,8 +499,6 @@ module SiSU_EPUB
           prefix_b=format_head_toc.prefix_b
           prefix_b=SiSU_EPUB_Tune::CleanXHTML.new(prefix_b).clean
         end
-        seg_toc_band=format_head_toc.seg_head_navigation_band
-        seg_toc_band_bottom=format_head_toc.seg_head_navigation_band_bottom
         tmp_head=nil
         doc_title_endnote=@md.title.full.gsub(/(\*+)/,'<sup><a href="#endnotes">\1</a></sup>')
         tmp_head=doc_title_endnote + "\n"
@@ -522,7 +515,6 @@ module SiSU_EPUB
           toc_shared << format_txt_obj.center_bold
           segtoc << format_txt_obj.center_bold
         end
-        segtoc << seg_toc_band
         tmp_head=nil
         if defined? @md.prefix_a \
         and @md.prefix_a
@@ -553,7 +545,6 @@ module SiSU_EPUB
           segtoc << prefix_b
         end
         #Segtoc tail added here
-        segtoc << seg_toc_band_bottom
         segtoc << format_head_toc.xhtml_close
         segtoc=segtoc.flatten.compact #watch
         SiSU_EPUB::Source::Output.new(@md,segtoc).segtoc
@@ -667,14 +658,14 @@ module SiSU_EPUB
       def segtoc
         begin
           if @make.build.toc?
-            filename_html_index=@make_file.epub.xhtml_index
+            filename_xhtml=@make_file.epub.xhtml_index
             @output.each do |para|
               para=para.strip
               unless para =~/\A\s*\Z/
-                filename_html_index.puts para,"\n"
+                filename_xhtml.puts para,"\n"
               end
             end
-            filename_html_index.close
+            filename_xhtml.close
           end
         rescue
           SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
-- 
cgit v1.2.3