From edd89902036bde18c91031470e19c871a182cf6d Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Wed, 23 Oct 2013 23:40:45 -0400
Subject: v5: options & downstream, more use of opt.act instead of opt.cmd

* opt.act.*.set==:on instead of opt.cmd =~/\S/
---
 lib/sisu/v5/texinfo.rb | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'lib/sisu/v5/texinfo.rb')

diff --git a/lib/sisu/v5/texinfo.rb b/lib/sisu/v5/texinfo.rb
index aea3f372..623cee2d 100644
--- a/lib/sisu/v5/texinfo.rb
+++ b/lib/sisu/v5/texinfo.rb
@@ -103,13 +103,17 @@ module SiSU_TexInfo
     end
     def song
       begin
-        tool=(@opt.cmd =~/[MVv]/) \
+        tool=(@opt.act[:verbose][:set]==:on \
+        || @opt.act[:verbose_plus][:set]==:on \
+        || @opt.act[:maintenance][:set]==:on) \
         ?  "#{@env.program.texinfo} #{@md.file.output_path.texinfo.dir}/#{@md.file.base_filename.info}"
         : "[#{@opt.f_pth[:lng_is]}] #{@opt.fno}"
-        @opt.cmd=~/[MVvz]/ \
-        && @opt.cmd !~/q/ \
-        ? SiSU_Screen::Ansi.new(@opt.cmd,'TexInfo',tool).green_hi_blue
-        : SiSU_Screen::Ansi.new(@opt.cmd,'TexInfo',tool).green_title_hi
+        (@opt.act[:verbose][:set]==:on \
+        || @opt.act[:verbose_plus][:set]==:on \
+        || @opt.act[:maintenance][:set]==:on) \
+        && ! @opt.act[:quiet][:set]==:on \
+        ? SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],'TexInfo',tool).green_hi_blue
+        : SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],'TexInfo',tool).green_title_hi
         @md=SiSU_Param::Parameters.new(@opt).get
         directories
         @marshalfile=SiSU_Env::InfoFile.new(@opt.fns).marshal.dal_content
@@ -123,7 +127,7 @@ module SiSU_TexInfo
         tex_array=@@tuned_file
         TeXinfoMake.new(@md,tex_array).songsheet
         tex_array=''
-      rescue; STDERR.puts SiSU_Screen::Ansi.new(@opt.cmd,$!,$@).rescue
+      rescue; STDERR.puts SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],$!,$@).rescue
       ensure
       end
     end
@@ -151,7 +155,7 @@ module SiSU_TexInfo
         output(doc_txt)
         makeinfo #KEEP reinstate when fixed #%
         place_info
-      rescue; STDERR.puts SiSU_Screen::Ansi.new(@md.opt.cmd,$!,$@).rescue
+      rescue; STDERR.puts SiSU_Screen::Ansi.new(@md.opt.act[:color_state][:set],$!,$@).rescue
       ensure
       end
     end
@@ -384,7 +388,7 @@ module SiSU_TexInfo
     def output(data)
       filename_texinfo=%{#{@env.processing_path.texi}/#{@md.fnb}.texinfo}
       file_texinfo=File.new(filename_texinfo,'w+')
-      puts filename_texinfo if @md.opt.cmd =~/M/
+      puts filename_texinfo if @md.opt.act[:maintenance][:set]==:on
       data.each {|s| (file_texinfo.puts s,"\n") if s}
       file_texinfo.close
     end
-- 
cgit v1.2.3