diff options
| -rw-r--r-- | Build/source/extra/epstopdf/Makefile | 21 | ||||
| -rw-r--r-- | Build/source/extra/epstopdf/epstopdf.1 | 20 | ||||
| -rwxr-xr-x | Build/source/extra/epstopdf/epstopdf.pl | 8 |
3 files changed, 33 insertions, 16 deletions
diff --git a/Build/source/extra/epstopdf/Makefile b/Build/source/extra/epstopdf/Makefile index d7baaf62699..85e2224c283 100644 --- a/Build/source/extra/epstopdf/Makefile +++ b/Build/source/extra/epstopdf/Makefile @@ -2,7 +2,8 @@ # This file is public domain. (Originally written by Karl Berry, 2009.) e2p = ./epstopdf.pl #--debug -re2p = ./repstopdf +re2p = ./repstopdf --restricted +re2p_script = ./repstopdf default: check @@ -10,22 +11,34 @@ default: check # making sure we don't crash. check: check-help check-version \ check-help-r \ + check-restricted-gscmd \ check-filter check-write-error check-gscmd \ check-simple check-atend check-binary check-bin2 \ check-binhdr-lf check-binhdr-cr check-binhdr-crlf \ +# needs new kpsewhich: check-restricted-safe-in check-restricted-safe-out check-help: $(e2p) --help check-version: $(e2p) --version -check-help-r: $(re2p) - $(re2p) --help | grep restricted # should have default=true +check-help-r: $(re2p_script) + $(re2p_script) --help | grep restricted # should have default=true -$(re2p): +$(re2p_script): ln -s epstopdf.pl $@ +check-restricted-gscmd: + ! $(re2p) --gscmd=/bin/unsafe test-simple.eps + ! $(re2p) --gscmd=unsafe test-simple.eps + +check-restricted-safe-in: + ! $(re2p) /unsafe/in.eps + +check-restricted-safe-out: + ! $(re2p) test-simple.eps -o /unsafe/out.eps + check-filter: cat test-simple.eps | $(e2p) --filter >test-filter.pdf pdfinfo test-filter.pdf | grep "Page size:" diff --git a/Build/source/extra/epstopdf/epstopdf.1 b/Build/source/extra/epstopdf/epstopdf.1 index 8362b70714b..3f410dc7bd4 100644 --- a/Build/source/extra/epstopdf/epstopdf.1 +++ b/Build/source/extra/epstopdf/epstopdf.1 @@ -1,4 +1,4 @@ -.TH EPSTOPDF 1 "30 November 2009" +.TH EPSTOPDF 1 "26 February 2010" .\" $Id$ .\" man page originally by Jim Van Zandt .SH NAME @@ -41,15 +41,16 @@ set image resolution (default: [use gs default]) set AutoRotatePages (default: None); recognized \fIval\fP choices: None, All, PageByPage. For EPS files, PageByPage is equivalent to All. .IP "\fB--restricted\fP=\fIval\fP" -turn on restricted mode (default: [on for resptopdf, else off]); +turn on restricted mode (default: [on for repstopdf, else off]); this restricts the values accepted by \fB--gscmd\fP and impose restrictions -on the output file name similar to web2c's openout_any=p. +on the input and output file names similar to Web2c's openin_any=p and +openout_any=p. .IP "\fB--help\fP display help message and exit .IP "\fB--version\fP display version information and exit .SH EXAMPLES -Examples for producing "test.pdf": +Examples which produce "test.pdf": .nf epstopdf test.eps produce postscript | epstopdf --filter >test.pdf @@ -64,12 +65,15 @@ epstopdf -d --nogs --hires test.ps >testcorr.ps The case of "%%BoundingBox: (atend)" when input is not seekable (e.g., from a pipe) is not supported. .PP -When reporting bugs, please include an input file and command line -options so the problem can be reproduced. Report bugs in -the program or this man page to tex-k@tug.org. +Report bugs in the program or this man page to tex-k@tug.org. When +reporting bugs, please include an input file and the command line +options specified, so the problem can be reproduced. .SH SEE ALSO \fBgs\fP(1), \fBpdfcrop\fP(1). +.PP +The epstopdf LaTeX package, part of the oberdiek bundle, which automates +running this script on the fly under TeX: http://ctan.org/pkg/epstopdf-pkg. .SH AUTHOR The script was originally written by Sebastian Rahtz, for Elsevier Science, with subsequent contributions from Gerben Wierda and many @@ -77,6 +81,6 @@ others. Currently maintained by Karl Berry. .PP Man page originally written by Jim Van Zandt. .PP -epstopdf home page: http://tug.org/epstopdf/ +epstopdf home page: http://tug.org/epstopdf. .PP You may freely use, modify and/or distribute this file. diff --git a/Build/source/extra/epstopdf/epstopdf.pl b/Build/source/extra/epstopdf/epstopdf.pl index 28797645424..098b7a52d0b 100755 --- a/Build/source/extra/epstopdf/epstopdf.pl +++ b/Build/source/extra/epstopdf/epstopdf.pl @@ -46,7 +46,7 @@ use strict; # # emacs-page # History -# 2010/02/25 v2.13 (Karl Berry) +# 2010/02/26 v2.13 (Karl Berry) # * New release. # 2010/02/23 (Manuel P\'egouri\'e-Gonnard) # * Use kpsewhich for filename validation in restricted mode, both input and @@ -140,7 +140,7 @@ use strict; ### program identification my $program = "epstopdf"; -my $ident = '($Id$) 2.12'; +my $ident = '($Id$) 2.13'; my $copyright = <<END_COPYRIGHT ; Copyright 2009-2010 Karl Berry et al. Copyright 2002-2009 Gerben Wierda et al. @@ -238,7 +238,7 @@ GetOptions ( sub debug { print STDERR "* @_\n" if $::opt_debug; } sub warning { print STDERR "==> Warning: @_\n"; } sub error { die "$title!!! Error: @_\n"; } -sub errorUsage { die "$usage\n!!! Error: @_\n"; } +sub errorUsage { die "Error: @_ (try --help for more information)\n"; } ### restricted option $restricted = 1 if $::opt_restricted; @@ -316,7 +316,7 @@ if ($::opt_gscmd) { if ($restricted) { $GS =~ /^(gs|mgs|gswin32c|gs386|gsos2)\z/ or $GS =~ /^gs[\-_]?(\d|\d[\.-_]?\d\d)c?\z/ - or error "Value of gscmd not allowed in restricted mode: $GS"; + or error "gscmd value not allowed in restricted mode: $GS"; } } $GS = make_full_path_w32($GS) if $restricted and ($^O eq 'MSWin32'); |