summaryrefslogtreecommitdiff
path: root/Master/tlpkg/TeXLive/TLPaper.pm
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2012-04-08 12:08:29 +0000
committerNorbert Preining <preining@logic.at>2012-04-08 12:08:29 +0000
commit909973b12988f74f232e05ccb3bf8c76c663f664 (patch)
tree2161504bc1dfc87e3e9d66914a6c6a8e1911c7f2 /Master/tlpkg/TeXLive/TLPaper.pm
parente960ace7286c93805851de001178904958fb3c97 (diff)
search also default file
git-svn-id: svn://tug.org/texlive/trunk@25875 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/TeXLive/TLPaper.pm')
-rw-r--r--Master/tlpkg/TeXLive/TLPaper.pm18
1 files changed, 12 insertions, 6 deletions
diff --git a/Master/tlpkg/TeXLive/TLPaper.pm b/Master/tlpkg/TeXLive/TLPaper.pm
index 19df02330d0..d2feb605a42 100644
--- a/Master/tlpkg/TeXLive/TLPaper.pm
+++ b/Master/tlpkg/TeXLive/TLPaper.pm
@@ -259,8 +259,9 @@ sub paper_xdvi {
my $newpaper = shift;
my ($outcomp, $filecomp) = setup_names("xdvi");
+ my $dftfile = $default_paper_config_name{"xdvi"};
my $outfile = "$outtree/$outcomp/$filecomp";
- my $inp = &find_paper_file("xdvi", "other text files", $filecomp);
+ my $inp = &find_paper_file("xdvi", "other text files", $filecomp, $dftfile);
return unless $inp;
@@ -291,8 +292,9 @@ sub paper_pdftex {
my $newpaper = shift;
my ($outcomp, $filecomp) = setup_names("pdftex");
+ my $dftfile = $default_paper_config_name{"pdftex"};
my $outfile = "$outtree/$outcomp/$filecomp";
- my $inp = &find_paper_file("pdftex", "tex", $filecomp);
+ my $inp = &find_paper_file("pdftex", "tex", $filecomp, $dftfile);
return unless $inp;
@@ -435,8 +437,9 @@ sub paper_dvips {
my $newpaper = shift;
my ($outcomp, $filecomp) = setup_names("dvips");
+ my $dftfile = $default_paper_config_name{"dvips"};
my $outfile = "$outtree/$outcomp/$filecomp";
- my $inp = &find_paper_file("dvips", "dvips config", $filecomp);
+ my $inp = &find_paper_file("dvips", "dvips config", $filecomp, $dftfile);
return unless $inp;
@@ -556,7 +559,8 @@ sub paper_dvipdfm {
my $newpaper = shift;
my ($outcomp, $filecomp) = setup_names("dvipdfm");
- my $inp = &find_paper_file("dvipdfm", "other text files", $filecomp);
+ my $dftfile = $default_paper_config_name{"dvipdfm"};
+ my $inp = &find_paper_file("dvipdfm", "other text files", $filecomp, $dftfile);
return () unless $inp;
my @sizes = keys %dvipdfm_papersize;
@@ -568,8 +572,9 @@ sub paper_dvipdfmx {
my $newpaper = shift;
my ($outcomp, $filecomp) = setup_names("dvipdfmx");
+ my $dftfile = $default_paper_config_name{"dvipdfmx"};
- my $inp = &find_paper_file("dvipdfmx", "other text files", $filecomp);
+ my $inp = &find_paper_file("dvipdfmx", "other text files", $filecomp, $dftfile);
return () unless $inp;
my @sizes = keys %dvipdfm_papersize;
@@ -589,8 +594,9 @@ sub paper_context {
my $newpaper = shift;
my ($outcomp, $filecomp) = setup_names("context");
+ my $dftfile = $default_paper_config_name{"context"};
my $outfile = "$outtree/$outcomp/$filecomp";
- my $inp = &find_paper_file("context", "tex", $filecomp, "cont-sys.rme");
+ my $inp = &find_paper_file("context", "tex", $filecomp, "cont-sys.rme", $dftfile);
return () unless $inp;
my @sizes = keys %pdftex_papersize;