From 41796e30e4597c74e7e42c3144dbe5d4fb0687c5 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Tue, 22 Jul 2014 21:30:56 -0400
Subject: v5 v6: cosmetic code

---
 lib/sisu/v5/xml_odf_odt.rb | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

(limited to 'lib/sisu/v5/xml_odf_odt.rb')

diff --git a/lib/sisu/v5/xml_odf_odt.rb b/lib/sisu/v5/xml_odf_odt.rb
index e05fc9f7..9bcb29d6 100644
--- a/lib/sisu/v5/xml_odf_odt.rb
+++ b/lib/sisu/v5/xml_odf_odt.rb
@@ -96,11 +96,23 @@ module SiSU_XML_ODF_ODT
           (@opt.act[:verbose][:set]==:on \
           || @opt.act[:verbose_plus][:set]==:on \
           || @opt.act[:maintenance][:set]==:on) \
-          ? SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],'Opendocument (ODF:ODT)',tool).green_hi_blue
-          : SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],'Opendocument (ODF:ODT)',tool).green_title_hi
+          ? SiSU_Screen::Ansi.new(
+              @opt.act[:color_state][:set],
+              'Opendocument (ODF:ODT)',
+              tool
+            ).green_hi_blue
+          : SiSU_Screen::Ansi.new(
+              @opt.act[:color_state][:set],
+              'Opendocument (ODF:ODT)',
+              tool
+            ).green_title_hi
           if (@opt.act[:verbose_plus][:set]==:on \
           || @opt.act[:maintenance][:set]==:on)
-            SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],@opt.fns,"file://#{@md.file.output_path.odt.dir}/#{@md.file.base_filename.odt}").flow
+            SiSU_Screen::Ansi.new(
+              @opt.act[:color_state][:set],
+              @opt.fns,
+              "file://#{@md.file.output_path.odt.dir}/#{@md.file.base_filename.odt}"
+            ).flow
           end
         end
         SiSU_XML_ODF_ODT::Source::Scroll.new(@particulars).songsheet
@@ -236,7 +248,12 @@ module SiSU_XML_ODF_ODT
           if FileTest.file?("#{img_src}/#{i}")
             img_src
           else
-            SiSU_Screen::Ansi.new(@md.opt.act[:color_state][:set],"ERROR - image:",%{"#{i}" missing},"search locations: #{@env.path.image_source_include_local},#{@env.path.image_source_include_remote} and #{@env.path.image_source_include}").error2 unless @md.opt.act[:quiet][:set]==:on
+            SiSU_Screen::Ansi.new(
+              @md.opt.act[:color_state][:set],
+              "ERROR - image:",
+              %{"#{i}" missing},
+              "search locations: #{@env.path.image_source_include_local},#{@env.path.image_source_include_remote} and #{@env.path.image_source_include}"
+            ).error2 unless @md.opt.act[:quiet][:set]==:on
             nil
           end
         elsif @md.fns =~/\.ss[tm]$/ \
@@ -249,7 +266,12 @@ module SiSU_XML_ODF_ODT
         and FileTest.file?("#{@env.path.image_source_include_remote}/#{i}")
           @env.path.image_source_include_remote
         else
-          SiSU_Screen::Ansi.new(@md.opt.act[:color_state][:set],"ERROR - image:",%{"#{i}" missing},"search locations: #{@env.path.image_source_include_local},#{@env.path.image_source_include_remote} and #{@env.path.image_source_include}").error2 unless @md.opt.act[:quiet][:set]==:on
+          SiSU_Screen::Ansi.new(
+            @md.opt.act[:color_state][:set],
+            "ERROR - image:",
+              %{"#{i}" missing},
+              "search locations: #{@env.path.image_source_include_local},#{@env.path.image_source_include_remote} and #{@env.path.image_source_include}"
+          ).error2 unless @md.opt.act[:quiet][:set]==:on
           nil
         end
       end
-- 
cgit v1.2.3