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/digests.rb | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

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

diff --git a/lib/sisu/v2/digests.rb b/lib/sisu/v2/digests.rb
index 3f1c5445..12052631 100644
--- a/lib/sisu/v2/digests.rb
+++ b/lib/sisu/v2/digests.rb
@@ -74,16 +74,15 @@ module SiSU_Digest_view
     def read
       begin
         @env,@md,@dal_array=@particulars.env,@particulars.md,@particulars.dal_array
-        tool=if @opt.cmd =~/[MVv]/; "#{@env.program.text_editor} #{@env.path.output_tell}/#{@md.fnb}/#{@md.fn[:digest]}"
-        else @opt.fns
-        end
         unless @opt.cmd =~/q/
+          tool=(@opt.cmd =~/[MVv]/) \
+          ? "#{@env.program.text_editor} #{@env.path.output_tell}/#{@md.fnb}/#{@md.fn[:digest]}" \
+          : @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
+          SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@env.path.output_tell}/#{@md.fnb}/#{@md.fn[:digest]}").flow if @opt.cmd =~/[MV]/
         end
-        tell=SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@env.path.output_tell}/#{@md.fnb}/#{@md.fn[:digest]}")
-        tell.flow if @opt.cmd =~/[MV]/
         my_make=SiSU_Env::Create_file.new(@opt.cmd,@opt.fns)
         SiSU_Digest_view::Source::Scroll.new(@particulars).songsheet
         SiSU_Env::Info_skin.new(@md).select
@@ -199,8 +198,7 @@ module SiSU_Digest_view
                     elsif FileTest.file?("#{@env.path.image_source_tex}/#{i}")
                       @env.path.image_source_tex
                     else
-                      tell=SiSU_Screen::Ansi.new(@md.cmd,"ERROR - image:", %{"#{i}" missing}, "search locations: #{@env.path.image_source_local_tex}, #{@env.path.image_source_remote_tex} and #{@env.path.image_source_tex}")
-                      tell.error2 unless @md.cmd =~/q/
+                      SiSU_Screen::Ansi.new(@md.cmd,"ERROR - image:", %{"#{i}" missing}, "search locations: #{@env.path.image_source_local_tex}, #{@env.path.image_source_remote_tex} and #{@env.path.image_source_tex}").error2 unless @md.cmd =~/q/
                       nil
                     end
                     @img << /\S+\.(png|jpg|gif)/.match(i)[1]
-- 
cgit v1.2.3