summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2012-02-10 12:51:16 +0000
committerNorbert Preining <preining@logic.at>2012-02-10 12:51:16 +0000
commitc8a21e64932a929d248a10d2dda7d8cdde513657 (patch)
tree93d9c4b78b0ea25b5040416f2ab80e6f7d597d64
parentf89ae15dc45ef020a1afe40585a44e3b768646d9 (diff)
fix updmap misbehaviour with rspect to generated file names
git-svn-id: svn://tug.org/texlive/trunk@25346 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/tetex/ChangeLog5
-rwxr-xr-xBuild/source/texk/tetex/updmap.pl6
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;
}