From 27bd56aee75594b16b1543bf05318fc17d11e2a9 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Tue, 5 Mar 2013 21:39:17 -0500
Subject: v4: texpdf, report to STDERR when pdf not generated (Closes: #617359)

* note: .tex file is almost certainly produced by sisu, this will be a sisu
  packaging, texlive dependency issue, preventing its conversion to pdf
---
 data/doc/sisu/CHANGELOG_v4   | 4 ++++
 lib/sisu/v4/texpdf.rb        | 9 +++++++--
 lib/sisu/v4/texpdf_format.rb | 1 -
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4
index 99ee1635..4f3c3a67 100644
--- a/data/doc/sisu/CHANGELOG_v4
+++ b/data/doc/sisu/CHANGELOG_v4
@@ -28,6 +28,10 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.10.orig.tar.xz
   sisu_4.0.10.orig.tar.xz
   sisu_4.0.10-1.dsc
 
+* v4: texpdf, report to STDERR when pdf not (successfully) generated, note:
+  .tex file is almost certainly produced by sisu, this will be a sisu packaging,
+  texlive dependency issue, preventing its conversion to pdf (Closes: #617359)
+
 %% 4.0.9.orig.tar.xz (2013-02-22:07/5)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.9
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.9-1
diff --git a/lib/sisu/v4/texpdf.rb b/lib/sisu/v4/texpdf.rb
index 5e18f5aa..4ad385d6 100644
--- a/lib/sisu/v4/texpdf.rb
+++ b/lib/sisu/v4/texpdf.rb
@@ -203,18 +203,23 @@ module SiSU_TeX
         else           pdf_p=@f.pdf_p_a4;     pdf_l=@f.pdf_l_a4
         end
         FileUtils::mkdir_p(@md.file.output_path.pdf.dir) unless FileTest.directory?(@md.file.output_path.pdf.dir)
+        cX=SiSU_Screen::Ansi.new(@md.opt.cmd).cX
         if @md.opt.act[:pdf_p][:set]==:on
           if FileTest.file?(portrait_pdf)
             FileUtils::cp(portrait_pdf,"#{@md.file.output_path.pdf.dir}/#{pdf_p}")
             FileUtils::rm(portrait_pdf)
-          else p "#{__FILE__}:#{__LINE__} NOT FOUND: #{portrait_pdf}" if @md.opt.cmd.inspect =~/M/
+          else
+            STDERR.puts "#{cX.fuschia}pdf file not generated#{cX.off} <#{cX.blue}#{portrait_pdf.gsub(/.+?([^\/]+?\.pdf)$/,'\1')}#{cX.off}> (check texlive dependencies)"
+            STDERR.puts "#{__FILE__}:#{__LINE__} NOT FOUND: #{portrait_pdf}" if @md.opt.cmd.inspect =~/M/
           end
         end
         if @md.opt.act[:pdf_l][:set]==:on
           if FileTest.file?(landscape_pdf)
             FileUtils::cp(landscape_pdf,"#{@md.file.output_path.pdf.dir}/#{pdf_l}")
             FileUtils::rm(landscape_pdf)
-          else p "#{__FILE__}:#{__LINE__} NOT FOUND: #{landscape_pdf}" if @md.opt.cmd.inspect =~/M/
+          else
+            STDERR.puts "#{cX.fuschia}pdf file not generated#{cX.off} <#{cX.blue}#{landscape_pdf.gsub(/.+?([^\/]+?\.pdf)$/,'\1')}#{cX.off}> (check texlive dependencies)"
+            STDERR.puts "#{__FILE__}:#{__LINE__} NOT FOUND: #{landscape_pdf}" if @md.opt.cmd.inspect =~/M/
           end
         end
         SiSU_Screen::Ansi.new(@md.opt.cmd,@@n_lpdf,'processed (SiSU LaTeX to pdf - using pdfetex aka. pdftex or pdflatex)').generic_number if @md.opt.cmd =~/[MVv]/
diff --git a/lib/sisu/v4/texpdf_format.rb b/lib/sisu/v4/texpdf_format.rb
index 0027fb0d..9a1429de 100644
--- a/lib/sisu/v4/texpdf_format.rb
+++ b/lib/sisu/v4/texpdf_format.rb
@@ -1195,7 +1195,6 @@ module SiSU_TeX_Pdf
         gsub(/\\copy(right|mark)?/,'<=copymark>') # ok problem with superscript
     end
     def xetex_special_characters_1(str,is=:default)                                  # ~ ^ $ & % _ { }  #LaTeX special characters - KEEP list
-      #str=Iconv.conv('ISO-8859-1', 'UTF-8', @txt) # `require': iconv will be deprecated in the future, use String#encode instead.
       word=str.scan(/\S+|\n/) #unless line =~/^(?:@\S|%+\s)/
       para_array=[]
       str=if word
-- 
cgit v1.2.3