ansi, screen info related, arranging

1 files changed, 15 insertions, 30 deletions

diff --git a/lib/sisu/v2/param.rb b/lib/sisu/v2/param.rb
index 5df8271e..3db97340 100644
--- a/lib/sisu/v2/param.rb
+++ b/lib/sisu/v2/param.rb
@@ -106,8 +106,7 @@ module SiSU_Param
           @md
         end
         if defined? @md.title.main # on removal check problems with -U
-          tell=SiSU_Screen::Ansi.new(@cmd,param_msg,@md.title.main)
-          tell.txt_grey if @cmd =~/[MVv]/
+          SiSU_Screen::Ansi.new(@cmd,param_msg,@md.title.main).txt_grey if @cmd =~/[MVv]/
         end
         @@md=@md
       else @@md
@@ -162,8 +161,7 @@ module SiSU_Param
           puts "#{n} is #{s.class}: programming error, String expected #{__FILE__}:#{__LINE__}"
           s
         else 
-          tell=SiSU_Screen::Ansi.new('v',"#{n} length #{s.length} exceeds set db field length #{l}, metadata dropped",@opt.fns)
-          tell.warn unless @opt.cmd =~/q/
+          SiSU_Screen::Ansi.new('v',"#{n} length #{s.length} exceeds set db field length #{l}, metadata dropped",@opt.fns).warn unless @opt.cmd =~/q/
           nil 
         end
       end
@@ -391,8 +389,7 @@ module SiSU_Param
             elsif @h['main']
               @h['main']
             else
-              tell=SiSU_Screen::Ansi.new(@cmd,'WARNING Document Copyright missing; provide @rights: :copyright:')
-              tell.warn unless @opt.cmd =~/q/
+              SiSU_Screen::Ansi.new(@cmd,'WARNING Document Copyright missing; provide @rights: :copyright:').warn unless @opt.cmd =~/q/
               ''
             end
             l,n=Db[:col_info_note],'rights.copyright.text'
@@ -459,8 +456,7 @@ module SiSU_Param
               s +=' License: ' + copyright.license
             end
             if s.empty?
-              tell=SiSU_Screen::Ansi.new(@cmd,'WARNING Document Rights information missing; provide @rights: :copyright:')
-              tell.warn unless @opt.cmd =~/q/
+              SiSU_Screen::Ansi.new(@cmd,'WARNING Document Rights information missing; provide @rights: :copyright:').warn unless @opt.cmd =~/q/
             else
               l,n=Db[:col_info_note],'rights.all'
               validate_length(s,l,n)
@@ -896,12 +892,10 @@ module SiSU_Param
             if ok
               tell.txt_green if @cmd =~/[vVM]/
             else
-              tell=SiSU_Screen::Ansi.new(@cmd,"Warning: markup version determined (#{@markup_version.determined}) or markup version declared (#{@markup_version_declared}) is newer than SiSU version (#{@sisu_version[:version]})")
-              tell.warn unless @cmd =~/q/
+              SiSU_Screen::Ansi.new(@cmd,"Warning: markup version determined (#{@markup_version.determined}) or markup version declared (#{@markup_version_declared}) is newer than SiSU version (#{@sisu_version[:version]})").warn unless @cmd =~/q/
             end
           else
-            tell=SiSU_Screen::Ansi.new(@cmd,'No SiSU markup version provided')
-            tell.warn if @cmd =~/[VM]/
+            SiSU_Screen::Ansi.new(@cmd,'No SiSU markup version provided').warn if @cmd =~/[VM]/
           end
         else
           mv=if defined? @markup_version.determined and not @markup_version.determined.nil?
@@ -909,8 +903,7 @@ module SiSU_Param
             "markup version determined #{x}"
           else ''
           end
-          tell=SiSU_Screen::Ansi.new(@cmd,'SiSU filetype indicator not provided',mv)
-          tell.warn unless @cmd =~/q/
+          SiSU_Screen::Ansi.new(@cmd,'SiSU filetype indicator not provided',mv).warn unless @cmd =~/q/
         end
         @code_flag=false
         fns_array.each do |para|                                                                                       #% Scan document
@@ -1035,8 +1028,7 @@ module SiSU_Param
                   @html_title=@title.gsub(/(<p>|<p \/>|<br>|<br \/>)/,'')
                   @title.chomp!("\n")
                   @html_title.chomp!("\n")
-                  tell=SiSU_Screen::Ansi.new(@cmd,'Parameters',@html_title)
-                  tell.txt_grey if @cmd =~/v/
+                  SiSU_Screen::Ansi.new(@cmd,'Parameters',@html_title).txt_grey if @cmd =~/v/
                 end
               end
             end
@@ -1213,8 +1205,7 @@ module SiSU_Param
         if @en[:note] > 0 \
         and @en[:sum] > 0
           if @en[:sum] > 0
-          else tell=SiSU_Screen::Ansi.new(@cmd,'both endnote styles used',"~{ #{@en[:sum]} }~ and ^~ #{@en[:mark]}")
-            tell.warn if @cmd !~/q/
+          else SiSU_Screen::Ansi.new(@cmd,'both endnote styles used',"~{ #{@en[:sum]} }~ and ^~ #{@en[:mark]}").warn if @cmd !~/q/
           end
         end
         if @en[:mark] != @en[:note] \
@@ -1225,12 +1216,10 @@ module SiSU_Param
           footnote_conversion_errors << "#{@fns}:\n\tendnotes: #{@en[:note]} != endnote reference marks: #{@en[:mark]} (difference = #{@en[:mismatch]})\n"
         end
         if @title.main !~/[\S]/
-          tell=SiSU_Screen::Ansi.new(@cmd,'WARNING Document Title missing','please provide @title:')
-          tell.warn unless @cmd =~/q/
+          SiSU_Screen::Ansi.new(@cmd,'WARNING Document Title missing','please provide @title:').warn unless @cmd =~/q/
         end
         if @author !~/[\S]/
-          tell=SiSU_Screen::Ansi.new(@cmd,'Warning Document Author missing','please provide @creator: :author:')
-          tell.warn unless @cmd =~/q/
+          SiSU_Screen::Ansi.new(@cmd,'Warning Document Author missing','please provide @creator: :author:').warn unless @cmd =~/q/
         end
         # Elementary Document Structure Analysis - adds complexity may remove - need to develop - appears to work, proof of concept
         if @title.nil?
@@ -1244,10 +1233,8 @@ module SiSU_Param
               @title.chomp!("\n")
               @html_title.chomp!("\n")
               title_trigger=1
-              tell=SiSU_Screen::Ansi.new(@cmd,@html_title)
-              tell.txt_cyan unless @cmd =~/q/
-              tell=SiSU_Screen::Ansi.new(@cmd,'Parameters')
-              tell.txt_grey unless @cmd =~/q/
+              SiSU_Screen::Ansi.new(@cmd,@html_title).txt_cyan unless @cmd =~/q/
+              SiSU_Screen::Ansi.new(@cmd,'Parameters').txt_grey unless @cmd =~/q/
             end
           end
         end
@@ -1315,8 +1302,7 @@ module SiSU_Param
         @lv5 ||=/^5~/
         @lv6 ||=/^6~/
         if @doc_skin
-          tell=SiSU_Screen::Ansi.new(@cmd,"doc_skin <- #{@doc_skin}")
-          tell.txt_grey if @cmd =~/v/
+          SiSU_Screen::Ansi.new(@cmd,"doc_skin <- #{@doc_skin}").txt_grey if @cmd =~/v/
         end
         @data=nil #else whole file's contents are stored in md pstore & is not required to be... big waste actually
         Store.new(self,@env).store                                                                                     #% pstore
@@ -1330,8 +1316,7 @@ module SiSU_Param
         end
         def store
           File.unlink(@pstorefile) if FileTest.file?(@pstorefile)
-          tell=SiSU_Screen::Ansi.new(@md.cmd,"PStore -> #{@pstorefile}")
-          tell.txt_grey if @md.cmd =~/[MV]/
+          SiSU_Screen::Ansi.new(@md.cmd,"PStore -> #{@pstorefile}").txt_grey if @md.cmd =~/[MV]/
           store=PStore.new(@pstorefile)
           store.transaction do
             store['md']=@md