summaryrefslogtreecommitdiff
path: root/Master/tlpkg/TeXLive
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2015-10-10 01:59:39 +0000
committerNorbert Preining <preining@logic.at>2015-10-10 01:59:39 +0000
commit9554e074f1acc1574483d297f11d891988439c6b (patch)
tree4660b27bcf5cb069b7b23fb2f42389f243a00528 /Master/tlpkg/TeXLive
parent820d1c9dd7a59b53a7b49cb5299622bf8c3e738c (diff)
TLPaper: fix regexp according to Karl's suggestions
git-svn-id: svn://tug.org/texlive/trunk@38608 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/TeXLive')
-rw-r--r--Master/tlpkg/TeXLive/TLPaper.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/Master/tlpkg/TeXLive/TLPaper.pm b/Master/tlpkg/TeXLive/TLPaper.pm
index 66c834636d7..be2b375e824 100644
--- a/Master/tlpkg/TeXLive/TLPaper.pm
+++ b/Master/tlpkg/TeXLive/TLPaper.pm
@@ -333,7 +333,7 @@ sub paper_pdftex {
# read the lines and the last pdfpageswidth/height wins
for my $idx (0..$#lines) {
my $l = $lines[$idx];
- if ($l =~ m/\\(pdf|luatex|)pagewidth\s*=?\s*([0-9\.][0-9\.]*\s+true\s+[^\s]*)/) {
+ if ($l =~ m/\\(pdf|luatex|)pagewidth\s*=?\s*([0-9.,]+\s*true\s*[^\s]*)/) {
if (defined($cpw) && $cpw ne $2) {
tl_warn("TLPaper: inconsistent paper sizes in $inp for page width! Please fix that.\n");
return $F_ERROR;
@@ -342,7 +342,7 @@ sub paper_pdftex {
push @cpwidx, $idx;
next;
}
- if ($l =~ m/\\(pdf|luatex|)pageheight\s*=?\s*([0-9\.][0-9\.]*\s+true\s+[^\s]*)/) {
+ if ($l =~ m/\\(pdf|luatex|)pageheight\s*=?\s*([0-9.,]+\s*true\s*[^\s]*)/) {
if (defined($cph) && $cph ne $2) {
tl_warn("TLPaper: inconsistent paper sizes in $inp for page height! Please fix that.\n");
return $F_ERROR;
@@ -399,7 +399,7 @@ sub paper_pdftex {
for my $idx (@cpwidx) {
ddebug("TLPaper: before line: $lines[$idx]");
ddebug("TLPaper: replacement: $newwidth\n");
- $lines[$idx] =~ s/pagewidth\s*=\s*[0-9\.][0-9\.]*\s+true\s+[^\s]*/pagewidth=$newwidth/;
+ $lines[$idx] =~ s/pagewidth\s*=\s*[0-9.,]+\s*true\s*[^\s]*/pagewidth=$newwidth/;
ddebug("TLPaper: after line : $lines[$idx]");
}
} else {
@@ -416,7 +416,7 @@ sub paper_pdftex {
for my $idx (@cphidx) {
ddebug("TLPaper: before line: $lines[$idx]");
ddebug("TLPaper: replacement: $newheight\n");
- $lines[$idx] =~ s/pageheight\s*=\s*[0-9\.][0-9\.]*\s+true\s+[^\s]*/pageheight=$newheight/;
+ $lines[$idx] =~ s/pageheight\s*=\s*[0-9.,]+\s*true\s*[^\s]*/pageheight=$newheight/;
ddebug("TLPaper: after line : $lines[$idx]");
}
} else {