texlive[64244] trunk: epstopdf (30aug22)
commits+karl at tug.org
commits+karl at tug.org
Tue Aug 30 21:53:18 CEST 2022
Revision: 64244
http://tug.org/svn/texlive?view=revision&revision=64244
Author: karl
Date: 2022-08-30 21:53:18 +0200 (Tue, 30 Aug 2022)
Log Message:
-----------
epstopdf (30aug22)
Modified Paths:
--------------
trunk/Build/source/texk/texlive/linked_scripts/epstopdf/epstopdf.pl
trunk/Master/texmf-dist/doc/man/man1/epstopdf.1
trunk/Master/texmf-dist/doc/man/man1/epstopdf.man1.pdf
trunk/Master/texmf-dist/doc/man/man1/repstopdf.man1.pdf
trunk/Master/texmf-dist/doc/support/epstopdf/README
trunk/Master/texmf-dist/scripts/epstopdf/epstopdf.pl
Modified: trunk/Build/source/texk/texlive/linked_scripts/epstopdf/epstopdf.pl
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/epstopdf/epstopdf.pl 2022-08-30 19:52:43 UTC (rev 64243)
+++ trunk/Build/source/texk/texlive/linked_scripts/epstopdf/epstopdf.pl 2022-08-30 19:53:18 UTC (rev 64244)
@@ -1,5 +1,5 @@
#!/usr/bin/env perl
-# $Id: epstopdf.pl 48681 2018-09-16 23:03:58Z karl $
+# $Id: epstopdf.pl 64235 2022-08-29 22:52:01Z karl $
# (Copyright lines below.)
#
# Redistribution and use in source and binary forms, with or without
@@ -35,9 +35,10 @@
#
# emacs-page
#
-my $ver = "2.28";
+my $ver = "2.29";
+# 2022/08/29 v2.29 (Karl Berry)
# 2018/09/17 v2.28 (Karl Berry)
-# * -dCompatibilityLevel=1.5 by default, since gs9.25 switched to 1.7.
+# * use gswin64c on 64-bit Windows.
# 2017/09/14 v2.27 (Karl Berry)
# * extract value from --gsopt with $3 not $2 (extra regexp group
# added previously), and check it with ^(...)$ so anchors apply to all.
@@ -189,9 +190,9 @@
### emacs-page
### program identification
my $program = "epstopdf";
-my $ident = '($Id: epstopdf.pl 48681 2018-09-16 23:03:58Z karl $)' . " $ver";
+my $ident = '($Id: epstopdf.pl 64235 2022-08-29 22:52:01Z karl $)' . " $ver";
my $copyright = <<END_COPYRIGHT ;
-Copyright 2009-2018 Karl Berry et al.
+Copyright 2009-2022 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>
@@ -204,7 +205,15 @@
my $on_windows_or_cygwin = $on_windows || $^O eq "cygwin";
### ghostscript command name
-my $GS = $on_windows ? "gswin32c" : "gs";
+my $GS = "gs";
+if ($on_windows) {
+ if ($ENV{"PROCESSOR_ARCHITECTURE"} eq "AMD64"
+ || $ENV{"PROCESSOR_ARCHITEW6432"} eq "AMD64") {
+ $GS = "gswin64c";
+ } else {
+ $GS = "gswin32c";
+ }
+}
### restricted mode
my $restricted = 0;
@@ -480,6 +489,7 @@
# $mydirname is the location of the Perl script
$kpsewhich = "$mydirname/../../../bin/win32/$kpsewhich";
$GS = "$mydirname/../../../tlpkg/tlgs/bin/$GS";
+ debug "restricted Windows gs: $GS";
}
debug "kpsewhich command: $kpsewhich";
Modified: trunk/Master/texmf-dist/doc/man/man1/epstopdf.1
===================================================================
--- trunk/Master/texmf-dist/doc/man/man1/epstopdf.1 2022-08-30 19:52:43 UTC (rev 64243)
+++ trunk/Master/texmf-dist/doc/man/man1/epstopdf.1 2022-08-30 19:53:18 UTC (rev 64244)
@@ -1,5 +1,5 @@
-.TH EPSTOPDF 1 "17 September 2018"
-.\" $Id: epstopdf.1 48681 2018-09-16 23:03:58Z karl $
+.TH EPSTOPDF 1 "29 August 2022"
+.\" $Id: epstopdf.1 64235 2022-08-29 22:52:01Z karl $
.SH NAME
epstopdf, repstopdf \- convert an EPS file to PDF
.SH SYNOPSIS
@@ -64,11 +64,14 @@
turn on restricted mode (default: [true for repstopdf, else false]);
this forbids the use of \fB--gscmd\fP and other options and imposes
restrictions on the input and output file names according to the values
-of openin_any and openout_any (see the Web2c manual, http://tug.org/web2c).
+of openin_any and openout_any (see the Web2c manual, https://tug.org/web2c).
+On Windows, the Ghostscript command is forced to be the TeX Live builtin
+gs, installed under \fB.../tlpkg/tlgs/bin/\fP.
.PP
Options for Ghostscript (more info below):
.IP "\fB--gscmd\fP=\fIval\fP"
-pipe output to \fIval\fP (default: [\fBgswin32c\fP on Windows, else \fBgs\fP])
+pipe output to \fIval\fP (default: [\fBgswin64c\fP on 64-bit Windows,
+\fBgswin32c\fP on 32-bit Windows, else \fBgs\fP])
.IP "\fB--gsopt\fP=\fIval\fP"
include \fIval\fP as one argument in the gs command (can be repeated).
.IP "\fB--gsopts\fP=\fIval\fP"
@@ -148,8 +151,8 @@
\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.
+The epstopdf LaTeX package, which automates running this script on the
+fly under TeX: https://ctan.org/pkg/epstopdf-pkg.
.SH AUTHOR
Originally written by Sebastian Rahtz, for Elsevier Science, with
subsequent contributions from Thomas Esser, Gerben Wierda, Heiko
@@ -157,6 +160,6 @@
.PP
Man page originally written by Jim Van Zandt.
.PP
-epstopdf home page: http://tug.org/epstopdf.
+epstopdf home page: https://tug.org/epstopdf.
.PP
You may freely use, modify and/or distribute this man page.
Modified: trunk/Master/texmf-dist/doc/man/man1/epstopdf.man1.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/man/man1/repstopdf.man1.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/support/epstopdf/README
===================================================================
--- trunk/Master/texmf-dist/doc/support/epstopdf/README 2022-08-30 19:52:43 UTC (rev 64243)
+++ trunk/Master/texmf-dist/doc/support/epstopdf/README 2022-08-30 19:53:18 UTC (rev 64244)
@@ -1,4 +1,4 @@
-$Id: README 42921 2017-01-10 23:39:44Z karl $
+$Id: README 48727 2018-09-21 22:18:21Z karl $
This file is public domain. (Originally written by Karl Berry, 2009.)
This is the README for the epstopdf script distribution.
@@ -18,7 +18,7 @@
Various test files and a Makefile to exercise them are in the source
repository, which is currently a subdirectory of the texlive Subversion
repo, purely for the developers' convenience:
- http://tug.org/svn/texlive/trunk/Build/source/extra/epstopdf/
+ http://tug.org/svn/texlive/trunk/Build/extra/epstopdf/
The test-binary and test-bin2 files there were supplied by Akira Kakuto and
Reinhard Kotucha. They contain binary data. They are public domain.
Modified: trunk/Master/texmf-dist/scripts/epstopdf/epstopdf.pl
===================================================================
--- trunk/Master/texmf-dist/scripts/epstopdf/epstopdf.pl 2022-08-30 19:52:43 UTC (rev 64243)
+++ trunk/Master/texmf-dist/scripts/epstopdf/epstopdf.pl 2022-08-30 19:53:18 UTC (rev 64244)
@@ -1,5 +1,5 @@
#!/usr/bin/env perl
-# $Id: epstopdf.pl 48681 2018-09-16 23:03:58Z karl $
+# $Id: epstopdf.pl 64235 2022-08-29 22:52:01Z karl $
# (Copyright lines below.)
#
# Redistribution and use in source and binary forms, with or without
@@ -35,9 +35,10 @@
#
# emacs-page
#
-my $ver = "2.28";
+my $ver = "2.29";
+# 2022/08/29 v2.29 (Karl Berry)
# 2018/09/17 v2.28 (Karl Berry)
-# * -dCompatibilityLevel=1.5 by default, since gs9.25 switched to 1.7.
+# * use gswin64c on 64-bit Windows.
# 2017/09/14 v2.27 (Karl Berry)
# * extract value from --gsopt with $3 not $2 (extra regexp group
# added previously), and check it with ^(...)$ so anchors apply to all.
@@ -189,9 +190,9 @@
### emacs-page
### program identification
my $program = "epstopdf";
-my $ident = '($Id: epstopdf.pl 48681 2018-09-16 23:03:58Z karl $)' . " $ver";
+my $ident = '($Id: epstopdf.pl 64235 2022-08-29 22:52:01Z karl $)' . " $ver";
my $copyright = <<END_COPYRIGHT ;
-Copyright 2009-2018 Karl Berry et al.
+Copyright 2009-2022 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>
@@ -204,7 +205,15 @@
my $on_windows_or_cygwin = $on_windows || $^O eq "cygwin";
### ghostscript command name
-my $GS = $on_windows ? "gswin32c" : "gs";
+my $GS = "gs";
+if ($on_windows) {
+ if ($ENV{"PROCESSOR_ARCHITECTURE"} eq "AMD64"
+ || $ENV{"PROCESSOR_ARCHITEW6432"} eq "AMD64") {
+ $GS = "gswin64c";
+ } else {
+ $GS = "gswin32c";
+ }
+}
### restricted mode
my $restricted = 0;
@@ -480,6 +489,7 @@
# $mydirname is the location of the Perl script
$kpsewhich = "$mydirname/../../../bin/win32/$kpsewhich";
$GS = "$mydirname/../../../tlpkg/tlgs/bin/$GS";
+ debug "restricted Windows gs: $GS";
}
debug "kpsewhich command: $kpsewhich";
More information about the tex-live-commits
mailing list.