Merge branch 'upstream' into debian/sid

1 files changed, 5 insertions, 5 deletions

diff --git a/lib/sisu/v3/epub_tune.rb b/lib/sisu/v3/epub_tune.rb
index 19453fc8..d691361b 100644
--- a/lib/sisu/v3/epub_tune.rb
+++ b/lib/sisu/v3/epub_tune.rb
@@ -77,7 +77,7 @@ module SiSU_EPUB_Tune
     def initialize(data,md)
       @data,@md=data,md
       @file=SiSU_Env::SiSU_file.new(@md)
-      @cX=SiSU_Screen::Ansi.new(@md.cmd).cX
+      @cX=SiSU_Screen::Ansi.new(@md.opt.cmd).cX
     end
     def hard_output
       @filename_tune=@file.write_file_processing.html_tune
@@ -206,18 +206,18 @@ module SiSU_EPUB_Tune
     end
     def songsheet
       begin
-        @cX=SiSU_Screen::Ansi.new(@md.cmd).cX
-        SiSU_Screen::Ansi.new(@md.cmd,'Tune').txt_grey if @md.cmd =~/[MVv]/
+        @cX=SiSU_Screen::Ansi.new(@md.opt.cmd).cX
+        SiSU_Screen::Ansi.new(@md.opt.cmd,'Tune').txt_grey if @md.opt.cmd =~/[MVv]/
         data=Tune.new(@data,@md).amp_html
         data=Tune.new(data,@md).endnotes_html
         data=Tune.new(data,@md).url_markup
         data=Tune.new(data,@md).markup
-        if @md.cmd =~/M/  #Hard Output Tune Optional on/off here
+        if @md.opt.cmd =~/M/  #Hard Output Tune Optional on/off here
           data=Output.new(data,@md).hard_output
           Output.new(data,@md).marshal
         end
         tuned=Tune.new(@data,@md).output
-      rescue; SiSU_Errors::Info_error.new($!,$@,@md.cmd,@md.fns).error
+      rescue; SiSU_Errors::Info_error.new($!,$@,@md.opt.cmd,@md.fns).error
       ensure
       end
     end