aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib/sisu/v5/html_tune.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sisu/v5/html_tune.rb')
-rw-r--r--lib/sisu/v5/html_tune.rb12
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/sisu/v5/html_tune.rb b/lib/sisu/v5/html_tune.rb
index ceadcf50..8ed292c7 100644
--- a/lib/sisu/v5/html_tune.rb
+++ b/lib/sisu/v5/html_tune.rb
@@ -80,7 +80,7 @@ module SiSU_HTML_Tune
def initialize(data,md)
@data,@md=data,md
@file=SiSU_Env::InfoFile.new(@md.fns)
- @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
@@ -124,11 +124,15 @@ module SiSU_HTML_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
songsheet_array(@data)
#data=songsheet_array(@data)
- 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
SiSU_HTML_Tune::Output.new(@data,@md).hard_output
SiSU_HTML_Tune::Output.new(@data,@md).marshal
end