latexmk 4.15c (19apr10)

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

1 files changed, 10 insertions, 7 deletions

diff --git a/Master/texmf-dist/scripts/latexmk/latexmk.pl b/Master/texmf-dist/scripts/latexmk/latexmk.pl
index ababdc1a3a7..7f98a337b6b 100755
--- a/Master/texmf-dist/scripts/latexmk/latexmk.pl
+++ b/Master/texmf-dist/scripts/latexmk/latexmk.pl
@@ -108,8 +108,8 @@ use warnings;
 
 $my_name = 'latexmk';
 $My_name = 'Latexmk';
-$version_num = '4.15b';
-$version_details = "$My_name, John Collins, 12 April 2010";
+$version_num = '4.15c';
+$version_details = "$My_name, John Collins, 18 April 2010";
 
 
 use Config;
@@ -178,6 +178,8 @@ else {
 ##
 ##   Modification log from 22 Jan 2010 onwards in detail
 ##
+##     18 Apr 2010, John Collins  Clean up comment from previous mod.
+##     16 Apr 2010, John Collins  V. 4.15c.  Correct line wrapping issue.
 ##     12 Apr 2010, John Collins  V. 4.15b.  Change 
 ##                            use Digest;
 ##                        to 
@@ -2857,13 +2859,14 @@ sub parse_logB {
         s/[\n\r]*$//;
         # Handle wrapped lines:
         # They are lines brutally broken at exactly $log_wrap chars 
-        #    excluding line-end.  The TeX program adds an EXTRA 
-        #    end-of-line character whenever a line gets to $log_wrap
-        #    characters.  So we recover the unwrapped line(s) simply 
-        #    by deleting the end-of-line following a line of exactly 
-        #    $log_wrap characters.  
+        #    excluding line-end.  Sometimes a line $log_wrap chars 
+        #    long is an ordinary line, sometimes it is part of a line
+        #    that was wrapped.  To handle all cases, I keep both
+        #    options open by putting the line into @lines before
+        #    and after appending the next line:  
         my $len = length($_);
         while ( ($len == $log_wrap) && !eof($log_file) ) {
+            push @lines, $_;
             my $extra = <$log_file>;
             $extra =~ s/[\n\r]*$//;
             $len = length($extra);