summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2012-03-14 22:44:37 +0000
committerNorbert Preining <preining@logic.at>2012-03-14 22:44:37 +0000
commit4a704ffc483f35e3fda1d140c952490f8ebe4b91 (patch)
tree49686b8072c85755132d7caff367413b805d4f95
parent48b375881b8692e1b7d54cd1980f31aa4dd93abd (diff)
make updmap-setup-kanji work with current multi-updmap
git-svn-id: svn://tug.org/texlive/trunk@25640 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/extra/jfontmaps/ChangeLog7
-rwxr-xr-xBuild/source/extra/jfontmaps/script/updmap-setup-kanji.pl3
2 files changed, 9 insertions, 1 deletions
diff --git a/Build/source/extra/jfontmaps/ChangeLog b/Build/source/extra/jfontmaps/ChangeLog
index 0881a76dd40..1ba2f0e16f4 100644
--- a/Build/source/extra/jfontmaps/ChangeLog
+++ b/Build/source/extra/jfontmaps/ChangeLog
@@ -1,3 +1,10 @@
+2012-03-15 Norbert Preining <preining@logic.at>
+
+ * scripts/updmap-setup-kanji.pl: remove (...) from the output
+ of --showoption, multi-updmap echos (still, but not for long)
+ out the configuration file where the variable is set.
+ Version v0.9.5
+
2012-03-01 Norbert Preining <preining@logic.at>
* scripts/updmap-setup-kanji.pl: pass --quiet --nomkmap --nohash
diff --git a/Build/source/extra/jfontmaps/script/updmap-setup-kanji.pl b/Build/source/extra/jfontmaps/script/updmap-setup-kanji.pl
index 83817fb58ce..2dd2d71bfdb 100755
--- a/Build/source/extra/jfontmaps/script/updmap-setup-kanji.pl
+++ b/Build/source/extra/jfontmaps/script/updmap-setup-kanji.pl
@@ -19,7 +19,7 @@ use Getopt::Long qw(:config no_autoabbrev ignore_case_always);
use strict;
my $prg = "updmap-setup-kanji";
-my $vers = "0.9.4";
+my $vers = "0.9.5";
my $version = '$Id$';
my $updmap_real = "updmap-sys";
@@ -148,6 +148,7 @@ sub GetStatus {
if ($val =~ m/^kanjiEmbed=(.*)( \()?/) {
$STATUS = $1;
$STATUS =~ s/\s*$//;
+ $STATUS =~ s/\(.*\)$//;
$STATUS =~ s/^"(.*)"$/\1/;
} else {
printf STDERR "Cannot find status of current kanjiEmbed setting via updmap-sys --showoption!\n";