summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2015-07-28 06:42:13 +0000
committerNorbert Preining <preining@logic.at>2015-07-28 06:42:13 +0000
commit6f0c243a33cf1a67dfd89799999f6b4f4cf21710 (patch)
tree061ed51a9a4677df294aec285108d622ae53de2e /Master/texmf-dist
parentf0434b7c89f5ad48065e0500fa8be29526c3f316 (diff)
consolidate data structures in TLPaper.pm, adjust tlmgr code
git-svn-id: svn://tug.org/texlive/trunk@37974 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rwxr-xr-xMaster/texmf-dist/scripts/texlive/tlmgr.pl10
1 files changed, 5 insertions, 5 deletions
diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl
index ff5c8ce67c1..539267b40e8 100755
--- a/Master/texmf-dist/scripts/texlive/tlmgr.pl
+++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl
@@ -1186,8 +1186,8 @@ sub action_paper {
} elsif (!defined($newpaper)) { # tlmgr paper => show all current sizes.
my $ret = $F_OK;
- for my $prog (sort keys %TeXLive::TLPaper::prog_to_pkg) {
- my $pkg = $TeXLive::TLPaper::prog_to_pkg{$prog};
+ for my $prog (sort keys %TeXLive::TLPaper::paper) {
+ my $pkg = $TeXLive::TLPaper::paper{$prog}{'pkg'};
if ($localtlpdb->get_package($pkg)) {
$ret |= TeXLive::TLPaper::do_paper($prog,$texmfconfig,undef);
}
@@ -1203,8 +1203,8 @@ sub action_paper {
} else { # tlmgr paper {a4|letter} => do it.
return ($F_ERROR) if !check_on_writable();
my $ret = $F_OK;
- for my $prog (sort keys %TeXLive::TLPaper::prog_to_pkg) {
- my $pkg = $TeXLive::TLPaper::prog_to_pkg{$prog};
+ for my $prog (sort keys %TeXLive::TLPaper::paper) {
+ my $pkg = $TeXLive::TLPaper::paper{$prog}{'pkg'};
if ($localtlpdb->get_package($pkg)) {
$ret |= TeXLive::TLPaper::do_paper($prog,$texmfconfig,$newpaper);
}
@@ -1215,7 +1215,7 @@ sub action_paper {
} else { # program-specific paper
my $prog = $action; # first argument is the program to change
- my $pkg = $TeXLive::TLPaper::prog_to_pkg{$prog};
+ my $pkg = $TeXLive::TLPaper::paper{$prog}{'pkg'};
if (!$localtlpdb->get_package($pkg)) {
tlwarn("$prg: package $pkg is not installed - cannot adjust paper size!\n");
return ($F_ERROR);