summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-04-04 00:16:58 +0000
committerKarl Berry <karl@freefriends.org>2011-04-04 00:16:58 +0000
commit89e515592abbd065df52acfa224a3c2cce4cb973 (patch)
tree640fa4e07cfd4e6a88f39eddd8c0cc6c92c7e015
parent778222b8f04e2cc70079b69d694dde185cf3cf8f (diff)
(to_pdftex): make a no-op, to eliminate
differences between sh and pl updmap. (mkMaps): tweak header text. git-svn-id: svn://tug.org/texlive/trunk@21946 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/tlpkg/dev/updmap.pl39
1 files changed, 23 insertions, 16 deletions
diff --git a/Master/tlpkg/dev/updmap.pl b/Master/tlpkg/dev/updmap.pl
index 728b30f5211..b772a311f55 100755
--- a/Master/tlpkg/dev/updmap.pl
+++ b/Master/tlpkg/dev/updmap.pl
@@ -911,20 +911,24 @@ sub normalizeLines {
###############################################################################
# to_pdftex()
-# strip "PS_Encoding_Name ReEncodeFont" from map entries because
-# they are ignored by pdftex anyway.
+# we could strip "PS_Encoding_Name ReEncodeFont" from map entries because
+# they are ignored by pdftex anyway, but it is harmless, and creates
+# spurious differences. We want fewer differences, not more. Really
+# we want one map file format.
###############################################################################
sub to_pdftex {
- my @in=@_;
- my @out;
- foreach my $line (@in) {
- if ($line=~/^(.*\s+)(\S+\s+ReEncodeFont\s)(.*)/) {
- $line="$1$3";
- $line=~s/\s+\"\s+\"\s+/ /;
- }
- push @out, $line;
- }
- return @out;
+ return @_;
+#
+# my @in = @_;
+# my @out;
+# foreach my $line (@in) {
+# if ($line =~ /^(.*\s+)(\S+\s+ReEncodeFont\s)(.*)/) {
+# $line = "$1$3";
+# $line =~ s/\s+\"\s+\"\s+/ /;
+# }
+# push @out, $line;
+# }
+# return @out;
}
###############################################################################
@@ -979,7 +983,7 @@ sub mkMaps {
$pdftexDownloadBase14 = 1 unless (defined $pdftexDownloadBase14);
&wlog ("\nupdmap is creating new map files " .
- "using the following configuration:\n" .
+ "using the following configuration:" .
"\n LW35 font names : " .
$mode .
"\n prefer outlines : " .
@@ -1052,9 +1056,12 @@ sub mkMaps {
"$pdftexoutputdir/pdftex_ndl14.map",
"$dvipsoutputdir/ps2pk.map") {
open FILE, ">$file";
- print FILE "% $file: maintained by the script updmap.\
-% Don't change this file directly. Edit texmf/web2c/$cnfFileShort\
-% and run updmap[-sys] to recreate this file.\
+ print FILE "% $file:\
+% maintained by updmap[-sys].\
+% Don't change this file directly. Use updmap[-sys] instead.\
+% See texmf/web2c/$cnfFileShort and the updmap documentation.\
+% A log of the run that created this file is available here:\
+% $logfile\
";
close FILE;
}