diff options
author | Karl Berry <karl@freefriends.org> | 2012-09-14 22:21:23 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-09-14 22:21:23 +0000 |
commit | 24660d18b168e23d6eadb5c5d683c14e3f55b5a4 (patch) | |
tree | e0dbd2c8749a95f1bf1212fd8e8ad8307885e7e6 /Build | |
parent | 1ad443c9e33f3ddea0709c0332f2433ae58f814f (diff) |
consistency
git-svn-id: svn://tug.org/texlive/trunk@27672 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rwxr-xr-x | Build/source/texk/texlive/linked_scripts/tetex/updmap.pl | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/tetex/updmap.pl b/Build/source/texk/texlive/linked_scripts/tetex/updmap.pl index c8e3f2dfc3d..f448251a590 100755 --- a/Build/source/texk/texlive/linked_scripts/tetex/updmap.pl +++ b/Build/source/texk/texlive/linked_scripts/tetex/updmap.pl @@ -1836,9 +1836,16 @@ sub read_map_files { # defined in another map file already if (defined($alldata->{'fonts'}{$font}{'origin'})) { my $fontorig = $alldata->{'fonts'}{$font}{'origin'}; - my $maporig = $alldata->{'maps'}{$fontorig}{'origin'}; + my $maporig; + if (($fontorig eq "ps2pk35.map") || + ($fontorig eq "pdftex35.map") || + ($fontorig eq "dvips35.map")) { + $maporig = "built in map - both used - warning!"; + } else { + $maporig = "from " . $alldata->{'maps'}{$fontorig}{'origin'}; + } warning("$prg: font $font is defined multiple times:\n"); - warning("$prg: $fontorig (from $maporig)\n"); + warning("$prg: $fontorig ($maporig)\n"); warning("$prg: $m (from $f) (used)\n"); } else { warning("$prg: font $font is multiply defined in $m, using an arbitrary instance!\n"); |