From 44464e284ee840ee0ef7eae2d3f8d589680b18ca Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Tue, 19 Apr 2011 21:37:52 -0400
Subject: v3: param, md remove md.cmd and md.mod shortcut methods, use use
 md.opt

* affects many files that now use @md.opt.cmd & @md.opt.mod
  (instead of @md.cmd & @md.mod)
---
 lib/sisu/v3/epub.rb | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

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

diff --git a/lib/sisu/v3/epub.rb b/lib/sisu/v3/epub.rb
index b76beb17..8b2b2d1d 100644
--- a/lib/sisu/v3/epub.rb
+++ b/lib/sisu/v3/epub.rb
@@ -141,9 +141,9 @@ module SiSU_EPUB
         SiSU_Env::SiSU_file.new(@md).mkdir.output.epub
       end
       def tuned_file_instructions
-        @tell=SiSU_Screen::Ansi.new(@md.cmd)
-        @md.cmd=@md.cmd.gsub(/H/,'h')
-        @md.file_type='html' if @md.cmd =~/[hon]/
+        @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
@@ -191,10 +191,10 @@ module SiSU_EPUB
         @md,@data=md,data
         @vz=SiSU_Env::Get_init.instance.skin
         @epub=SiSU_EPUB_Format::Head_information.new(@md)
-        @tell=SiSU_Screen::Ansi.new(@md.cmd) if @md
+        @tell=SiSU_Screen::Ansi.new(@md.opt.cmd) if @md
       end
       def songsheet #extracts toc for scroll & seg
-        SiSU_Screen::Ansi.new(@md.cmd,'Toc').txt_grey if @md.cmd =~/[MVv]/
+        SiSU_Screen::Ansi.new(@md.opt.cmd,'Toc').txt_grey if @md.opt.cmd =~/[MVv]/
         toc=nil
         @@firstseg=nil
         @@toc={ seg: [], seg_mini: [], scr: [], ncx: [], opf: [] }
@@ -272,7 +272,7 @@ module SiSU_EPUB
                 @@toc[:seg] << toc[:seg]
                 @@toc[:scr] << toc[:seg]
                 @@toc[:seg_mini] << toc[:seg_mini] if toc[:seg_mini]
-              rescue; SiSU_Errors::Info_error.new($!,$@,@md.cmd,@md.fns).error
+              rescue; SiSU_Errors::Info_error.new($!,$@,@md.opt.cmd,@md.fns).error
               end
             end
           end
@@ -490,7 +490,7 @@ module SiSU_EPUB
       def in_common
         toc_shared=[]
         segtoc=[]
-        SiSU_Screen::Ansi.new(@md.cmd,'Scroll & Segtoc').txt_grey if @md.cmd =~/[MVv]/
+        SiSU_Screen::Ansi.new(@md.opt.cmd,'Scroll & Segtoc').txt_grey if @md.opt.cmd =~/[MVv]/
         format_head_toc=SiSU_EPUB_Format::Head_toc.new(@md)
         dochead=format_head_toc.head
         dochead.gsub!(/toc\.(html)/,'doc.\1') #kludge
@@ -611,7 +611,7 @@ module SiSU_EPUB
             end
           end
           out.close
-        rescue; SiSU_Errors::Info_error.new($!,$@,@md.cmd,@md.fns).error
+        rescue; SiSU_Errors::Info_error.new($!,$@,@md.opt.cmd,@md.fns).error
         end
       end
       def epub_metadata_opf
@@ -623,7 +623,7 @@ module SiSU_EPUB
             end
           end
           out.close
-        rescue; SiSU_Errors::Info_error.new($!,$@,@md.cmd,@md.fns).error
+        rescue; SiSU_Errors::Info_error.new($!,$@,@md.opt.cmd,@md.fns).error
         end
       end
       def images
@@ -646,7 +646,7 @@ module SiSU_EPUB
           mv #{@epub_doc} #{@md.file.place_file.epub}
           cd #{Dir.pwd}
         ")
-        unless @md.cmd.inspect =~/M/
+        unless @md.opt.cmd.inspect =~/M/
           system("rm -r #{@md.env.processing_path.epub}")
         end
       end
@@ -663,7 +663,7 @@ module SiSU_EPUB
           end
           filename_html_segtoc.close
           filename_html_index.close
-        rescue; SiSU_Errors::Info_error.new($!,$@,@md.cmd,@md.fns).error
+        rescue; SiSU_Errors::Info_error.new($!,$@,@md.opt.cmd,@md.fns).error
         end
       end
     end
-- 
cgit v1.2.3