summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-05-29 16:50:38 +0000
committerKarl Berry <karl@freefriends.org>2016-05-29 16:50:38 +0000
commite776908e17abcb99bb71e77ba003420c43cdc2a9 (patch)
tree9766857b0c04a6acabb9d62f690d319715e27019
parent54e9903b97c119a6f9a93d081a690d25d633afe0 (diff)
Makefile: fix return code inversions.
epstopdf.1: mention gs options passed. epstopdf.pl: output grayscale and pdfsettings in debug log. git-svn-id: svn://tug.org/texlive/trunk@41288 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/extra/epstopdf/Makefile6
-rw-r--r--Build/source/extra/epstopdf/epstopdf.111
-rwxr-xr-xBuild/source/extra/epstopdf/epstopdf.pl10
3 files changed, 16 insertions, 11 deletions
diff --git a/Build/source/extra/epstopdf/Makefile b/Build/source/extra/epstopdf/Makefile
index d93d2c081b9..04f106f913c 100644
--- a/Build/source/extra/epstopdf/Makefile
+++ b/Build/source/extra/epstopdf/Makefile
@@ -79,15 +79,15 @@ check-write-error:
! $(e2p) test-simple.eps --outfile=/dev/full
check-gscmd:
- ! $(e2p) --gscmd=true test-simple.eps
+ ! $(e2p) --gscmd=false test-simple.eps
! $(e2p) --gscmd='foo bar' test-simple.eps # fails
check-gsopt:
- ! $(e2p) --gscmd=echo --gsopt=foo --gsopt=bar test-simple.eps
+ ! $(e2p) --gscmd=false --gsopt=foo --gsopt=bar test-simple.eps
! $(e2p) --restricted --gsopt=bar test-simple.eps # fails
check-gsopts:
- ! $(e2p) --gscmd=echo --gsopts='foo bar' test-simple.eps
+ $(e2p) --gscmd=echo --gsopts='foo bar' test-simple.eps
! $(e2p) --restricted --gsopts=bar test-simple.eps # fails
check-simple:
diff --git a/Build/source/extra/epstopdf/epstopdf.1 b/Build/source/extra/epstopdf/epstopdf.1
index 06a3ee798c1..7d02b186a09 100644
--- a/Build/source/extra/epstopdf/epstopdf.1
+++ b/Build/source/extra/epstopdf/epstopdf.1
@@ -65,17 +65,20 @@ argument in the gs command (can be repeated).
set AutoRotatePages (default: None); recognized \fIval\fP choices:
None, All, PageByPage. For EPS files, PageByPage is equivalent to All.
.IP "\fB--\fP[\fBno\fP]\fBcompress\fP"
-use compression in the output (default: true).
+use compression in the output (default: true); if turned off, passes
+.IR -dUseFlateCompression=false .
.IP "\fB--device\fP=\fIdev\fP"
use -sDEVICE=\fIdev\fP (default: pdfwrite); not allowed in restricted mode.
.IP "\fB--\fP[\fBno\fP]\fBembed\fP"
-embed fonts (default: true).
+embed fonts (default: true); passes
+.I -dMaxSubsetPct=100 -dSubsetFonts=true -dEmbedAllFonts=true.
.IP "\fB--\fP[\fBno\fP]\fBgray\fP"
-grayscale output (default: false).
+grayscale output (default: false); passes
+.I -sColorConversionStrategy=Gray -dProcessColorModel=/DeviceGray.
.IP "\fB--pdfsettings\fP=\fIval\fP"
use -dPDFSETTINGS=/\fIval\fP (default is `prepress' if \fB--embed\fP,
else empty); recognized \fIval\fP choices: screen, ebook, printer,
-repress, default.
+prepress, default.
.IP "\fB--\fP[\fBno\fP]\fBquiet\fP"
use -q, a.k.a. -dQUIET (default: false).
.IP "\fB--res\fP=\fIdpi, dpi\fPx\fIdpi\fP"
diff --git a/Build/source/extra/epstopdf/epstopdf.pl b/Build/source/extra/epstopdf/epstopdf.pl
index b7b35a6100a..5b0a5349552 100755
--- a/Build/source/extra/epstopdf/epstopdf.pl
+++ b/Build/source/extra/epstopdf/epstopdf.pl
@@ -37,7 +37,7 @@
my $ver = "2.24";
# History
-# 2016/05/28 v2.24 (Karl Berry)
+# 2016/05/29 v2.24 (Karl Berry)
# * new option --gray; patch from William Bader,
# tex-k mail 9 Feb 2016 19:37:08.
# * disallow --device completely in restricted mode,
@@ -581,7 +581,7 @@ if ($::opt_res and
$::opt_res = '';
}
push @GS, "-r$::opt_res" if $::opt_res;
-$resmsg= $::opt_res ? $::opt_res : "[use gs default]";
+$resmsg = $::opt_res ? $::opt_res : "[use gs default]";
# \label{val_autorotate}
if ($::opt_autorotate and
@@ -639,10 +639,12 @@ if ($restricted and not safe_name('out', $OutputFilename)) {
### option gs
if ($::opt_gs) {
debug "Ghostscript command:", $GS;
- debug "Compression:", ($::opt_compress) ? "on" : "off";
+ debug "PDFSettings:", $::opt_pdfsettings;
debug "Embedding:", ($::opt_embed) ? "on" : "off";
- debug "Rotation:", $rotmsg;
+ debug "Compression:", ($::opt_compress) ? "on" : "off";
+ debug "Grayscale:", ($::opt_gray) ? "on" : "off";
debug "Resolution:", $resmsg;
+ debug "Rotation:", $rotmsg;
}
### emacs-page