From 3d6deb1d4a0e3a8ab8294e441cf2c0ff1075e4c6 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Mon, 23 Jan 2012 21:40:41 -0500
Subject: v3dv: call most methods by full name (include associated module &
 class names)

* messing with code, merge back now likely to become v3.2
---
 lib/sisu/v3dv/epub.rb | 45 +++++++++++----------------------------------
 1 file changed, 11 insertions(+), 34 deletions(-)

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

diff --git a/lib/sisu/v3dv/epub.rb b/lib/sisu/v3dv/epub.rb
index 250b428f..259cdbe0 100644
--- a/lib/sisu/v3dv/epub.rb
+++ b/lib/sisu/v3dv/epub.rb
@@ -106,7 +106,7 @@ module SiSU_EPUB
         data=@tuned_file_array
         scr_toc=SiSU_EPUB::Source::ScrollHeadAndSegToc.new(@md,toc).in_common #watch
         SiSU_EPUB::Source::Seg.new(@md,data).songsheet
-        SiSU_EPUB::Source::EPUB_Output.new(@md).songsheet
+        SiSU_EPUB::Source::Output.new(@md).songsheet
       rescue; SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error
       ensure
         unless @opt.cmd =~/[MV]/ #check maintenance flag
@@ -242,7 +242,7 @@ module SiSU_EPUB
               md_opf_a_content << @epub.metadata_opf.manifest_content(dob_toc,name_s_a)
               md_opf_a_spine << @epub.metadata_opf.spine(dob_toc,name_s_a)
               md_opf_a_guide << @epub.metadata_opf.guide(dob_toc,name_s_a)
-              Toc.new(@md,dob_toc).level_1
+              SiSU_EPUB::Source::Toc.new(@md,dob_toc).level_1
             when 2
               @s_b_no +=1
               name_s_b='section_b' + @s_b_no.to_s
@@ -257,7 +257,7 @@ module SiSU_EPUB
               md_opf_a_content << @epub.metadata_opf.manifest_content(dob_toc,name_s_b)
               md_opf_a_spine << @epub.metadata_opf.spine(dob_toc,name_s_b)
               md_opf_a_guide << @epub.metadata_opf.guide(dob_toc,name_s_b)
-              Toc.new(@md,dob_toc).level_2
+              SiSU_EPUB::Source::Toc.new(@md,dob_toc).level_2
             when 3
               @s_c_no +=1
               name_s_c='section_c' + @s_c_no.to_s
@@ -271,7 +271,7 @@ module SiSU_EPUB
               md_opf_a_content << @epub.metadata_opf.manifest_content(dob_toc,name_s_c)
               md_opf_a_spine << @epub.metadata_opf.spine(dob_toc,name_s_c)
               md_opf_a_guide << @epub.metadata_opf.guide(dob_toc,name_s_c)
-              Toc.new(@md,dob_toc).level_3
+              SiSU_EPUB::Source::Toc.new(@md,dob_toc).level_3
             when 4
               @ncx_cls=[]
               @nav_no+=1
@@ -281,9 +281,9 @@ module SiSU_EPUB
               md_opf_a_content << @epub.metadata_opf.manifest_content(dob_toc)
               md_opf_a_spine << @epub.metadata_opf.spine(dob_toc)
               md_opf_a_guide << @epub.metadata_opf.guide(dob_toc)
-              Toc.new(@md,dob_toc).level_4
-            when 5; Toc.new(@md,dob_toc).level_5
-            when 6; Toc.new(@md,dob_toc).level_6
+              SiSU_EPUB::Source::Toc.new(@md,dob_toc).level_4
+            when 5; SiSU_EPUB::Source::Toc.new(@md,dob_toc).level_5
+            when 6; SiSU_EPUB::Source::Toc.new(@md,dob_toc).level_6
             else nil
             end
             toc.each do |k,d|
@@ -318,8 +318,8 @@ module SiSU_EPUB
         @@toc[:opf] << @epub.metadata_opf.guide_open << md_opf_a_guide << @epub.metadata_opf.guide_close
         @@toc[:opf] << @epub.metadata_opf.package_close
         @@toc[:opf]=@@toc[:opf].flatten
-        EPUB_Output.new(@md,@@toc[:opf]).epub_metadata_opf
-        EPUB_Output.new(@md,@@toc[:ncx]).epub_toc_ncx
+        SiSU_EPUB::Source::Output.new(@md,@@toc[:opf]).epub_metadata_opf
+        SiSU_EPUB::Source::Output.new(@md,@@toc[:ncx]).epub_toc_ncx
         @md.firstseg=@@firstseg
         @@toc
       end
@@ -486,29 +486,6 @@ module SiSU_EPUB
         end
         toc
       end
-      def level_crosslink
-        dob=@data
-        if dob !~/^4~!/
-          dob.gsub!(/^4~!\s+(\S+)\s+(.+)/,
-            %{<table><tr><td width =\"80\"></td>
-  <td><a href="http://\\1">
-    #{@png.crosslink_ext}
-      &nbsp;&nbsp;\\2
-    <\/a>
-  </td></tr></table>
-})
-        else
-          dob.gsub!(/^4~!\s+(\S+)\s+(.+)/,
-            %{<table><tr><td width ="80">
-  </td><td>
-    <a href="\\1">
-      #{@png.crosslink}
-        &nbsp;&nbsp;\\2
-    <\/a>
-  </td></tr></table>
-})
-        end
-      end
     end
     class ScrollHeadAndSegToc < Toc
       def initialize(md='',toc='',links_guide_toc='')
@@ -590,7 +567,7 @@ module SiSU_EPUB
         segtoc << seg_toc_band_bottom
         segtoc << format_head_toc.xhtml_close
         segtoc.flatten!.compact!
-        EPUB_Output.new(@md,segtoc).segtoc
+        SiSU_EPUB::Source::Output.new(@md,segtoc).segtoc
         segtoc=[]
         @toc[:scr],@toc[:seg]=[],[]
         toc_shared
@@ -600,7 +577,7 @@ module SiSU_EPUB
     end
     class Seg < SiSU_EPUB_Seg::Seg
     end
-    class EPUB_Output
+    class Output
       def initialize(md,output='')
         @md,@output=md,output
         @epub_doc="#{@md.fnb}.epub"
-- 
cgit v1.2.3