From 909973b12988f74f232e05ccb3bf8c76c663f664 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sun, 8 Apr 2012 12:08:29 +0000 Subject: search also default file git-svn-id: svn://tug.org/texlive/trunk@25875 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/TeXLive/TLPaper.pm | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'Master/tlpkg/TeXLive/TLPaper.pm') 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; -- cgit v1.2.3