From 6193fb65a3207a2affe30735bc746e87d6a38f12 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 18 Jun 2014 18:16:38 +0000 Subject: Escape % in $OutputFilename for Ghostscript. Report and patch from William M Fischer, tex-k mail 16 Jun 2014 18:45:12. git-svn-id: svn://tug.org/texlive/trunk@34293 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/extra/epstopdf/Makefile | 11 ++++++++--- Build/source/extra/epstopdf/epstopdf.pl | 6 +++++- Build/source/extra/epstopdf/test-per%cent.eps | 12 ++++++++++++ 3 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 Build/source/extra/epstopdf/test-per%cent.eps (limited to 'Build') diff --git a/Build/source/extra/epstopdf/Makefile b/Build/source/extra/epstopdf/Makefile index 8e188e18c48..155b4750062 100644 --- a/Build/source/extra/epstopdf/Makefile +++ b/Build/source/extra/epstopdf/Makefile @@ -6,7 +6,7 @@ e2p = ./$(prg).pl #--debug re2p = ./r$(prg) --restricted re2p_script = ./r$(prg) -default: check +default: # These are not comprehensive tests by any means. Mostly we're just # making sure we don't crash. @@ -16,11 +16,12 @@ check: check-help check-version \ check-restricted-gscmd \ check-gscmd check-gsopt check-gsopts \ check-filter check-filter-outfile check-write-error check-gscmd \ + check-restricted-safe-in check-restricted-safe-out \ check-simple check-atend check-binary check-bin2 \ check-binhdr-lf check-binhdr-cr check-binhdr-crlf \ + check-percent \ check-tn5002 #check-floral -# needs new kpsewhich: check-restricted-safe-in check-restricted-safe-out check-help: $(e2p) --help @@ -97,6 +98,10 @@ check-binhdr-cr: check-binhdr-crlf: $(MAKE) file=test-binhdr-crlf check1 +check-percent: + $(MAKE) file=test-per%cent check1 + test -s test-per%cent.pdf + check-tn5002: $(MAKE) file=test-tn5002-cr check1 $(MAKE) file=test-tn5002-crlf check1 @@ -120,7 +125,7 @@ $(prg).tar.gz: README $(prg).pl $(prg).1 r$(prg).1 $(prg).man1.pdf cp $^ $(prg) tar cvzf $(prg).tar.gz $(prg) rm -rf $(prg) - # upload .tar.gz to ctan.org/upload, move .html to ~www/$(prg). + # upload .tar.gz to ctan.org/upload, mv .html ~www/$(prg). groff = groff groff_opts = -man -t diff --git a/Build/source/extra/epstopdf/epstopdf.pl b/Build/source/extra/epstopdf/epstopdf.pl index 97d0109ddc7..b08bc4ff5cb 100755 --- a/Build/source/extra/epstopdf/epstopdf.pl +++ b/Build/source/extra/epstopdf/epstopdf.pl @@ -34,9 +34,12 @@ # "%%BoundingBox: (atend)" when input is not seekable (e.g., from a pipe), # # emacs-page -my $ver = "2.21"; +my $ver = "2.22"; # History +# 2014/06/18 v2.22 (Karl Berry) +# * escape % in $outputfilename; report from William Fischer, +# tex-k mail 16 Jun 2014 18:45:12. # 2014/01/17 v2.21 (Karl Berry) # * tweaks to help message, per reports from Knuth. # 2013/09/28 v2.20 (Heiko Oberdiek, and (a little) Karl Berry) @@ -555,6 +558,7 @@ if (! $OutputFilename) { $OutputFilename = "-"; } } +$OutputFilename =~ s/%/%%/g; # we will do the escaping for gs debug "Output filename:", $OutputFilename; push @GS, "-sOutputFile=$OutputFilename"; diff --git a/Build/source/extra/epstopdf/test-per%cent.eps b/Build/source/extra/epstopdf/test-per%cent.eps new file mode 100644 index 00000000000..10a06d16543 --- /dev/null +++ b/Build/source/extra/epstopdf/test-per%cent.eps @@ -0,0 +1,12 @@ +%!PS-Adobe-3.0 EPSF-3.0 +%%BoundingBox: 0 0 100 100 +%%Creator: Karl Berry +%%Title: Simple epstopdf test + +% This file is public domain. + +gsave +0 0 moveto +100 100 lineto +stroke +grestore -- cgit v1.2.3