texlive[60554] Master/tlpkg/bin/cmp-textfiles: can't ignore blank

commits+karl at tug.org commits+karl at tug.org
Sun Sep 19 23:45:52 CEST 2021


Revision: 60554
          http://tug.org/svn/texlive?view=revision&revision=60554
Author:   karl
Date:     2021-09-19 23:45:52 +0200 (Sun, 19 Sep 2021)
Log Message:
-----------
can't ignore blank lines after all.

Modified Paths:
--------------
    trunk/Master/tlpkg/bin/cmp-textfiles

Modified: trunk/Master/tlpkg/bin/cmp-textfiles
===================================================================
--- trunk/Master/tlpkg/bin/cmp-textfiles	2021-09-19 21:23:39 UTC (rev 60553)
+++ trunk/Master/tlpkg/bin/cmp-textfiles	2021-09-19 21:45:52 UTC (rev 60554)
@@ -24,8 +24,7 @@
 }
 
 
-# Return contents of FNAME as a string, converting all of CR, LF, and
-# CRLF to just LF.
+# Return contents of FNAME as a string, converting both CR and CRLF to LF.
 # 
 # Also, annoyingly, ignore lines consisting only of "%%".  For an
 # unknown reason, derived files on CTAN often contain these lines, while
@@ -40,7 +39,8 @@
   open (my $FILE, $fname) || die "open($fname) failed: $!";
   while (<$FILE>) {
     s/\r\n?/\n/g;
-    next if /^\s*$/;       # ignore blank lines.
+    # ignoring blank lines causes problems because of the eol
+    # conversions, e.g., in cbaccent.mf and jpsj/template.tex. sigh.
     next if /^\s*%%\s*$/; # ignore %% lines, see above.
     #warn "line is |$_|";
     $ret .= $_;



More information about the tex-live-commits mailing list.