summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/scripts/epstopdf
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/scripts/epstopdf')
-rwxr-xr-xMaster/texmf-dist/scripts/epstopdf/epstopdf.pl15
1 files changed, 10 insertions, 5 deletions
diff --git a/Master/texmf-dist/scripts/epstopdf/epstopdf.pl b/Master/texmf-dist/scripts/epstopdf/epstopdf.pl
index 003855a1f32..3caf2238a80 100755
--- a/Master/texmf-dist/scripts/epstopdf/epstopdf.pl
+++ b/Master/texmf-dist/scripts/epstopdf/epstopdf.pl
@@ -1,5 +1,5 @@
#!/usr/bin/env perl
-# $Id: epstopdf.pl 41577 2016-06-30 16:38:01Z karl $
+# $Id: epstopdf.pl 45306 2017-09-14 21:41:37Z karl $
# (Copyright lines below.)
#
# Redistribution and use in source and binary forms, with or without
@@ -35,7 +35,11 @@
#
# emacs-page
#
-my $ver = "2.26";
+my $ver = "2.27";
+# 2017/09/14 v2.27 (Karl Berry)
+# * extract value from --gsopt with $3 not $2 (extra regexp group
+# added previously), and check it with ^(...)$ so anchors apply to all.
+# (report to Karl from Yannick Berker, 7 Sep 2017 14:07:09.)
# 2017/01/07 v2.26 (Norbert Preining, Karl Berry)
# * allow cmdline of infile outfile.pdf.
# * explicitly allow -o as abbreviation for --outfile,
@@ -183,7 +187,7 @@ my $ver = "2.26";
### emacs-page
### program identification
my $program = "epstopdf";
-my $ident = '($Id: epstopdf.pl 41577 2016-06-30 16:38:01Z karl $)' . " $ver";
+my $ident = '($Id: epstopdf.pl 45306 2017-09-14 21:41:37Z karl $)' . " $ver";
my $copyright = <<END_COPYRIGHT ;
Copyright 2009-2017 Karl Berry et al.
Copyright 2002-2009 Gerben Wierda et al.
@@ -295,6 +299,7 @@ my %optcheck = qw<
MonoImageFilter /(CCITTFaxEncode|FlateEncode|RunLengthEncode)
MonoImageResolution \d+
NOCIE true
+ NODISPLAY true
NOEPS true
NOINTERPOLATE true
NOPSICC true
@@ -628,9 +633,9 @@ foreach my $gsopt (@::opt_gsopt) {
my $ok = 0;
if ($gsopt =~ /^-[dD]([A-Za-z0-9]+)(=(.*))?$/) {
my $name = $1;
- my $value = $2;
+ my $value = $3;
$value = 'true' if not defined $value;
- if ($optcheck{$name} and $value =~ /^$optcheck{$name}$/) {
+ if ($optcheck{$name} and $value =~ /^($optcheck{$name})$/) {
$ok = 1;
}
else {