consolidate data structures in TLPaper.pm, adjust tlmgr code

git-svn-id: svn://tug.org/texlive/trunk@37974 c570f23f-e606-0410-a88d-b1316a301751

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);