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/odf.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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

diff --git a/lib/sisu/v3/odf.rb b/lib/sisu/v3/odf.rb
index 894052d6..81344d4c 100644
--- a/lib/sisu/v3/odf.rb
+++ b/lib/sisu/v3/odf.rb
@@ -110,8 +110,8 @@ module SiSU_ODF
         @vz=SiSU_Env::Get_init.instance.skin
         @tab="\t"
         @brace_url=SiSU_Viz::Skin.new.url_decoration
-        @br=(@md.cmd =~/M/) ? '' : ''
-        #@br=(@md.cmd =~/M/) ? "\n" : ''
+        @br=(@md.opt.cmd =~/M/) ? '' : ''
+        #@br=(@md.opt.cmd =~/M/) ? "\n" : ''
       end
       def songsheet
         begin
@@ -120,9 +120,9 @@ module SiSU_ODF
           post
           publish
         ensure
-          unless @md.cmd =~/[MV]/ #check maintenance flag
+          unless @md.opt.cmd =~/[MV]/ #check maintenance flag
             if @env.processing_path.odt =~/od[ft]/
-              #p "rm -r #{@env.processing_path.odt}" if @md.cmd =~/v/
+              #p "rm -r #{@env.processing_path.odt}" if @md.opt.cmd =~/v/
               system("rm -r #{@env.processing_path.odf_pth}")
               #system("rm -r #{@env.processing_path.odt}")
             end
@@ -198,7 +198,7 @@ module SiSU_ODF
         and FileTest.file?("#{@env.path.image_source_include_remote}/#{i}")
           @env.path.image_source_include_remote
         else
-          SiSU_Screen::Ansi.new(@md.cmd,"ERROR - image:",%{"#{i}" missing},"search locations: #{@env.path.image_source_include_local},#{@env.path.image_source_include_remote} and #{@env.path.image_source_include}").error2 unless @md.cmd =~/q/
+          SiSU_Screen::Ansi.new(@md.opt.cmd,"ERROR - image:",%{"#{i}" missing},"search locations: #{@env.path.image_source_include_local},#{@env.path.image_source_include_remote} and #{@env.path.image_source_include}").error2 unless @md.opt.cmd =~/q/
           nil
         end
       end
@@ -521,7 +521,7 @@ module SiSU_ODF
         end
         odf_metadata
         data.each do |dob|
-          #p dob.obj if dob.obj =~safe_characters and @md.cmd =~/V/ #KEEP
+          #p dob.obj if dob.obj =~safe_characters and @md.opt.cmd =~/V/ #KEEP
           dob.obj='' if dob.obj =~/#{Mx[:lv_o]}\d+:.*?#{Mx[:lv_c]}.+?#{Mx[:pa_non_object_dummy_heading]}/ #fix Mx[:lv_o]
           para_array=[]
           dob.obj.gsub!(/</,'&lt;'); dob.obj.gsub!(/>/,'&gt;')
-- 
cgit v1.2.3