diff options
Diffstat (limited to 'lib/sisu/v5/epub_tune.rb')
| -rw-r--r-- | lib/sisu/v5/epub_tune.rb | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/sisu/v5/epub_tune.rb b/lib/sisu/v5/epub_tune.rb index c017c2df..5ec5fa56 100644 --- a/lib/sisu/v5/epub_tune.rb +++ b/lib/sisu/v5/epub_tune.rb @@ -80,7 +80,7 @@ module SiSU_EPUB_Tune def initialize(data,md) @data,@md=data,md @file=SiSU_Env::FileOp.new(@md) - @cX=SiSU_Screen::Ansi.new(@md.opt.cmd).cX + @cX=SiSU_Screen::Ansi.new(@md.opt.act[:color_state][:set]).cX end def hard_output @filename_tune=@file.write_file_processing.html_tune @@ -121,13 +121,17 @@ module SiSU_EPUB_Tune end def songsheet begin - @cX=SiSU_Screen::Ansi.new(@md.opt.cmd).cX - SiSU_Screen::Ansi.new(@md.opt.cmd,'Tune').txt_grey if @md.opt.cmd =~/[MVv]/ + @cX=SiSU_Screen::Ansi.new(@md.opt.act[:color_state][:set]).cX + if (@md.opt.act[:verbose][:set]==:on \ + || @md.opt.act[:verbose_plus][:set]==:on \ + || @md.opt.act[:maintenance][:set]==:on) + SiSU_Screen::Ansi.new(@md.opt.act[:color_state][:set],'Tune').txt_grey + end data=SiSU_EPUB_Tune::Tune.new(@data,@md).amp_angle_brackets data=SiSU_EPUB_Tune::Tune.new(data,@md).endnotes_html data=SiSU_EPUB_Tune::Tune.new(data,@md).url_markup data=SiSU_EPUB_Tune::Tune.new(data,@md).markup - if @md.opt.cmd =~/M/ #Hard Output Tune Optional on/off here + if @md.opt.act[:maintenance][:set]==:on #Hard Output Tune Optional on/off here data=SiSU_EPUB_Tune::Output.new(data,@md).hard_output SiSU_EPUB_Tune::Output.new(data,@md).marshal end |