From 89e515592abbd065df52acfa224a3c2cce4cb973 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 4 Apr 2011 00:16:58 +0000 Subject: (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 --- Master/tlpkg/dev/updmap.pl | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) (limited to 'Master') 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; } -- cgit v1.2.3