diff options
| author | Norbert Preining <preining@logic.at> | 2012-09-13 03:38:21 +0000 |
|---|---|---|
| committer | Norbert Preining <preining@logic.at> | 2012-09-13 03:38:21 +0000 |
| commit | 6ff7cb874a3ec09a79788fa39099d608c4162f93 (patch) | |
| tree | db3485c81e8e0c2c3c9583809a0bb80b6ed780ac /Master/texmf-dist | |
| parent | 488ae42aee66c8b9ee2cca6e1a706b53016e4f21 (diff) | |
fix uninialized map origin in case of builtin maps
needs more work to not include fonts two times
git-svn-id: svn://tug.org/texlive/trunk@27660 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
| -rwxr-xr-x | Master/texmf-dist/scripts/tetex/updmap.pl | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Master/texmf-dist/scripts/tetex/updmap.pl b/Master/texmf-dist/scripts/tetex/updmap.pl index 23d4984dd19..1cb90a6f0ad 100755 --- a/Master/texmf-dist/scripts/tetex/updmap.pl +++ b/Master/texmf-dist/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"); |