summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2012-10-19 23:23:29 +0000
committerNorbert Preining <preining@logic.at>2012-10-19 23:23:29 +0000
commit752d16bfe741c27ba3ef7d3a660a9d04b41c8aa8 (patch)
treef60d83648216755e009e214b0117bad3c58af886 /Master/texmf-dist
parent4b4f9ac4f758e3af0edea124617fe75a6967b828 (diff)
updmap.pl fixes:
- kanjiMap and kanjiEmbed settings were not applied immediately, only on second run - when a new config file was created, the settings didn't take effect immediately, only on second run git-svn-id: svn://tug.org/texlive/trunk@28033 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rwxr-xr-xMaster/texmf-dist/scripts/tetex/updmap.pl11
1 files changed, 6 insertions, 5 deletions
diff --git a/Master/texmf-dist/scripts/tetex/updmap.pl b/Master/texmf-dist/scripts/tetex/updmap.pl
index 1cb90a6f0ad..3197b1d958a 100755
--- a/Master/texmf-dist/scripts/tetex/updmap.pl
+++ b/Master/texmf-dist/scripts/tetex/updmap.pl
@@ -169,6 +169,7 @@ sub main {
if ($opts{'_readsave'}) {
read_updmap_files($opts{'_readsave'});
+ merge_settings_replace_kanji();
print "READING DONE ============================\n";
#print Dumper($alldata);
$alldata->{'updmap'}{$opts{'_readsave'}}{'changed'} = 1;
@@ -355,6 +356,7 @@ sub main {
read_updmap_files(@{$opts{'cnffile'}});
if ($opts{'showoption'}) {
+ merge_settings_replace_kanji();
for my $o (@{$opts{'showoption'}}) {
if (defined($settings{$o})) {
my ($v, $vo) = get_cfg($o);
@@ -368,6 +370,7 @@ sub main {
}
if ($opts{'listmaps'}) {
+ merge_settings_replace_kanji();
for my $m (keys %{$alldata->{'maps'}}) {
my $origin = $alldata->{'maps'}{$m}{'origin'};
print $alldata->{'updmap'}{$origin}{'maps'}{$m}{'type'}, " $m ",
@@ -383,6 +386,7 @@ sub main {
my $changed = 0;
if ($opts{'syncwithtrees'}) {
+ merge_settings_replace_kanji();
my @missing = read_map_files();
if (@missing) {
print "Missing map files found, disabling\n";
@@ -457,6 +461,7 @@ sub main {
setupOutputDir("pdftex");
setupOutputDir("dvipdfmx");
setupOutputDir("pxdvi");
+ merge_settings_replace_kanji();
my @missing = read_map_files();
if (@missing) {
print STDERR "\nERROR: The following map file(s) couldn't be found:\n";
@@ -1248,7 +1253,6 @@ sub enable_disable_maps {
disable_map($tc, $w);
}
}
- merge_settings();
return save_updmap($tc);
}
@@ -1618,12 +1622,9 @@ sub read_updmap_files {
}
#
$alldata->{'order'} = \@l;
-
- # merge data and check for kanji embed
- merge_settings();
}
-sub merge_settings {
+sub merge_settings_replace_kanji {
#
my @l = @{$alldata->{'order'}};
#