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/html_segments.rb | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

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

diff --git a/lib/sisu/v3dv/html_segments.rb b/lib/sisu/v3dv/html_segments.rb
index 75c9b90f..20ab0726 100644
--- a/lib/sisu/v3dv/html_segments.rb
+++ b/lib/sisu/v3dv/html_segments.rb
@@ -61,7 +61,7 @@ module SiSU_HTML_Seg
   require_relative 'html'                               # html.rb
   require_relative 'html_promo'                         # html_promo.rb
   require_relative 'shared_metadata'                    # shared_metadata.rb
-  class SegOutput
+  class Output
     def initialize(md,outputfile,seg,minitoc,type='')
       @md,@output_seg_file,@seg,@minitoc,@type=md,outputfile,seg,minitoc,type
       @title_banner_=SiSU_Env::CreateSite.new(@md.opt.cmd).html_seg_title_banner?
@@ -147,7 +147,7 @@ module SiSU_HTML_Seg
         @minitoc=SiSU_HTML::Source::Toc.new(@md,@data).minitoc
         data=get_subtoc_endnotes(@data)
         data=articles(data)
-        Seg.new.cleanup # (((( added ))))
+        SiSU_HTML_Seg::Seg.new.cleanup # (((( added ))))
         #### (((( END )))) ####
       rescue; SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error
       ensure
@@ -234,7 +234,7 @@ module SiSU_HTML_Seg
                 unless FileTest.directory?(@file.output_path.html_seg.dir)
                   FileUtils::mkdir_p(@file.output_path.html_seg.dir) if File.writable?("#{@file.output_path.base.dir}/.")
                 end
-                Seg.new(@md).tail
+                SiSU_HTML_Seg::Seg.new(@md).tail
                 segfilename="#{@file.output_path.html_seg.dir}/#{@@seg_name_html[tracking-1]}#{@md.lang_code_insert}#{Sfx[:html]}"
                 output_seg_file=File.new(segfilename,'w') if @@seg_name_html[tracking-1]
                 minitoc=(@env.html_minitoc?) \
@@ -242,27 +242,27 @@ module SiSU_HTML_Seg
                 : ''
                 if dob.is=='heading' \
                 or @@seg_name_html[tracking-1] !~/endnotes|book_index|metadata/
-                  SegOutput.new(@md,output_seg_file,@@seg,minitoc).output
+                  SiSU_HTML_Seg::Output.new(@md,output_seg_file,@@seg,minitoc).output
                 elsif dob.is=='heading_insert'
                   if @@seg_name_html[tracking-1]=='endnotes'
-                    SegOutput.new(@md,output_seg_file,@@seg,minitoc,'endnotes').output
+                    SiSU_HTML_Seg::Output.new(@md,output_seg_file,@@seg,minitoc,'endnotes').output
                   elsif @@seg_name_html[tracking-1]=='book_index'
-                    SegOutput.new(@md,output_seg_file,@@seg,minitoc,'idx').output
+                    SiSU_HTML_Seg::Output.new(@md,output_seg_file,@@seg,minitoc,'idx').output
                     @@seg[:idx]=[]
                   elsif @@seg_name_html[tracking-1]=='metadata'
-                    SegOutput.new(@md,output_seg_file,@@seg,minitoc,'metadata').output
+                    SiSU_HTML_Seg::Output.new(@md,output_seg_file,@@seg,minitoc,'metadata').output
                   else puts "#{__FILE__}::#{__LINE__}"
                   end
                 else puts "#{__FILE__}::#{__LINE__}"
                 end
-                Seg.new.reinitialise
+                SiSU_HTML_Seg::Seg.new.reinitialise
                 heading_art(dob)
                 head(dob)
                #keep use for last segment, eg if metadata is last segment
                #if @@seg_name_html[tracking] =~/metadata/ # this is for metadata
                #  segfilename="#{@md.dir_out}/#{@md.fnl[:pre]}#{@@seg_name_html[tracking]}#{@md.fnl[:mid]}#{Sfx[:html]}#{@md.fnl[:post]}"
                #  output_seg_file=File.new(segfilename,'w')
-               #  SegOutput.new(@md,output_seg_file,@@seg,minitoc,'metadata').output
+               #  SiSU_HTML_Seg::Output.new(@md,output_seg_file,@@seg,minitoc,'metadata').output
                #  Seg.new.reinitialise
                #end
               end
-- 
cgit v1.2.3