From 79ebe464455d352b82c3dce446e8e3789e85d515 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Tue, 12 Mar 2013 20:11:41 -0400
Subject: v4: terminal reporting, cosmetic

---
 lib/sisu/v4/concordance.rb | 2 +-
 lib/sisu/v4/db_create.rb   | 6 +++---
 lib/sisu/v4/param.rb       | 8 ++++++--
 lib/sisu/v4/xhtml.rb       | 2 +-
 lib/sisu/v4/xml.rb         | 2 +-
 lib/sisu/v4/xml_dom.rb     | 2 +-
 6 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'lib')

diff --git a/lib/sisu/v4/concordance.rb b/lib/sisu/v4/concordance.rb
index db8059a0..c7a77a36 100644
--- a/lib/sisu/v4/concordance.rb
+++ b/lib/sisu/v4/concordance.rb
@@ -84,7 +84,7 @@ module SiSU_Concordance
           ? "#{@env.program.web_browser} #{@md.file.output_path.html_concordance.dir}/#{@md.file.base_filename.html_concordance}"
           : "[#{@opt.f_pth[:lng_is]}] #{@opt.fno}"
           @md.opt.cmd=~/[MVvz]/ \
-          ? SiSU_Screen::Ansi.new(@opt.cmd,"Concordance",tool).grey_title_hi
+          ? SiSU_Screen::Ansi.new(@opt.cmd,"Concordance",tool).green_hi_blue
           : SiSU_Screen::Ansi.new(@opt.cmd,'Concordance',tool).green_title_hi
         end
         wordmax=@env.concord_max
diff --git a/lib/sisu/v4/db_create.rb b/lib/sisu/v4/db_create.rb
index a7e6c774..e5b8dc78 100644
--- a/lib/sisu/v4/db_create.rb
+++ b/lib/sisu/v4/db_create.rb
@@ -84,9 +84,9 @@ module SiSU_DbCreate
     def create_db
       @env=SiSU_Env::InfoEnv.new(@opt.fns)
       tell=(@sql_type=='sqlite') \
-      ? SiSU_Screen::Ansi.new(@opt.cmd,'invert','Create Sqlite db tables in:',%{"#{@file}"})
-      : SiSU_Screen::Ansi.new(@opt.cmd,'invert','Create PG db tables in:',%{"#{Db[:name_prefix]}#{@env.path.stub_pwd}"})
-      tell.colorize if @opt.cmd =~/[vVM]/
+      ? SiSU_Screen::Ansi.new(@opt.cmd,'Create SQLite db tables in:',%{"#{@file}"})
+      : SiSU_Screen::Ansi.new(@opt.cmd,'Create pgSQL db tables in:',%{"#{Db[:name_prefix]}#{@env.path.stub_pwd}"})
+      tell.dark_grey_title_hi if @opt.cmd =~/[vVM]/
       SiSU_Env::SystemCall.new.create_pg_db(@env.path.stub_pwd) if @sql_type=='pg' #watch use of path.stub_pwd instead of stub
     end
     def output_dir?
diff --git a/lib/sisu/v4/param.rb b/lib/sisu/v4/param.rb
index 375e2af8..360625e4 100644
--- a/lib/sisu/v4/param.rb
+++ b/lib/sisu/v4/param.rb
@@ -1154,8 +1154,12 @@ module SiSU_Param
                 tf="@title: #{tf}"
                 @title=SiSU_Param::Parameters::Md.new(tf.strip,@opt,@env).title
               end
-              @html_title=@title.full.gsub(/(<p>|<p \/>|<br>|<br \/>)/,'')
-              SiSU_Screen::Ansi.new(@opt.cmd,'Parameters',@html_title).txt_grey if @opt.cmd =~/v/
+              creator=(defined? @creator.author \
+              && @creator.author.is_a?(String)) \
+              ? " #{@creator.author}"
+              : ''
+              title=%{"#{@title.full.gsub(/(<p>|<p \/>|<br>|<br \/>)/,'')}",}
+              SiSU_Screen::Ansi.new(@opt.cmd,'Parameters',%{#{title}#{creator}}).txt_grey if @opt.cmd =~/v/
             end
             if not @book_idx \
             and para =~/^=\{(.+?)\}\s*$/
diff --git a/lib/sisu/v4/xhtml.rb b/lib/sisu/v4/xhtml.rb
index bd04b3f4..c6dca8fb 100644
--- a/lib/sisu/v4/xhtml.rb
+++ b/lib/sisu/v4/xhtml.rb
@@ -93,7 +93,7 @@ module SiSU_XHTML
           else "[#{@opt.f_pth[:lng_is]}] #{@opt.fno}"
           end
           @opt.cmd=~/[MVvz]/ \
-          ? SiSU_Screen::Ansi.new(@opt.cmd,'invert','XHTML',tool).colorize
+          ? SiSU_Screen::Ansi.new(@opt.cmd,'XHTML',tool).green_hi_blue
           : SiSU_Screen::Ansi.new(@opt.cmd,'XHTML',tool).green_title_hi
           SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"/#{@md.file.output_path.xhtml.dir}/#{@md.file.base_filename.xhtml}").flow if @opt.cmd =~/[MV]/
         end
diff --git a/lib/sisu/v4/xml.rb b/lib/sisu/v4/xml.rb
index 7a788257..e82fe58c 100644
--- a/lib/sisu/v4/xml.rb
+++ b/lib/sisu/v4/xml.rb
@@ -91,7 +91,7 @@ module SiSU_XML_SAX
           else "[#{@opt.f_pth[:lng_is]}] #{@opt.fno}"
           end
           @opt.cmd=~/[MVvz]/ \
-          ? SiSU_Screen::Ansi.new(@opt.cmd,'invert','XML SAX',tool).colorize
+          ? SiSU_Screen::Ansi.new(@opt.cmd,'XML SAX',tool).green_hi_blue
           : SiSU_Screen::Ansi.new(@opt.cmd,'XML SAX',tool).green_title_hi
           SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"file://#{@md.file.output_path.xml_sax.dir}/#{@md.file.base_filename.xml_sax}").flow if @opt.cmd =~/[MV]/
         end
diff --git a/lib/sisu/v4/xml_dom.rb b/lib/sisu/v4/xml_dom.rb
index 822566db..a5aafd03 100644
--- a/lib/sisu/v4/xml_dom.rb
+++ b/lib/sisu/v4/xml_dom.rb
@@ -92,7 +92,7 @@ module SiSU_XML_DOM
           else "[#{@opt.f_pth[:lng_is]}] #{@opt.fno}"
           end
           @opt.cmd=~/[MVvz]/ \
-          ? SiSU_Screen::Ansi.new(@opt.cmd,'invert','XML DOM',tool).colorize
+          ? SiSU_Screen::Ansi.new(@opt.cmd,'XML DOM',tool).green_hi_blue
           : SiSU_Screen::Ansi.new(@opt.cmd,'XML DOM',tool).green_title_hi
           SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"file://#{@md.file.output_path.xml_dom.dir}/#{@md.file.base_filename.xml_dom}").flow if @opt.cmd =~/[MV]/
         end
-- 
cgit v1.2.3