v3: ansi screen reporting include document language code

15 files changed, 32 insertions, 24 deletions

diff --git a/lib/sisu/v3/composite.rb b/lib/sisu/v3/composite.rb
index 674618f9..33c15cc0 100644
--- a/lib/sisu/v3/composite.rb
+++ b/lib/sisu/v3/composite.rb
@@ -186,7 +186,7 @@ module SiSU_Assemble
     def insertions?
       data=@fns_array
       tuned_file,imagedir=[],[]
-      SiSU_Screen::Ansi.new(@opt.cmd,'Composite Document',@opt.fns).grey_title_hi unless @opt.cmd =~/q/
+      SiSU_Screen::Ansi.new(@opt.cmd,'Composite Document',"[#{@opt.f_pth[:lng_is]}] #{@opt.fns}").grey_title_hi unless @opt.cmd =~/q/
       para=data.each do |para|
         if para =~/^<<\s+(\S+?\.ss[it])$/ \
         or para =~/^<<\{(\S+?\.ss[it])\}$/ \
diff --git a/lib/sisu/v3/concordance.rb b/lib/sisu/v3/concordance.rb
index 91b63778..2c1c9ddf 100644
--- a/lib/sisu/v3/concordance.rb
+++ b/lib/sisu/v3/concordance.rb
@@ -77,7 +77,9 @@ module SiSU_Concordance
         @env,@md=@particulars.env,@particulars.md
         loc=@env.url.output_tell
         unless @md.opt.cmd =~/q/
-          tool=(@md.opt.cmd =~/[MVv]/) ? "#{@env.program.web_browser} #{@md.file.output_path.html_concordance.dir}/#{@md.file.base_filename.html_concordance}" : @md.fns
+          tool=(@md.opt.cmd =~/[MVv]/) \
+          ? "#{@env.program.web_browser} #{@md.file.output_path.html_concordance.dir}/#{@md.file.base_filename.html_concordance}" \
+          : "[#{@opt.f_pth[:lng_is]}]"
           @md.opt.cmd=~/[MVvz]/ \
           ? SiSU_Screen::Ansi.new(@md.opt.cmd,"Concordance",tool).grey_title_hi \
           : SiSU_Screen::Ansi.new(@md.opt.cmd,'Concordance',tool).green_title_hi
diff --git a/lib/sisu/v3/dal.rb b/lib/sisu/v3/dal.rb
index 28e7193d..2475a6ea 100644
--- a/lib/sisu/v3/dal.rb
+++ b/lib/sisu/v3/dal.rb
@@ -240,7 +240,7 @@ module SiSU_DAL
       unless @opt.cmd =~/q/
         tell=(@opt.cmd=~/[vVM]/) \
         ? SiSU_Screen::Ansi.new(@opt.cmd,'Document Abstraction') \
-        : SiSU_Screen::Ansi.new(@opt.cmd,'Document Abstraction',@opt.fns)
+        : SiSU_Screen::Ansi.new(@opt.cmd,'Document Abstraction',"[#{@opt.f_pth[:lng_is]}] #{@opt.fns}")
         tell.green_title_hi
       end
       fn=(@fnx && @fnx =~/\.ss[tmi]$/) \
diff --git a/lib/sisu/v3/digests.rb b/lib/sisu/v3/digests.rb
index 8f89bbe3..a4be38e4 100644
--- a/lib/sisu/v3/digests.rb
+++ b/lib/sisu/v3/digests.rb
@@ -77,7 +77,7 @@ module SiSU_Digest_view
         unless @opt.cmd =~/q/
           tool=(@opt.cmd =~/[MVv]/) \
           ? "#{@env.program.text_editor} file://#{@md.file.output_path.hash_digest.dir}/#{@md.file.base_filename.hash_digest}" \
-          : @opt.fns
+          : "[#{@opt.f_pth[:lng_is]}] #{@opt.fns}"
           @opt.cmd=~/[MVvz]/ \
           ? SiSU_Screen::Ansi.new(@opt.cmd,"Document #{@dg} Digests",tool).green_hi_blue \
           : SiSU_Screen::Ansi.new(@opt.cmd,"Document #{@dg} Digests",tool).green_title_hi
diff --git a/lib/sisu/v3/epub.rb b/lib/sisu/v3/epub.rb
index 7293c601..2522b68a 100644
--- a/lib/sisu/v3/epub.rb
+++ b/lib/sisu/v3/epub.rb
@@ -86,7 +86,7 @@ module SiSU_EPUB
         loc=@env.path.url.output_tell
         unless @opt.cmd =~/q/
           tool=if @opt.cmd =~/[MVvz]/; "#{@env.program.epub_viewer} #{@md.file.output_path.epub.dir}/#{@md.file.base_filename.epub}"
-          else                      @opt.fns
+          else                      "[#{@opt.f_pth[:lng_is]}] #{@opt.fns}"
           end
           @opt.cmd=~/[MVvz]/ \
           ? SiSU_Screen::Ansi.new(@opt.cmd,'EPUB',tool).green_hi_blue \
diff --git a/lib/sisu/v3/html.rb b/lib/sisu/v3/html.rb
index d77d3df6..744cceca 100644
--- a/lib/sisu/v3/html.rb
+++ b/lib/sisu/v3/html.rb
@@ -88,7 +88,7 @@ module SiSU_HTML
         loc=@env.url.output_tell
         unless @opt.cmd =~/q/
           tool=if @opt.cmd =~/[MVvz]/; "#{@env.program.web_browser} file://#{@md.file.output_path.html_seg.dir}/#{@md.file.base_filename.html_segtoc}"
-          else                          @opt.fns
+          else                          "[#{@opt.f_pth[:lng_is]}] #{@opt.fns}"
           end
           @opt.cmd=~/[MVvz]/ \
           ? SiSU_Screen::Ansi.new(@opt.cmd,'HTML',tool).green_hi_blue \
diff --git a/lib/sisu/v3/manifest.rb b/lib/sisu/v3/manifest.rb
index a21b31f9..bed74aab 100644
--- a/lib/sisu/v3/manifest.rb
+++ b/lib/sisu/v3/manifest.rb
@@ -88,7 +88,7 @@ module SiSU_Manifest
           url_html="file://#{@md.file.output_path.manifest.dir}/#{@md.file.base_filename.manifest}"
           @opt.cmd=~/[MVvz]/ \
           ? SiSU_Screen::Ansi.new(@opt.cmd,'Manifest',"#{xbrowser} #{url_html}").green_hi_blue \
-          : SiSU_Screen::Ansi.new(@opt.cmd,'Manifest',@opt.fns).green_title_hi
+          : SiSU_Screen::Ansi.new(@opt.cmd,'Manifest',"[#{@opt.f_pth[:lng_is]}] #{@opt.fns}").green_title_hi
           SiSU_Screen::Ansi.new(@opt.cmd,"#{browser} #{url_html}").grey_tab if @opt.cmd =~/v/i
         end
         data=SiSU_HTML::Source::Html_environment.new(@particulars).tuned_file_instructions
diff --git a/lib/sisu/v3/manpage.rb b/lib/sisu/v3/manpage.rb
index 17fef80b..00515e7f 100644
--- a/lib/sisu/v3/manpage.rb
+++ b/lib/sisu/v3/manpage.rb
@@ -84,10 +84,13 @@ module SiSU_Manpage
         @env=SiSU_Env::Info_env.new(@opt.fns)
         path=@env.path.output_tell
         tool=(@opt.cmd =~/[MVv]/) \
-        ?  "#{@env.program.text_editor} #{@md.file.output_path.manpage}/#{@md.file.base_filename.manpage}" \
-        : ''
-        SiSU_Screen::Ansi.new(@opt.cmd,'Manpage',tool).green_hi_blue unless @opt.cmd =~/q/
-        SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@md.file.output_path.manpage}/#{@md.file.base_filename.manpage}").flow if @opt.cmd =~/[MV]/
+        ?  "#{@env.program.text_editor} #{@md.file.output_path.manpage.dir}/#{@md.file.base_filename.manpage}" \
+        : "[#{@opt.f_pth[:lng_is]}] #{@opt.fns}"
+        @opt.cmd=~/[MVvz]/ \
+        && @opt.cmd !~/q/ \
+        ? SiSU_Screen::Ansi.new(@opt.cmd,'Manpage',tool).green_hi_blue \
+        : SiSU_Screen::Ansi.new(@opt.cmd,'Manpage',tool).green_title_hi
+        SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@md.file.output_path.manpage.dir}/#{@md.file.base_filename.manpage}").flow if @opt.cmd =~/[MV]/
         @dal_array=SiSU_DAL::Source.new(@opt).get # dal file drawn here
         SiSU_Manpage::Source::Scroll.new(@md,@dal_array).songsheet
         SiSU_Env::Info_skin.new(@md).select #watch
diff --git a/lib/sisu/v3/odf.rb b/lib/sisu/v3/odf.rb
index a223600e..c42ce349 100644
--- a/lib/sisu/v3/odf.rb
+++ b/lib/sisu/v3/odf.rb
@@ -85,7 +85,7 @@ module SiSU_ODF
         unless @opt.cmd =~/q/
           tool=(@opt.cmd =~/[MVv]/) \
           ? "#{@env.program.odf_viewer} file://#{@md.file.output_path.odt.dir}/#{@md.file.base_filename.odt}" \
-          : @opt.fns
+          : "[#{@opt.f_pth[:lng_is]}] #{@opt.fns}"
           @opt.cmd=~/[MVvz]/ \
           ? SiSU_Screen::Ansi.new(@opt.cmd,'Opendocument (ODF:ODT)',tool).green_hi_blue \
           : SiSU_Screen::Ansi.new(@opt.cmd,'Opendocument (ODF:ODT)',tool).green_title_hi
diff --git a/lib/sisu/v3/plaintext.rb b/lib/sisu/v3/plaintext.rb
index 09ecf56c..cd5e2ea3 100644
--- a/lib/sisu/v3/plaintext.rb
+++ b/lib/sisu/v3/plaintext.rb
@@ -85,7 +85,7 @@ module SiSU_Plaintext
           path=env.path.output_tell
           tool=(@opt.cmd =~/[MVv]/) \
           ? "#{env.program.text_editor} #{md.file.output_path.txt.dir}/#{md.file.base_filename.txt}" \
-          : @opt.fns
+          : "[#{@opt.f_pth[:lng_is]}] #{@opt.fns}"
           @opt.cmd=~/[MVvz]/ \
           ? SiSU_Screen::Ansi.new(@opt.cmd,'Plaintext',tool).green_hi_blue \
           : SiSU_Screen::Ansi.new(@opt.cmd,'Plaintext',tool).green_title_hi
diff --git a/lib/sisu/v3/texinfo.rb b/lib/sisu/v3/texinfo.rb
index f7693056..7281a7f9 100644
--- a/lib/sisu/v3/texinfo.rb
+++ b/lib/sisu/v3/texinfo.rb
@@ -96,17 +96,20 @@ module SiSU_TexInfo
     end
     def song
       begin
-        unless @opt.cmd =~/q/
-          tell=SiSU_Screen::Ansi.new(@opt.cmd,'TexInfo')
-          tell.green_title_hi
-        end
+        tool=(@opt.cmd =~/[MVv]/) \
+        ?  "#{@env.program.texinfo} #{@md.file.output_path.texinfo.dir}/#{@md.file.base_filename.texinfo}" \
+        : "[#{@opt.f_pth[:lng_is]}] #{@opt.fns}"
+        tell=@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
+        tell
         @md=SiSU_Param::Parameters.new(@opt).get
-        puts "\t#{@@cX.grey}TexInfo#{@@cX.off}"
         directories
         @marshalfile=SiSU_Env::Info_file.new(@opt.fns).marshal.dal_content
         if FileTest.file?(@marshalfile)==true
           File.open(@marshalfile) { |f| @@tuned_file=Marshal.load(f)}
-          tell.meta_verse_skipped unless @opt.cmd =~/q/
+          #tell.meta_verse_skipped if @opt.cmd =~/[vVM]/
         else
           tex_array=IO.readlines(@opt.fns,'')
           SiSU_Metaverse.songsheet(tex_array)
diff --git a/lib/sisu/v3/texpdf.rb b/lib/sisu/v3/texpdf.rb
index 918e00a2..c9e0f032 100644
--- a/lib/sisu/v3/texpdf.rb
+++ b/lib/sisu/v3/texpdf.rb
@@ -103,11 +103,11 @@ module SiSU_TeX
     def song
       begin
         @md=@particulars.md
-        SiSU_Screen::Ansi.new(@opt.cmd,'LaTeX/PDF',@md.fns).green_title_hi unless @opt.cmd =~/q/
+        SiSU_Screen::Ansi.new(@opt.cmd,'LaTeX/PDF',"[#{@opt.f_pth[:lng_is]}] #{@opt.fns}").green_title_hi unless @opt.cmd =~/q/
         if @opt.cmd =~/[MVv]/
           path=@env.url.output_tell
           SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@env.program.pdf_viewer} #{@md.file.output_path.pdf.dir}/#{@md.file.base_filename.pdf_l}pdf").flow
-          SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@env.program.pdf_viewer} #{@md.file.output_path.pdf.dir}/#{@md.file.base_filename.pdf_p}pdf").flow
+          SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@opt.fns} #{@env.program.pdf_viewer} #{@md.file.output_path.pdf.dir}/#{@md.file.base_filename.pdf_p}pdf").flow
         end
         @md=@particulars.md
         $flag=@md.opt.cmd                                                          #introduced to pass 0 for no object citation numbers... to texpdf_format
diff --git a/lib/sisu/v3/xhtml.rb b/lib/sisu/v3/xhtml.rb
index a1b393f2..ba8238d2 100644
--- a/lib/sisu/v3/xhtml.rb
+++ b/lib/sisu/v3/xhtml.rb
@@ -86,7 +86,7 @@ module SiSU_XHTML
 
           tool=if @opt.cmd =~/[MV]/; "#{@env.program.web_browser} file://#{@md.file.output_path.xhtml.dir}/#{@md.file.base_filename.xhtml}#{path}/#{@md.fnb}/#{@md.fn[:xhtml]}\n\t#{@env.program.xml_viewer} file://#{@md.file.output_path.xhtml.dir}/#{@md.file.base_filename.xhtml}#{path}/#{@md.fnb}/#{@md.fn[:xhtml]}"
           elsif @opt.cmd =~/v/; "#{@env.program.web_browser} file://#{@md.file.output_path.xhtml.dir}/#{@md.file.base_filename.xhtml}"
-          else @opt.fns
+          else "[#{@opt.f_pth[:lng_is]}] #{@opt.fns}"
           end
           @opt.cmd=~/[MVvz]/ \
           ? SiSU_Screen::Ansi.new(@opt.cmd,'invert','XHTML',tool).colorize \
diff --git a/lib/sisu/v3/xml.rb b/lib/sisu/v3/xml.rb
index e821cfd4..23cfb5bc 100644
--- a/lib/sisu/v3/xml.rb
+++ b/lib/sisu/v3/xml.rb
@@ -85,7 +85,7 @@ module SiSU_XML_SAX
           loc=@env.url.output_tell
           tool=if @opt.cmd =~/[MV]/; "#{@env.program.web_browser} file://#{@md.file.output_path.xml_sax.dir}/#{@md.file.base_filename.xml_sax}\n\t#{@env.program.xml_viewer} file://#{@md.file.output_path.xml_sax.dir}/#{@md.file.base_filename.xml_sax}"
           elsif @opt.cmd =~/v/; "#{@env.program.web_browser} file://#{@md.file.output_path.xml_sax.dir}/#{@md.file.base_filename.xml_sax}"
-          else @opt.fns
+          else "[#{@opt.f_pth[:lng_is]}] #{@opt.fns}"
           end
           @opt.cmd=~/[MVvz]/ \
           ? SiSU_Screen::Ansi.new(@opt.cmd,'invert','XML SAX',tool).colorize \
diff --git a/lib/sisu/v3/xml_dom.rb b/lib/sisu/v3/xml_dom.rb
index db6a8786..22b11ebc 100644
--- a/lib/sisu/v3/xml_dom.rb
+++ b/lib/sisu/v3/xml_dom.rb
@@ -83,7 +83,7 @@ module SiSU_XML_DOM
           loc=@env.url.output_tell
           tool=if @opt.cmd =~/[MV]/; "#{@env.program.web_browser}  file://#{@md.file.output_path.xml_dom.dir}/#{@md.file.base_filename.xml_dom}\n\t#{@env.program.xml_viewer} file://#{@md.file.output_path.xml_dom.dir}/#{@md.file.base_filename.xml_dom}"
           elsif @opt.cmd =~/v/; "#{@env.program.web_browser} file://#{@md.file.output_path.xml_dom.dir}/#{@md.file.base_filename.xml_dom}"
-          else @opt.fns
+          else "[#{@opt.f_pth[:lng_is]}] #{@opt.fns}"
           end
           @opt.cmd=~/[MVvz]/ \
           ? SiSU_Screen::Ansi.new(@opt.cmd,'invert','XML DOM',tool).colorize \