fix tlmgr2 gui mode, the gui used some things from paper-settings ...

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

2 files changed, 19 insertions, 6 deletions

diff --git a/Master/texmf/scripts/texlive/tlmgrgui/gui-config2.pl b/Master/texmf/scripts/texlive/tlmgrgui/gui-config2.pl
index 2d73cc0bacf..75e9e98f039 100644
--- a/Master/texmf/scripts/texlive/tlmgrgui/gui-config2.pl
+++ b/Master/texmf/scripts/texlive/tlmgrgui/gui-config2.pl
@@ -96,30 +96,30 @@ my %defaultpaper;
 
 sub init_paper_xdvi {
   if (!win32()) {
-    @{$papers{"xdvi"}} = get_paper_list("xdvi");
+    @{$papers{"xdvi"}} = TeXLive::TLPaper::get_paper_list("xdvi");
     $defaultpaper{"xdvi"} = ${$papers{"xdvi"}}[0];
   }
 }
 sub init_paper_pdftex {
-  @{$papers{"pdftex"}} = get_paper_list("pdftex");
+  @{$papers{"pdftex"}} = TeXLive::TLPaper::get_paper_list("pdftex");
   $defaultpaper{"pdftex"} = ${$papers{"pdftex"}}[0];
 }
 sub init_paper_dvips {
-  @{$papers{"dvips"}} = get_paper_list("dvips");
+  @{$papers{"dvips"}} = TeXLive::TLPaper::get_paper_list("dvips");
   $defaultpaper{"dvips"} = ${$papers{"dvips"}}[0];
 }
 sub init_paper_dvipdfm {
-  @{$papers{"dvipdfm"}} = get_paper_list("dvipdfm");
+  @{$papers{"dvipdfm"}} = TeXLive::TLPaper::get_paper_list("dvipdfm");
   $defaultpaper{"dvipdfm"} = ${$papers{"dvipdfm"}}[0];
 }
 sub init_paper_context {
   if (defined($localtlpdb->get_package("bin-context"))) {
-    @{$papers{"context"}} = get_paper_list("context");
+    @{$papers{"context"}} = TeXLive::TLPaper::get_paper_list("context");
     $defaultpaper{"context"} = ${$papers{"context"}}[0];
   }
 }
 sub init_paper_dvipdfmx {
-  @{$papers{"dvipdfmx"}} = get_paper_list("dvipdfmx");
+  @{$papers{"dvipdfmx"}} = TeXLive::TLPaper::get_paper_list("dvipdfmx");
   $defaultpaper{"dvipdfmx"} = ${$papers{"dvipdfmx"}}[0];
 }
 
diff --git a/Master/tlpkg/TeXLive/TLPaper.pm b/Master/tlpkg/TeXLive/TLPaper.pm
index 58a2bdd17d7..301d6abb65a 100644
--- a/Master/tlpkg/TeXLive/TLPaper.pm
+++ b/Master/tlpkg/TeXLive/TLPaper.pm
@@ -124,6 +124,19 @@ my %dvipdfm_papersize = (
 
 
 
+
+=item C<get_paper_list($prog)>
+
+Returns the list of supported paper sizes with the first entry being
+the currently selected one.
+
+=cut
+
+sub get_paper_list {
+  my $prog = shift;
+  return ( &{$paper_sub{$prog}} ( "/dummy", "--returnlist" ) );
+}
+
 =item C<do_paper($prog,$texmfsysconfig,@args)>
 
 Call the paper subroutine for C<$prog>, passing args.  Return hash of