summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-09-19 21:45:52 +0000
committerKarl Berry <karl@freefriends.org>2021-09-19 21:45:52 +0000
commit19efea78a39d6346df3a82392f9165364196aa42 (patch)
treeb85556a53c214ac7f5183e9351982d8c1791eb4f /Master
parent9add405b71c9d16e9989a79cb3732b59e27e8377 (diff)
can't ignore blank lines after all.
git-svn-id: svn://tug.org/texlive/trunk@60554 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/tlpkg/bin/cmp-textfiles6
1 files changed, 3 insertions, 3 deletions
diff --git a/Master/tlpkg/bin/cmp-textfiles b/Master/tlpkg/bin/cmp-textfiles
index 98b381257fb..5008cf7d0b4 100755
--- a/Master/tlpkg/bin/cmp-textfiles
+++ b/Master/tlpkg/bin/cmp-textfiles
@@ -24,8 +24,7 @@ END_USAGE
}
-# 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 @@ sub read_file {
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 .= $_;