pdflatexpicscale (1feb17)

git-svn-id: svn://tug.org/texlive/trunk@43117 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 25 insertions, 15 deletions

diff --git a/Build/source/texk/texlive/linked_scripts/pdflatexpicscale/pdflatexpicscale.pl b/Build/source/texk/texlive/linked_scripts/pdflatexpicscale/pdflatexpicscale.pl
index 9062e68b233..7c2de25cb7a 100755
--- a/Build/source/texk/texlive/linked_scripts/pdflatexpicscale/pdflatexpicscale.pl
+++ b/Build/source/texk/texlive/linked_scripts/pdflatexpicscale/pdflatexpicscale.pl
@@ -14,6 +14,8 @@
 #            and corrected version number 
 #            Please note: version numbers will be updated to keep sync
 #            with the documentation, even when the perl code does not change.
+# 2017-02-01 pdflatexpicscale did not work correct when log lines were 
+#            wrapped twice. This is fixed.
 #
 use strict;
 use File::Basename;
@@ -21,8 +23,8 @@ use File::Spec;
 use File::Copy;
 use Getopt::Long;
 
-my $version = '0.3';
-my $versiondate = '2017-01-23';           #version %version
+my $version = '0.31';
+my $versiondate = '2017-02-01';           #version %version
 my $showversion;
 
 my $verbose;
@@ -77,7 +79,7 @@ sub handleImage
     my @dstdirs;
     my @convertargs;
     my $idstring;
-
+    print "$filename\n";
     $dstdirs[0] = '.';
     $dstdirs[1] = $printfolderprefix;
     $dstfilename = File::Spec->catfile(@dstdirs, basename($filename));
@@ -175,11 +177,11 @@ sub readlog
     while (<LOGFILE>){
 	if (/^Package pdftex\.def\sInfo\:\s/){
 	    $buffer = $_;
-	    unless (/\sused/){
+	    unless ($buffer =~ /\sused/){
 		chomp $buffer;
 		$buffer .= <LOGFILE>;
 	    } # twice ought to be enough
-	    unless (/\sused/){
+	    unless ($buffer =~ /\sused/){
 		chomp $buffer;
 		$buffer .= <LOGFILE>;
 	    }
diff --git a/Master/texmf-dist/doc/support/pdflatexpicscale/README b/Master/texmf-dist/doc/support/pdflatexpicscale/README
index 5d3cd905086..b608a76ab36 100644
--- a/Master/texmf-dist/doc/support/pdflatexpicscale/README
+++ b/Master/texmf-dist/doc/support/pdflatexpicscale/README
@@ -3,7 +3,7 @@ to a target resolution before creating a PDF document
 with PdfLaTeX.
 
 *Version*
-2017-01-23
+2017-02-01 (version of bundle)
 For version details check pdflatexpicscale.pdf.
 
 *Requirements*
diff --git a/Master/texmf-dist/doc/support/pdflatexpicscale/pdflatexpicscale.pdf b/Master/texmf-dist/doc/support/pdflatexpicscale/pdflatexpicscale.pdf
index 47c7d9354d7..9f96f76b26a 100644
--- a/Master/texmf-dist/doc/support/pdflatexpicscale/pdflatexpicscale.pdf
+++ b/Master/texmf-dist/doc/support/pdflatexpicscale/pdflatexpicscale.pdf
diff --git a/Master/texmf-dist/doc/support/pdflatexpicscale/pdflatexpicscale.tex b/Master/texmf-dist/doc/support/pdflatexpicscale/pdflatexpicscale.tex
index 323d09c7d1c..19c7a23c190 100644
--- a/Master/texmf-dist/doc/support/pdflatexpicscale/pdflatexpicscale.tex
+++ b/Master/texmf-dist/doc/support/pdflatexpicscale/pdflatexpicscale.tex
@@ -5,7 +5,7 @@
 \usepackage{url}
 \title{pdflatexpicscale}
 \author{Peter Willadt\footnote{willadt at t-online.de}}
-\date{2017-01-23} %version #version
+\date{2017-02-01} %version #version
 \begin{document}
 \maketitle
 
@@ -253,7 +253,7 @@ names from the log file it reads. You may set this option if you have already
 changed the \verb|\graphicspath| and are too lazy to change it again. The
 default is empty.
 
-\paragraph{printdpi} followed by a numer lets you change the range in which
+\paragraph{printdpi} followed by a number lets you change the range in which
 pictures remain unscaled because they are near the target resolution. Default
 is 20, that means 20~percent. If target resolution is 300~dpi, files up to
 320~dpi get accepted too. Change to 0 if you want no tolerance.
@@ -327,5 +327,8 @@ of degrade.sty on recommendation of CTAN board. Added text on versioning at
 the beginning of section~\ref{bugs}. Thanks a lot to the always quick action
 and helpful and polite hints.
 
+\paragraph{2017-02-01} With very long pathnames in the log file,
+pdflatexpicscale did not find pictures. This is fixed, hopefully.
+
 % for file version please see line 8
 \end{document}
diff --git a/Master/texmf-dist/doc/support/pdflatexpicscale/testprinter.ps b/Master/texmf-dist/doc/support/pdflatexpicscale/testprinter.ps
index a60b0baf6e0..96176dfe4d4 100644
--- a/Master/texmf-dist/doc/support/pdflatexpicscale/testprinter.ps
+++ b/Master/texmf-dist/doc/support/pdflatexpicscale/testprinter.ps
@@ -1,7 +1,10 @@
 %!PS
-% Halftone testing inspired by PS by Example P. 544 ff
+% Halftone testing inspired by
+% McGilton, Henry and Campione, Mary:
+% PostScript by Example.
+% First printing, 1992, P. 544 ff
 % Willadt 2016-07-27
-% version 2017-01-23  #version %version
+% version 2017-02-01  #version %version
 % for information on usage and changes see pdflatexpicscale.pdf
 /prozente 20 string def
 
diff --git a/Master/texmf-dist/scripts/pdflatexpicscale/pdflatexpicscale.pl b/Master/texmf-dist/scripts/pdflatexpicscale/pdflatexpicscale.pl
index 9062e68b233..7c2de25cb7a 100755
--- a/Master/texmf-dist/scripts/pdflatexpicscale/pdflatexpicscale.pl
+++ b/Master/texmf-dist/scripts/pdflatexpicscale/pdflatexpicscale.pl
@@ -14,6 +14,8 @@
 #            and corrected version number 
 #            Please note: version numbers will be updated to keep sync
 #            with the documentation, even when the perl code does not change.
+# 2017-02-01 pdflatexpicscale did not work correct when log lines were 
+#            wrapped twice. This is fixed.
 #
 use strict;
 use File::Basename;
@@ -21,8 +23,8 @@ use File::Spec;
 use File::Copy;
 use Getopt::Long;
 
-my $version = '0.3';
-my $versiondate = '2017-01-23';           #version %version
+my $version = '0.31';
+my $versiondate = '2017-02-01';           #version %version
 my $showversion;
 
 my $verbose;
@@ -77,7 +79,7 @@ sub handleImage
     my @dstdirs;
     my @convertargs;
     my $idstring;
-
+    print "$filename\n";
     $dstdirs[0] = '.';
     $dstdirs[1] = $printfolderprefix;
     $dstfilename = File::Spec->catfile(@dstdirs, basename($filename));
@@ -175,11 +177,11 @@ sub readlog
     while (<LOGFILE>){
 	if (/^Package pdftex\.def\sInfo\:\s/){
 	    $buffer = $_;
-	    unless (/\sused/){
+	    unless ($buffer =~ /\sused/){
 		chomp $buffer;
 		$buffer .= <LOGFILE>;
 	    } # twice ought to be enough
-	    unless (/\sused/){
+	    unless ($buffer =~ /\sused/){
 		chomp $buffer;
 		$buffer .= <LOGFILE>;
 	    }