diff options
author | Karl Berry <karl@freefriends.org> | 2017-09-16 20:47:39 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-09-16 20:47:39 +0000 |
commit | 12b257238b111240034611a07690f2c023973d87 (patch) | |
tree | e465f6b9ed1d0957f0438291145f0423d0af49f7 /Master/texmf-dist | |
parent | 777efec5d239eaae59b9eae8e47bc2bcff303307 (diff) |
epstopdf (16sep17)
git-svn-id: svn://tug.org/texlive/trunk@45323 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r-- | Master/texmf-dist/doc/man/man1/epstopdf.1 | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/man/man1/epstopdf.man1.pdf | bin | 9997 -> 9997 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/man/man1/repstopdf.man1.pdf | bin | 9997 -> 9997 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/support/epstopdf/README | 11 | ||||
-rwxr-xr-x | Master/texmf-dist/scripts/epstopdf/epstopdf.pl | 15 |
5 files changed, 19 insertions, 9 deletions
diff --git a/Master/texmf-dist/doc/man/man1/epstopdf.1 b/Master/texmf-dist/doc/man/man1/epstopdf.1 index 659de23e90e..b634ebb47ee 100644 --- a/Master/texmf-dist/doc/man/man1/epstopdf.1 +++ b/Master/texmf-dist/doc/man/man1/epstopdf.1 @@ -1,5 +1,5 @@ .TH EPSTOPDF 1 "7 January 2017" -.\" $Id: epstopdf.1 41288 2016-05-29 16:50:38Z karl $ +.\" $Id: epstopdf.1 42895 2017-01-08 00:10:22Z karl $ .SH NAME epstopdf, repstopdf \- convert an EPS file to PDF .SH SYNOPSIS diff --git a/Master/texmf-dist/doc/man/man1/epstopdf.man1.pdf b/Master/texmf-dist/doc/man/man1/epstopdf.man1.pdf Binary files differindex f6108d4dfcb..da0b260d162 100644 --- a/Master/texmf-dist/doc/man/man1/epstopdf.man1.pdf +++ b/Master/texmf-dist/doc/man/man1/epstopdf.man1.pdf diff --git a/Master/texmf-dist/doc/man/man1/repstopdf.man1.pdf b/Master/texmf-dist/doc/man/man1/repstopdf.man1.pdf Binary files differindex 6476dba162f..fc5e2cacbd7 100644 --- a/Master/texmf-dist/doc/man/man1/repstopdf.man1.pdf +++ b/Master/texmf-dist/doc/man/man1/repstopdf.man1.pdf diff --git a/Master/texmf-dist/doc/support/epstopdf/README b/Master/texmf-dist/doc/support/epstopdf/README index 26a37f7276c..7eaaae332b5 100644 --- a/Master/texmf-dist/doc/support/epstopdf/README +++ b/Master/texmf-dist/doc/support/epstopdf/README @@ -1,9 +1,9 @@ -$Id: README 32701 2014-01-17 18:09:54Z karl $ +$Id: README 42921 2017-01-10 23:39:44Z karl $ This file is public domain. (Originally written by Karl Berry, 2009.) This is the README for the epstopdf script distribution. -Primary distribution point: http://mirror.ctan.org/support/epstopdf/ +Primary distribution point: http://ctan.org/pkg/epstopdf (list of mirrors at: http://ctan.org/mirrors) Home page: http://tug.org/epstopdf/ @@ -15,7 +15,12 @@ When reporting bugs, please include an input file and command line options, so the problem can be reproduced. ------------------------------------------------------------------------- -The test-binary and test-bin2 files were supplied by Akira Kakuto and +Various test files and a Makefile to exercise them are in the source +repository, which is currently a subdirectory of the texlive Subversion +repo, purely for the developers' convenience: + http://tug.org/svn/texlive/trunk/Build/source/extra/epstopdf/ + +The test-binary and test-bin2 files there were supplied by Akira Kakuto and Reinhard Kotucha. They contain binary data. They are public domain. The test-binhdr* files were supplied by Martin von Gagern, constructed 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 { |