From d9763aebaf71cf9629fdcf3c0e8818a1edb2b528 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sat, 1 May 2010 01:44:04 -0400
Subject: reduce screen output unless some verbose flag (such as -v) is used

---
 lib/sisu/v2/xhtml.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'lib/sisu/v2/xhtml.rb')

diff --git a/lib/sisu/v2/xhtml.rb b/lib/sisu/v2/xhtml.rb
index 80eb76d5..56371ef8 100644
--- a/lib/sisu/v2/xhtml.rb
+++ b/lib/sisu/v2/xhtml.rb
@@ -84,9 +84,13 @@ module SiSU_XHTML
         loc=@env.url.output_tell
         tool=if @opt.cmd =~/[MV]/; "#{@env.program.web_browser} #{loc}/#{@md.fnb}/#{@md.fn[:xhtml]}\n\t#{@env.program.xml_viewer} #{path}/#{@md.fnb}/#{@md.fn[:xhtml]}"
         elsif @opt.cmd =~/v/; "#{@env.program.web_browser} #{loc}/#{@md.fnb}/#{@md.fn[:xhtml]}"
-        else ''
+        else @opt.fns
+        end
+        unless @opt.cmd =~/q/
+          @opt.cmd=~/[MVvz]/ \
+          ? SiSU_Screen::Ansi.new(@opt.cmd,'invert','XHTML',tool).colorize \
+          : SiSU_Screen::Ansi.new(@opt.cmd,'XHTML',tool).green_title_hi
         end
-        SiSU_Screen::Ansi.new(@opt.cmd,'invert','XHTML',tool).colorize unless @opt.cmd =~/q/
         SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@env.path.output_tell}/#{@md.fnb}/#{@md.fn[:xhtml]}").flow if @opt.cmd =~/[MV]/
         SiSU_XHTML::Source::Songsheet.new(@particulars).song
       rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd,@opt.fns).error
-- 
cgit v1.2.3


From 67e49a2b278b1512fb39a33a779f68a1389f9849 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Mon, 3 May 2010 19:09:54 -0400
Subject: ansi, screen info related, arranging

---
 lib/sisu/v2/xhtml.rb | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'lib/sisu/v2/xhtml.rb')

diff --git a/lib/sisu/v2/xhtml.rb b/lib/sisu/v2/xhtml.rb
index 56371ef8..f142f3ce 100644
--- a/lib/sisu/v2/xhtml.rb
+++ b/lib/sisu/v2/xhtml.rb
@@ -80,18 +80,18 @@ module SiSU_XHTML
     def read
       begin
         @env,@md,@dal_array=@particulars.env,@particulars.md,@particulars.dal_array
-        path=@env.path.output_tell
-        loc=@env.url.output_tell
-        tool=if @opt.cmd =~/[MV]/; "#{@env.program.web_browser} #{loc}/#{@md.fnb}/#{@md.fn[:xhtml]}\n\t#{@env.program.xml_viewer} #{path}/#{@md.fnb}/#{@md.fn[:xhtml]}"
-        elsif @opt.cmd =~/v/; "#{@env.program.web_browser} #{loc}/#{@md.fnb}/#{@md.fn[:xhtml]}"
-        else @opt.fns
-        end
         unless @opt.cmd =~/q/
+          path=@env.path.output_tell
+          loc=@env.url.output_tell
+          tool=if @opt.cmd =~/[MV]/; "#{@env.program.web_browser} #{loc}/#{@md.fnb}/#{@md.fn[:xhtml]}\n\t#{@env.program.xml_viewer} #{path}/#{@md.fnb}/#{@md.fn[:xhtml]}"
+          elsif @opt.cmd =~/v/; "#{@env.program.web_browser} #{loc}/#{@md.fnb}/#{@md.fn[:xhtml]}"
+          else @opt.fns
+          end
           @opt.cmd=~/[MVvz]/ \
           ? SiSU_Screen::Ansi.new(@opt.cmd,'invert','XHTML',tool).colorize \
           : SiSU_Screen::Ansi.new(@opt.cmd,'XHTML',tool).green_title_hi
+          SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{path}/#{@md.fnb}/#{@md.fn[:xhtml]}").flow if @opt.cmd =~/[MV]/
         end
-        SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@env.path.output_tell}/#{@md.fnb}/#{@md.fn[:xhtml]}").flow if @opt.cmd =~/[MV]/
         SiSU_XHTML::Source::Songsheet.new(@particulars).song
       rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd,@opt.fns).error
       ensure
@@ -385,8 +385,8 @@ WOK
         if @prog.tidy !=false
           if @md.cmd =~/[VM]/
             unless @md.cmd =~/q/
-              tell=SiSU_Screen::Ansi.new(@md.cmd,'invert','Using XML Tidy','check document structure')
-              tell.colorize
+              SiSU_Screen::Ansi.new(@md.cmd,'invert','Using XML Tidy','check document structure').colorize
+              tell=SiSU_Screen::Ansi.new(@md.cmd,'invert','','')
               tell.grey_open
             end
             tidyfile='/dev/null' #don't want one or screen output, check for alternative flags
-- 
cgit v1.2.3