diff options
author | Norbert Preining <preining@logic.at> | 2012-01-12 05:00:37 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2012-01-12 05:00:37 +0000 |
commit | d18f5545bff4fd3d6315a4752fad5f6c34fd0266 (patch) | |
tree | ab378bf8e21f78efc381443cf8a3bddc3096fb6e /Master | |
parent | 9cf367183d42e17dc182e2906dd8428526799ea4 (diff) |
make mupdmap work in full updmap mode,and add compatibility mode
with old setup (which will disappear in TL2012)
git-svn-id: svn://tug.org/texlive/trunk@25078 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-x | Master/texmf/scripts/texlive/mupdmap.pl | 33 |
1 files changed, 25 insertions, 8 deletions
diff --git a/Master/texmf/scripts/texlive/mupdmap.pl b/Master/texmf/scripts/texlive/mupdmap.pl index f3f67cf207f..e3da31309b4 100755 --- a/Master/texmf/scripts/texlive/mupdmap.pl +++ b/Master/texmf/scripts/texlive/mupdmap.pl @@ -66,6 +66,7 @@ my $alldata; my $updLSR; my @cmdline_options = ( + "oldmode", "cnffile=s@", "copy", "disable=s@", @@ -98,6 +99,7 @@ my @cmdline_options = ( "help|h", # some debugging invocations "_readsave=s", + "_listupdmap", ); my %settings = ( @@ -174,7 +176,6 @@ sub main { # determine which config files should be used # replaces the former "setupCfgFile" - # we do NOT read texmf/web2c/updmap.cfg # # we also determine here where changes will be saved to if ($opts{'cnffile'}) { @@ -190,15 +191,26 @@ sub main { my @all_files = `kpsewhich -all updmap.cfg`; chomp(@all_files); my @used_files; - for my $f (@all_files) { - # make sure that all file names are lower case on windows for comparison - $f = lc($f) if win32(); - if ($f =~ m!$TEXMFROOT/texmf/web2c/updmap.cfg!) { - warning("Ignoring $f, it is only a sample file!\n"); - } else { - push @used_files, $f; + # + # in --oldmode we ignore texmf/web2c/updmap.cfg and reorder some + # order to get things right + # without --oldmode everything will be used as default to, i.e. + # the order is given by kpsewhich -all updmap.cfg + if (!$opts{"oldmode"}) { + push @used_files, @all_files; + } else { + # --oldmode + for my $f (@all_files) { + # make sure that all file names are lower case on windows for comparison + $f = lc($f) if win32(); + if ($f =~ m!$TEXMFROOT/texmf/web2c/updmap.cfg!) { + warning("Ignoring $f, it is only a sample file!\n"); + } else { + push @used_files, $f; + } } } + # # reorder used files: since we ship and manage with tlmgr # the file in TEXMFSYSCONFIG, and TEXMFLOCAL has *lower* priority # then TEXMFSYSCONFIG, we move a TEXMFLOCAL-updmap.cfg if found @@ -282,6 +294,11 @@ sub main { print " $f\n"; } $alldata->{'changes_config'} = $changes_config_file; + + if ($opts{'_listupdmap'}) { + exit 0; + } + read_updmap_files(@{$opts{'cnffile'}}); if ($opts{'showoption'}) { |