From 5b045e6a68725855972c048d50945b4c6cd6fee9 Mon Sep 17 00:00:00 2001
From: Norbert Preining <preining@logic.at>
Date: Thu, 16 Jun 2016 11:15:57 +0000
Subject: update epstopdf.pl in source tree

git-svn-id: svn://tug.org/texlive/trunk@41460 c570f23f-e606-0410-a88d-b1316a301751
---
 Build/source/extra/epstopdf/epstopdf.pl | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

(limited to 'Build/source/extra')

diff --git a/Build/source/extra/epstopdf/epstopdf.pl b/Build/source/extra/epstopdf/epstopdf.pl
index fd8b7471a84..f1cc7fba400 100755
--- a/Build/source/extra/epstopdf/epstopdf.pl
+++ b/Build/source/extra/epstopdf/epstopdf.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# $Id$
+# $Id: epstopdf.pl 41287 2016-05-28 18:09:45Z karl $
 # (Copyright lines below.)
 #
 # Redistribution and use in source and binary forms, with or without
@@ -34,10 +34,12 @@
 # "%%BoundingBox: (atend)" when input is not seekable (e.g., from a pipe),
 #
 # emacs-page
-my $ver = "2.24";
+my $ver = "2.25";
 
 # History
-#  2016/05/29 v2.24 (Karl Berry)
+#  2016/06/16 v2.25 (Norbert Preining)
+#    * fix device handling
+#  2016/05/28 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,
@@ -177,9 +179,9 @@ my $ver = "2.24";
 ### emacs-page
 ### program identification
 my $program = "epstopdf";
-my $ident = '($Id$)' . " $ver";
+my $ident = '($Id: epstopdf.pl 41287 2016-05-28 18:09:45Z karl $)' . " $ver";
 my $copyright = <<END_COPYRIGHT ;
-Copyright 2009-2016 Karl Berry et al.
+Copyright 2009-2014 Karl Berry et al.
 Copyright 2002-2009 Gerben Wierda et al.
 Copyright 1998-2001 Sebastian Rahtz et al.
 License RBSD: Revised BSD <http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5>
@@ -205,7 +207,7 @@ my $default_device = 'pdfwrite';
 $::opt_autorotate = "None";
 $::opt_compress = 1;
 $::opt_debug = 0;
-$::opt_device = $default_device;
+$::opt_device = "";
 $::opt_embed = 1;
 $::opt_exact = 0;
 $::opt_filter = 0;
@@ -360,7 +362,7 @@ Options for Ghostscript:
                        recognized VAL choices: None, All, PageByPage;
                        for EPS files, PageByPage is equivalent to All.
   --(no)compress     use compression        (default: $bool[$::opt_compress])
-  --device=DEV       use -sDEVICE=DEV       (default: $::opt_device)
+  --device=DEV       use -sDEVICE=DEV       (default: $default_device)
   --(no)embed        embed fonts            (default: $bool[$::opt_embed])
   --(no)gray         grayscale output       (default: $bool[$::opt_gray])
   --pdfsettings=VAL  use -dPDFSETTINGS=/VAL (default is prepress if --embed,
@@ -527,7 +529,10 @@ if ($::opt_device) {
   } else {
     debug "Switching from $default_device to $::opt_device";
   }
+} else {
+  $::opt_device = $default_device;
 }
+
 push @GS, "-sDEVICE=$::opt_device";
 
 ### option outfile
@@ -581,7 +586,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,12 +644,10 @@ if ($restricted and not safe_name('out', $OutputFilename)) {
 ### option gs
 if ($::opt_gs) {
   debug "Ghostscript command:", $GS;
-  debug "PDFSettings:", $::opt_pdfsettings;
-  debug "Embedding:", ($::opt_embed) ? "on" : "off";
   debug "Compression:", ($::opt_compress) ? "on" : "off";
-  debug "Grayscale:", ($::opt_gray) ? "on" : "off";
-  debug "Resolution:", $resmsg;
+  debug "Embedding:", ($::opt_embed) ? "on" : "off";
   debug "Rotation:", $rotmsg;
+  debug "Resolution:", $resmsg;
 }
 
 ### emacs-page
-- 
cgit v1.2.3