From 44464e284ee840ee0ef7eae2d3f8d589680b18ca Mon Sep 17 00:00:00 2001 From: Ralph Amissah 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/sst_to_s_xml_sax.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'lib/sisu/v3/sst_to_s_xml_sax.rb') diff --git a/lib/sisu/v3/sst_to_s_xml_sax.rb b/lib/sisu/v3/sst_to_s_xml_sax.rb index e698a8f9..c9cdd241 100644 --- a/lib/sisu/v3/sst_to_s_xml_sax.rb +++ b/lib/sisu/v3/sst_to_s_xml_sax.rb @@ -120,9 +120,9 @@ module SiSU_simple_xml_model_sax def songsheet begin SiSU_simple_xml_model_sax::Convert::Scroll.new(@data,@particulars).songsheet - SiSU_simple_xml_model_sax::Convert::Tidy.new(@md,@env).xml if @md.cmd =~/[vVM]/ # test wellformedness, comment out when not in use - SiSU_Rexml::Rexml.new(@md,@md.fn[:sxs]).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_simple_xml_model_sax::Convert::Tidy.new(@md,@env).xml if @md.opt.cmd =~/[vVM]/ # test wellformedness, comment out when not in use + SiSU_Rexml::Rexml.new(@md,@md.fn[:sxs]).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 @@ -436,14 +436,14 @@ WOK end def xml if @prog.tidy !=false #note values can be other than true - if @md.cmd =~/[VM]/ - SiSU_Screen::Ansi.new(@md.cmd,'invert','Using XML Tidy','check document structure').colorize unless @md.cmd =~/q/ - SiSU_Screen::Ansi.new(@md.cmd,'','','check document structure') - 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/ + SiSU_Screen::Ansi.new(@md.opt.cmd,'','','check document structure') + 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("#{Dir.pwd}/#{@md.fn[:sxs]}",tidyfile) tidy.well_formed? - tell.p_off unless @md.cmd =~/q/ + tell.p_off unless @md.opt.cmd =~/q/ end end end -- cgit v1.2.3