diff options
Diffstat (limited to 'Build/source/texk/tetex')
-rw-r--r-- | Build/source/texk/tetex/ChangeLog | 5 | ||||
-rwxr-xr-x | Build/source/texk/tetex/updmap.pl | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/Build/source/texk/tetex/ChangeLog b/Build/source/texk/tetex/ChangeLog index 7f7b248d0c4..c6c7c9560e6 100644 --- a/Build/source/texk/tetex/ChangeLog +++ b/Build/source/texk/tetex/ChangeLog @@ -1,3 +1,8 @@ +2012-02-10 Norbert Preining <preining@logic.at> + + * updmap.pl: fix breakage of updmap if a generated file does + not exist (wrong double substitution of @kanji*@ strings) + 2012-02-01 Norbert Preining <preining@logic.at> * updmap.pl: diff --git a/Build/source/texk/tetex/updmap.pl b/Build/source/texk/tetex/updmap.pl index b662fb652cd..3783370097e 100755 --- a/Build/source/texk/tetex/updmap.pl +++ b/Build/source/texk/tetex/updmap.pl @@ -829,8 +829,8 @@ sub catMaps { my @maps = grep { $_ =~ m/$map/ } @cfg; map{ $_ =~ s/\#.*//; - $_ =~ s/\@kanjiEmbed@/$kanjiEmbed/; - $_ =~ s/\@kanjiVariant@/$kanjiVariant/; + # $_ =~ s/\@kanjiEmbed@/$kanjiEmbed/; + # $_ =~ s/\@kanjiVariant@/$kanjiVariant/; $_ =~ s/\s*([^\s]*)\s*([^\s]*)/$2/; } @maps; @@ -843,7 +843,7 @@ sub catMaps { my $mf = `kpsewhich --format=map $newm`; chomp($mf); if (!$mf) { - print "$0: generated map $newm (from $m) does not exists, not activating it!\n"; + print LOG "\n$short_progname: generated map $newm\n\tfrom $m\n\tdoes not exists, not activating it!\n"; } else { push @newmaps, $newm; } |