Merge branch 'upstream' into debian/sid

1 files changed, 8 insertions, 8 deletions

diff --git a/lib/sisu/v3/xml_dom.rb b/lib/sisu/v3/xml_dom.rb
index 02180617..3f18a1b8 100644
--- a/lib/sisu/v3/xml_dom.rb
+++ b/lib/sisu/v3/xml_dom.rb
@@ -104,9 +104,9 @@ module SiSU_XML_DOM
       def songsheet
         begin
           SiSU_XML_DOM::Source::Scroll.new(@particulars).songsheet
-          SiSU_XML_DOM::Source::Tidy.new(@md,@env).xml if @md.cmd =~/[vVM]/ # test wellformedness, comment out when not in use
-          SiSU_Rexml::Rexml.new(@md,@file.place_file.xml_dom).xml if @md.cmd =~/M/ # test rexml parsing, comment out when not in use #debug
-        rescue; SiSU_Errors::Info_error.new($!,$@,@md.cmd,@md.fns).error
+          SiSU_XML_DOM::Source::Tidy.new(@md,@env).xml if @md.opt.cmd =~/[vVM]/ # test wellformedness, comment out when not in use
+          SiSU_Rexml::Rexml.new(@md,@file.place_file.xml_dom).xml if @md.opt.cmd =~/M/ # test rexml parsing, comment out when not in use #debug
+        rescue; SiSU_Errors::Info_error.new($!,$@,@md.opt.cmd,@md.fns).error
         ensure
         end
       end
@@ -519,14 +519,14 @@ WOK
       end
       def xml
         if @prog.tidy !=false
-          if @md.cmd =~/[VM]/
-            SiSU_Screen::Ansi.new(@md.cmd,'invert','Using XML Tidy','check document structure').colorize unless @md.cmd =~/q/
-            tell=SiSU_Screen::Ansi.new(@md.cmd,'invert','','')
-            tell.grey_open unless @md.cmd =~/q/
+          if @md.opt.cmd =~/[VM]/
+            SiSU_Screen::Ansi.new(@md.opt.cmd,'invert','Using XML Tidy','check document structure').colorize unless @md.opt.cmd =~/q/
+            tell=SiSU_Screen::Ansi.new(@md.opt.cmd,'invert','','')
+            tell.grey_open unless @md.opt.cmd =~/q/
             tidyfile='/dev/null' #don't want one or screen output, check for alternative flags
             tidy=SiSU_Env::System_call.new("#{@env.path.output}/#{@md.fnb}/#{@md.fn[:dom]}",tidyfile)
             tidy.well_formed?
-            tell.p_off unless @md.cmd =~/q/
+            tell.p_off unless @md.opt.cmd =~/q/
           end
         end
       end