summaryrefslogtreecommitdiff
path: root/Build/source/texk/texlive/linked_scripts/epstopdf
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-10-03 15:11:02 +0000
committerKarl Berry <karl@freefriends.org>2009-10-03 15:11:02 +0000
commit99bced286f484569cc8f7d154e985274d71bfbd3 (patch)
tree66a03c2c30747ec9c5cdccf87e11fcae5efea883 /Build/source/texk/texlive/linked_scripts/epstopdf
parentb54eab728de161a3eaf55db1baca915ef1fcb4d2 (diff)
epstopdf 2.11 (30sep09)
git-svn-id: svn://tug.org/texlive/trunk@15605 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/texlive/linked_scripts/epstopdf')
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/epstopdf/epstopdf.pl373
1 files changed, 227 insertions, 146 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/epstopdf/epstopdf.pl b/Build/source/texk/texlive/linked_scripts/epstopdf/epstopdf.pl
index 862743c8118..4349ed87024 100755
--- a/Build/source/texk/texlive/linked_scripts/epstopdf/epstopdf.pl
+++ b/Build/source/texk/texlive/linked_scripts/epstopdf/epstopdf.pl
@@ -2,39 +2,100 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' && eval 'exec perl -S $0 $
if 0;
use strict;
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Change by Thomas Esser, Sept. 1998: The above lines allows us to find
-# perl along $PATH rather than guessing a fixed location. The above
-# construction should work with most shells.
-
-# A script to transform an EPS file so that:
-# a) it is guaranteed to start at the 0,0 coordinate
+# $Id: epstopdf.pl 15569 2009-09-30 00:21:49Z karl $
+# (Copyright lines below.)
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote
+# products derived from this software without specific prior written
+# permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR S IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+# ----------------------------------------------------------------
+#
+# This is a script to transform an EPS file such that:
+# a) it is guaranteed to start at the 0,0 coordinate.
# b) it sets a page size exactly corresponding to the BoundingBox
# This means that when Ghostscript renders it, the result needs no
# cropping, and the PDF MediaBox is correct.
-# c) the result is piped to Ghostscript and a PDF version written
+# c) the result is piped to Ghostscript and a PDF version written.
#
# It needs a Level 2 PS interpreter.
-# If the bounding box is not right, of course, you have problems...
-#
-# The only thing I have not allowed for is the case of
-# "%%BoundingBox: (atend)", which is more complicated.
-#
-# Sebastian Rahtz, for Elsevier Science
-#
-# now with extra tricks from Hans Hagen's texutil.
+# If the bounding box is not right, of course, there will be problems.
#
+# One thing not allowed for is the case of
+# "%%BoundingBox: (atend)" when input is not seekable (e.g., from a pipe),
+# which is more complicated.
+#
+# emacs-page
# History
+# 2009/09/27 v2.11 (Karl Berry)
+# * Fixed two bugs in the (atend) handling code (Martin von Gagern)
+# * Improved handling of CR line ending (Martin von Gagern)
+# * More error checking
+# * --version option
+# * Create source repository in TeX Live
+# 2009/07/17 v2.9.11gw
+# * Added -dSAFER to default gs options
+# TL2009 wants to use a restricted variant of -shell-escape,
+# allowing epstopdf to run. However without -dSAFER Ghostscript
+# allows writing to files (other than given in -sOutputFile)
+# and running commands (through Ghostscript pipe's language feature).
+# 2009/05/09 v2.9.10gw
+# * Changed cygwin name for ghostscript to gs
+# 2008/08/26 v2.9.9gw
+# * Switch to embed fonts (default=yes) (J.P. Chretien)
+# * turned no AutoRotatePages into an option (D. Kreil) (default = None)
+# * Added resolution switch (D. Kreil)
+# * Added BSD-style license
+# 2007/07/18 v2.9.8gw
+# 2007/05/18 v.2.9.7gw (Gerben Wierda)
+# * Merged both supplied 2.9.6 versions
+# 2007/05/15 v2.9.6tp (Theo Papadopoulo)
+# * Simplified the (atend) support
+# 2007/01/24 v2.9.6sw (Staszek Wawrykiewicz)
+# * patched to work also on Windows
+# 2005/10/06 v2.9.5gw (Gerben Wierda)
+# * Fixed a horrendous bug in the (atend) handling code
+# 2005/10/06 v2.9.4gw (Gerben Wierda)
+# * This has become the official version for now
+# 2005/10/01 v2.9.3draft (Gerben Wierda)
+# * Quote OutFilename
+# 2005/09/29 v2.9.2draft (Gerben Wierda)
+# * Quote OutFilename
+# 2004/03/17 v2.9.1draft (Gerben Wierda)
+# * No autorotate page
+# 2003/04/22 v2.9draft (Gerben Wierda)
+# * Fixed bug where with cr-eol files everything up to the first %!
+# * in the first 2048 bytes was gobbled (double ugh!)
+# 2002/02/21 v2.8draft (Gerben Wierda)
+# * Fixed bug where last line of buffer was not copied out (ugh!)
+# 2002/02/18 v2.8draft (Gerben Wierda)
+# * Handle different eol styles transparantly
+# * Applied fix from Peder Axensten for Freehand bug
+# 2001/03/05 v2.7 (Heiko Oberdiek)
+# * Newline before grestore for the case that there is no
+# whitespace at the end of the eps file.
+# 2000/11/05 v2.6 (Heiko Oberdiek)
+# * %%HiresBoundingBox corrected to %%HiResBoundingBox
# 1999/05/06 v2.5 (Heiko Oberdiek)
# * New options: --hires, --exact, --filter, --help.
# * Many cosmetics: title, usage, ...
@@ -50,117 +111,103 @@ use strict;
# * using of $bbxpat in all BoundingBox cases,
# correct the first white space to '...Box:\s*$bb...'
# * corrected first line (one line instead of two before 'if 0;';
-# 2000/11/05 v2.6 (Heiko Oberdiek)
-# * %%HiresBoundingBox corrected to %%HiResBoundingBox
-# 2001/03/05 v2.7 (Heiko Oberdiek)
-# * Newline before grestore for the case that there is no
-# whitespace at the end of the eps file.
-# 2002/02/18 v2.8draft (Gerben Wierda)
-# * Handle different eol styles transparantly
-# * Applied fix from Peder Axensten for Freehand bug
-# 2002/02/21 v2.8draft (Gerben Wierda)
-# * Fixed bug where last line of buffer was not copied out (ugh!)
-# 2003/04/22 v2.9draft (Gerben Wierda)
-# * Fixed bug where with cr-eol files everything up to the first %!
-# * in the first 2048 bytes was gobbled (double ugh!)
-# 2004/03/17 v2.9.1draft (Gerben Wierda)
-# * No autorotate page
-# 2005/09/29 v2.9.2draft (Gerben Wierda)
-# * Quote OutFilename
-# 2005/10/01 v2.9.3draft (Gerben Wierda)
-# * Quote OutFilename
-# 2005/10/06 v2.9.4gw (Gerben Wierda)
-# * This has become the official version for now
-# 2005/10/06 v2.9.5gw (Gerben Wierda)
-# * Fixed a horrendous bug in the (atend) handling code
-# 2007/01/24 v2.9.6sw (Staszek Wawrykiewicz)
-# * patched to work also on Windows
-# 2007/05/15 v2.9.6tp (Theo Papadopoulo)
-# * Simplified the (atend) support
-# 2007/05/18 v.2.9.7gw (Gerben Wierda)
-# * Merged both supplied 2.9.6 versions
-# 2007/07/18 v2.9.8gw
-# 2008/08/26 v2.9.9gw
-# * Switch to embed fonts (default=yes) (J.P. Chretien)
-# * turned no AutoRotatePages into an option (D. Kreil) (default = None)
-# * Added resolution switch (D. Kreil)
-# * Added BSD-style license
-# 2009/05/09 v2.9.10gw
-# * Changed cygwin name for ghostscript to gs
-# 2009/07/17 v2.9.11gw
-# * Added -dSAFER to default gs options
-# TL2009 wants to use a restricted variant of -shell-escape,
-# allowing epstopdf to run. However without -dSAFER Ghostscript
-# allows writing to files (other than given in -sOutputFile)
-# and running commands (through Ghostscript pipe's language feature).
+#
+# Thomas Esser, Sept. 1998: change initial lines to find
+# perl along $PATH rather than guessing a fixed location. The above
+# construction should work with most shells.
+#
+# Originally by Sebastian Rahtz, for Elsevier Science
+# with extra tricks from Hans Hagen's texutil and many more.
+# emacs-page
### program identification
my $program = "epstopdf";
-my $filedate="2009/07/19";
-my $fileversion="2.9.11gw";
-my $copyright = "Copyright 1998-2001 by Sebastian Rahtz et al., 2002-2009 by Gerben Wierda et al. Free software under a BSD-style license.";
-my $title = "\U$program\E $fileversion, $filedate - $copyright\n";
+my $ident = '($Id: epstopdf.pl 15569 2009-09-30 00:21:49Z karl $) 2.11';
+my $copyright = <<END_COPYRIGHT ;
+Copyright 1998-2001 Sebastian Rahtz et al.
+Copyright 2002-2009 Gerben Wierda et al.
+Copyright 2009 Karl Berry et al.
+License RBSD: Revised BSD <http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5>
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
+END_COPYRIGHT
+my $title = "$program $ident\n";
### ghostscript command name
my $GS = "gs";
$GS = "gswin32c" if $^O eq 'MSWin32';
### options
-$::opt_help=0;
-$::opt_debug=0;
+$::opt_outfile="";
$::opt_compress=1;
-$::opt_gs=1;
+$::opt_debug=0;
$::opt_embed=1;
-$::opt_hires=0;
$::opt_exact=0;
$::opt_filter=0;
-$::opt_outfile="";
+$::opt_gs=1;
+$::opt_hires=0;
+$::opt_gscmd="";
$::opt_res=0;
$::opt_autorotate="None";
### usage
my @bool = ("false", "true");
-my $resmsg=$::opt_res? $::opt_res:"[use gs default]";
-my $rotmsg=$::opt_autorotate? $::opt_autorotate:"[use gs default]";
+my $resmsg = $::opt_res ? $::opt_res : "[use gs default]";
+my $rotmsg = $::opt_autorotate ? $::opt_autorotate : "[use gs default]";
my $usage = <<"END_OF_USAGE";
-${title}Syntax: $program [options] <eps file>
+${title}Usage: $program [OPTION]... [EPSFILE]
+
+Convert EPS to PDF, by default using Ghostscript.
+
Options:
- --help: print usage
- --outfile=<file>: write result to <file>
- --res=<dpi>: set image resolution (default: $resmsg);
- --(no)filter: read standard input (default: $bool[$::opt_filter])
- --(no)gs: run ghostscript (default: $bool[$::opt_gs])
- --(no)compress: use compression (default: $bool[$::opt_compress])
- --(no)embed: embed fonts (default: $bool[$::opt_embed])
- --(no)hires: scan HiResBoundingBox (default: $bool[$::opt_hires])
- --(no)exact: scan ExactBoundingBox (default: $bool[$::opt_exact])
- --(no)debug: debug informations (default: $bool[$::opt_debug])
- --autorotate=<val>: set AutoRotatePages (default: $rotmsg)
- Recognized values: None, All, PageByPage
+ --help display this help and exit
+ --version display version information and exit
+
+ --outfile=FILE write result to FILE
+ --(no)compress use compression (default: $bool[$::opt_compress])
+ --(no)debug write debugging info (default: $bool[$::opt_debug])
+ --(no)embed embed fonts (default: $bool[$::opt_embed])
+ --(no)exact scan ExactBoundingBox (default: $bool[$::opt_exact])
+ --(no)filter read standard input (default: $bool[$::opt_filter])
+ --(no)gs run ghostscript (default: $bool[$::opt_gs])
+ --(no)hires scan HiResBoundingBox (default: $bool[$::opt_hires])
+ --gscmd=VAL pipe output to VAL (default: $GS)
+ --res=DPI set image resolution (default: $resmsg)
+ --autorotate=VAL set AutoRotatePages (default: $rotmsg)
+ Recognized VAL choices: None, All, PageByPage
For EPS files, PageByPage is equivalent to All
Examples for producing 'test.pdf':
* $program test.eps
* produce postscript | $program --filter >test.pdf
* produce postscript | $program -f -d -o=test.pdf
+
Example: look for HiResBoundingBox and produce corrected PostScript:
- * $program -d --nogs -hires test.ps>testcorr.ps
+ * $program -d --nogs --hires test.ps >testcorr.ps
+
+When reporting bugs, please include an input file and command line
+options so the problem can be reproduced.
+
+Report bugs to: tex-k\@tug.org
+epstopdf home page: <http://tug.org/epstopdf/>
END_OF_USAGE
### process options
use Getopt::Long;
GetOptions (
- "help!",
+ "help",
+ "version",
+ "outfile=s",
+ "compress!",
"debug!",
+ "embed!",
+ "exact!",
"filter!",
- "compress!",
"gs!",
- "embed!",
"hires!",
- "exact!",
- "outfile=s",
- "autorotate=s",
+ "gscmd=s",
"res=i",
+ "autorotate=s",
) or die $usage;
### help functions
@@ -168,17 +215,27 @@ sub debug {
print STDERR "* @_\n" if $::opt_debug;
}
sub warning {
- print STDERR "==> Warning: @_!\n";
+ print STDERR "==> Warning: @_\n";
}
sub error {
- die "$title!!! Error: @_!\n";
+ die "$title!!! Error: @_\n";
}
sub errorUsage {
- die "$usage\n!!! Error: @_!\n";
+ die "$usage\n!!! Error: @_\n";
+}
+
+### help, version options.
+if ($::opt_help) {
+ print $usage;
+ exit (0);
+}
+
+if ($::opt_version) {
+ print $title;
+ print $copyright;
+ exit (0);
}
-### option help
-die $usage if $::opt_help;
### get input filename
my $InputFilename = "";
@@ -192,20 +249,23 @@ else {
@ARGV > 0 or die errorUsage "Input filename missing";
@ARGV < 2 or die errorUsage "Unknown option or too many input files";
$InputFilename = $ARGV[0];
- -f $InputFilename or error "\"$InputFilename\" does not exist";
+ #-r $InputFilename or error "\"$InputFilename\" not readable";
debug "Input filename:", $InputFilename;
}
### option compress & embed
my $GSOPTS = "-dSAFER ";
-$GSOPTS .= " -dPDFSETTINGS=/prepress -dMaxSubsetPct=100 -dSubsetFonts=true -dEmbedAllFonts=true " if $::opt_embed;
+$GSOPTS .= (" -dPDFSETTINGS=/prepress -dMaxSubsetPct=100 "
+ . "-dSubsetFonts=true -dEmbedAllFonts=true ")
+ if $::opt_embed;
$GSOPTS .= "-dUseFlateCompression=false " unless $::opt_compress;
$GSOPTS .= "-r$::opt_res " if $::opt_res;
-$resmsg=$::opt_res? $::opt_res:"[use gs default]";
+$resmsg= $::opt_res ? $::opt_res : "[use gs default]";
$GSOPTS .= "-dAutoRotatePages=/$::opt_autorotate " if $::opt_autorotate;
die "Invalid value for autorotate: '$::opt_autorotate' (use 'All', 'None' or 'PageByPage').\n"
- if ($::opt_autorotate and not $::opt_autorotate =~ /^(None|All|PageByPage)$/);
-$rotmsg=$::opt_autorotate? $::opt_autorotate:"[use gs default]";
+ if ($::opt_autorotate and
+ not $::opt_autorotate =~ /^(None|All|PageByPage)$/);
+$rotmsg = $::opt_autorotate ? $::opt_autorotate : "[use gs default]";
### option BoundingBox types
my $BBName = "%%BoundingBox:";
@@ -236,51 +296,65 @@ else {
debug "Output filename:", $OutputFilename;
}
+### option gscmd
+if ($::opt_gscmd) {
+ debug "Switching from $GS to $::opt_gscmd";
+ $GS = $::opt_gscmd;
+}
+
### option gs
if ($::opt_gs) {
debug "Ghostscript command:", $GS;
debug "Compression:", ($::opt_compress) ? "on" : "off";
debug "Embedding:", ($::opt_embed) ? "on" : "off";
- debug("Rotation: $rotmsg");
- debug("Resolution: $resmsg");
+ debug "Rotation:", $rotmsg;
+ debug "Resolution:", $resmsg;
}
+### emacs-page
### open input file
-open(IN,"<$InputFilename") or error "Cannot open",
- ($::opt_filter) ? "standard input" : "\"$InputFilename\"";
+open(IN, "<$InputFilename") or error "Cannot open",
+ ($::opt_filter) ? "standard input" : "\"$InputFilename\": $!";
binmode IN;
### open output file
+my $outname; # used in error message at end
if ($::opt_gs) {
my $pipe = "$GS -q -sDEVICE=pdfwrite $GSOPTS" .
" -sOutputFile=\"$OutputFilename\" - -c quit";
debug "Ghostscript pipe:", $pipe;
open(OUT,"|$pipe") or error "Cannot open Ghostscript for piped input";
+ $outname = $GS;
}
else {
open(OUT,">$OutputFilename") or error "Cannot write \"$OutputFilename\"";
+ $outname = $OutputFilename;
}
+binmode OUT;
# reading a cr-eol file on a lf-eol system makes it impossible to parse
# the header and besides it will read the intire file into yor line by line
# scalar. this is also true the other way around.
+### emacs-page
### scan a block, try to determine eol style
my $buf;
my $buflen;
my @bufarray;
-my $bufarraypos;
+my $inputpos;
# We assume 2048 is big enough.
my $EOLSCANBUFSIZE = 2048;
-$buflen = read( IN, $buf, $EOLSCANBUFSIZE);
+$buflen = read(IN, $buf, $EOLSCANBUFSIZE);
if ($buflen > 0) {
my $crlfpos;
my $lfpos;
my $crpos;
+ $inputpos = 0;
+
# remove binary junk before header
# if there is no header, we assume the file starts with ascii style and
# we look for a eol style anyway, to prevent possible loading of the
@@ -288,10 +362,11 @@ if ($buflen > 0) {
if ($buf =~ /%!/) {
# throw away binary junk before %!
$buf =~ s/(.*?)%!/%!/o;
+ $inputpos = length($1);
}
- $lfpos = index( $buf, "\n");
- $crpos = index( $buf, "\r");
- $crlfpos = index( $buf, "\r\n");
+ $lfpos = index($buf, "\n");
+ $crpos = index($buf, "\r");
+ $crlfpos = index($buf, "\r\n");
if ($crpos > 0 and ($lfpos == -1 or $lfpos > $crpos+1)) {
# The first eol was a cr and it was not immediately followed by a lf
@@ -303,34 +378,31 @@ if ($buflen > 0) {
# it to our buffer. This will make the buffer contain an entire line
# at the end. Then split the buffer in an array. We will draw lines from
# that array until it is empty, then move again back to <IN>
- $buf .= <IN> unless eof( IN);
- $buflen = length( $buf);
- $bufarraypos = 0;
+ $buf .= <IN> unless eof(IN);
+ $buflen = length($buf);
# Some extra magic is needed here: if we set $/ to \r, Perl's re engine
# still thinks eol is \n in regular expressions (not very nice) so we
- # cannot split on ^, but have to split on \r and reappend those.
+ # cannot split on ^, but have to split on a look-behind for \r.
if ($/ eq "\r") {
- @bufarray = split( /\r/ms, $buf); # split on \r
- grep( $_ .= "\r", @bufarray); # re-append \r to each array item
+ @bufarray = split(/(?<=\r)/ms, $buf); # split after \r
}
else {
- @bufarray = split( /^/ms, $buf);
+ @bufarray = split(/^/ms, $buf);
}
}
### getline
-sub getline {
+sub getline
+{
if ($#bufarray >= 0) {
- $_ = shift( @bufarray);
- $bufarraypos += length( $_);
- # debug "getline from array. bufarraypos = $bufarraypos";
- # debug "*** READ: $_";
+ $_ = shift(@bufarray);
}
else {
$_ = <IN>;
}
- return( defined( $_));
+ $inputpos += length($_) if defined $_;
+ return defined($_);
}
### scan first line
@@ -350,7 +422,8 @@ my $bbxpatt = '[0-9eE\.\-]';
my $BBValues = "\\s*($bbxpatt+)\\s+($bbxpatt+)\\s+($bbxpatt+)\\s+($bbxpatt+)";
my $BBCorrected = 0;
-sub CorrectBoundingBox {
+sub CorrectBoundingBox
+{
my ($llx, $lly, $urx, $ury) = @_;
debug "Old BoundingBox:", $llx, $lly, $urx, $ury;
my ($width, $height) = ($urx - $llx, $ury - $lly);
@@ -358,11 +431,12 @@ sub CorrectBoundingBox {
debug "New BoundingBox: 0 0", $width, $height;
debug "Offset:", $xoffset, $yoffset;
- print OUT "%%BoundingBox: 0 0 $width $height\n";
- print OUT "<< /PageSize [$width $height] >> setpagedevice\n";
- print OUT "gsave $xoffset $yoffset translate\n";
+ print OUT "%%BoundingBox: 0 0 $width $height$/";
+ print OUT "<< /PageSize [$width $height] >> setpagedevice$/";
+ print OUT "gsave $xoffset $yoffset translate$/";
}
+### emacs-page
### scan header
if ($header) {
HEADER: while (getline()) {
@@ -376,7 +450,7 @@ if ($header) {
}
### BoundingBox with values
- if (/^$BBName$BBValues/) {
+ if (/^$BBName$BBValues/o) {
CorrectBoundingBox $1, $2, $3, $4;
$BBCorrected = 1;
last;
@@ -390,18 +464,16 @@ if ($header) {
"with option --filter";
last;
}
- my $pos = tell(OUT)+length($_);
+ my $pos = $inputpos;
debug "Current file position:", $pos;
# looking for %%BoundingBox
while (getline()) {
# skip over included documents
- if (/^%%BeginDocument/) {
- while (getline()) {
- last if /^%%EndDocument/;
- }
- }
- if (/^$BBName$BBValues/) {
+ my $nestDepth = 0;
+ $nestDepth++ if /^%%BeginDocument/;
+ $nestDepth-- if /^%%EndDocument/;
+ if ($nestDepth == 0 && /^$BBName$BBValues/o) {
CorrectBoundingBox $1, $2, $3, $4;
$BBCorrected = 1;
last;
@@ -409,7 +481,7 @@ if ($header) {
}
# go back
- seek( IN, $pos, 0) or error "Cannot go back to line \"$BBName (atend)\"";
+ seek(IN, $pos, 0) or error "Cannot go back to line \"$BBName (atend)\"";
last;
}
@@ -423,9 +495,18 @@ while (getline()) {
print OUT;
}
+### emacs-page
### close files
close(IN);
-print OUT "\ngrestore\n" if $BBCorrected;
+print OUT "$/grestore$/" if $BBCorrected;
close(OUT);
+
+# if ghostscript exited badly, we should too.
+if ($? & 127) {
+ error(sprintf "Writing to $outname failed, signal %d\n", $? & 127);
+} elsif ($? != 0) {
+ error(sprintf "Writing to $outname failed, error code %d\n", $? >> 8);
+}
+
warning "BoundingBox not found" unless $BBCorrected;
debug "Ready.";