summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/epstopdf-pkg/README.md8
-rw-r--r--Master/texmf-dist/doc/latex/epstopdf-pkg/epstopdf.pdfbin360058 -> 366140 bytes
-rw-r--r--Master/texmf-dist/source/latex/epstopdf-pkg/epstopdf.drv4
-rw-r--r--Master/texmf-dist/source/latex/epstopdf-pkg/epstopdf.dtx217
-rw-r--r--Master/texmf-dist/source/latex/epstopdf-pkg/epstopdf.ins6
-rw-r--r--Master/texmf-dist/tex/latex/epstopdf-pkg/epstopdf-base.sty105
-rw-r--r--Master/texmf-dist/tex/latex/epstopdf-pkg/epstopdf.sty10
7 files changed, 243 insertions, 107 deletions
diff --git a/Master/texmf-dist/doc/latex/epstopdf-pkg/README.md b/Master/texmf-dist/doc/latex/epstopdf-pkg/README.md
index 20129fd094f..6066b090b21 100644
--- a/Master/texmf-dist/doc/latex/epstopdf-pkg/README.md
+++ b/Master/texmf-dist/doc/latex/epstopdf-pkg/README.md
@@ -7,10 +7,7 @@ epstopdf (and epstopdf-base) package for including EPS in pdftex and luatex
`epstopdf-base.sty` is included by the pdftex and luatex options for
the core graphics package
-Separating epspdf to a separate repository is a first step in removing
-the dependency of the core package on the entire oberdiek bundle.
-
-Currently the dependency is still present due to
+The full package has a dependency on the following packages
\RequirePackage{infwarerr}[2007/09/09]
@@ -18,3 +15,6 @@ Currently the dependency is still present due to
\RequirePackage{kvoptions}[2007/10/02]
\RequirePackage{pdftexcmds}[2007/11/11]
+The epstopdf-base package, if used with no arguments, (as used by the graphics package)
+does not include these packages, but does use the Lua module from pdftexcmds.
+
diff --git a/Master/texmf-dist/doc/latex/epstopdf-pkg/epstopdf.pdf b/Master/texmf-dist/doc/latex/epstopdf-pkg/epstopdf.pdf
index 06022219295..a840debbc17 100644
--- a/Master/texmf-dist/doc/latex/epstopdf-pkg/epstopdf.pdf
+++ b/Master/texmf-dist/doc/latex/epstopdf-pkg/epstopdf.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/epstopdf-pkg/epstopdf.drv b/Master/texmf-dist/source/latex/epstopdf-pkg/epstopdf.drv
index 9300c929916..49ccf9fa6bd 100644
--- a/Master/texmf-dist/source/latex/epstopdf-pkg/epstopdf.drv
+++ b/Master/texmf-dist/source/latex/epstopdf-pkg/epstopdf.drv
@@ -9,7 +9,7 @@
%% This is a generated file.
%%
%% Project: epstopdf
-%% Version: 2019/11/24 v2.7
+%% Version: 2019/11/27 v2.8
%%
%% Copyright (C)
%% 2001, 2006-2010 Heiko Oberdiek
@@ -39,7 +39,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{epstopdf.drv}%
- [2019/11/24 v2.7 Conversion with epstopdf on the fly (HO)]%
+ [2019/11/27 v2.8 Conversion with epstopdf on the fly (HO)]%
\documentclass{ltxdoc}
\usepackage{holtxdoc}[2011/11/22]
\begin{document}
diff --git a/Master/texmf-dist/source/latex/epstopdf-pkg/epstopdf.dtx b/Master/texmf-dist/source/latex/epstopdf-pkg/epstopdf.dtx
index 497fc5c4e75..ef98cac49f4 100644
--- a/Master/texmf-dist/source/latex/epstopdf-pkg/epstopdf.dtx
+++ b/Master/texmf-dist/source/latex/epstopdf-pkg/epstopdf.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
%
% File: epstopdf.dtx
-% Version: 2019/11/24 v2.7
+% Version: 2019/11/27 v2.8
% Info: Conversion with epstopdf on the fly
%
% Copyright (C)
@@ -30,8 +30,8 @@
% epstopdf-base.sty, epstopdf-test1.tex.
%
% Distribution:
-% CTAN:macros/latex/contrib/epstopdf/epstopdf.dtx
-% CTAN:macros/latex/contrib/epstopdf/epstopdf.pdf
+% CTAN:macros/latex/contrib/epstopdf-pkg/epstopdf.dtx
+% CTAN:macros/latex/contrib/epstopdf-pkg/epstopdf.pdf
%
% Unpacking:
% (a) If epstopdf.ins is present:
@@ -80,7 +80,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: epstopdf 2019/11/24 v2.7 Conversion with epstopdf on the fly (HO)}
+\Msg{* Package: epstopdf 2019/11/27 v2.8 Conversion with epstopdf on the fly (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -92,7 +92,7 @@
This is a generated file.
Project: epstopdf
-Version: 2019/11/24 v2.7
+Version: 2019/11/27 v2.8
Copyright (C)
2001, 2006-2010 Heiko Oberdiek
@@ -161,7 +161,7 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{epstopdf.drv}%
- [2019/11/24 v2.7 Conversion with epstopdf on the fly (HO)]%
+ [2019/11/27 v2.8 Conversion with epstopdf on the fly (HO)]%
\documentclass{ltxdoc}
\usepackage{holtxdoc}[2011/11/22]
\begin{document}
@@ -171,26 +171,10 @@ and the derived files
% \fi
%
%
-% \CharacterTable
-% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-% Digits \0\1\2\3\4\5\6\7\8\9
-% Exclamation \! Double quote \" Hash (number) \#
-% Dollar \$ Percent \% Ampersand \&
-% Acute accent \' Left paren \( Right paren \)
-% Asterisk \* Plus \+ Comma \,
-% Minus \- Point \. Solidus \/
-% Colon \: Semicolon \; Less than \<
-% Equals \= Greater than \> Question mark \?
-% Commercial at \@ Left bracket \[ Backslash \\
-% Right bracket \] Circumflex \^ Underscore \_
-% Grave accent \` Left brace \{ Vertical bar \|
-% Right brace \} Tilde \~}
-%
% \GetFileInfo{epstopdf.drv}
%
% \title{The \xpackage{epstopdf} package}
-% \date{2019/11/24 v2.7}
+% \date{2019/11/27 v2.8}
% \author{Heiko Oberdiek\thanks
% {Please report any issues at \url{https://github.com/ho-tex/epstopdf/issues}}}
%
@@ -246,8 +230,8 @@ and the derived files
% The feature \cs{write18} must be enabled. This allows the
% running of external programs during \TeX's compile run.
% Keep in mind that this is a security risk. The feature is an
-% addition to \cs{TeX}. Mik\TeX, te\TeX, \TeX\ Live support it.
-% In Web2C based \TeX\ distributions (te\TeX, \TeX\ Live) it can be
+% addition to \TeX. Mik\TeX\ and \TeX\ Live support it.
+% In Web2C based \TeX\ distributions (\TeX\ Live) it can be
% enabled in the configuration file \xfile{texmf.cnf}:
% \begin{quote}
% |shell_escape = 1|
@@ -255,7 +239,7 @@ and the derived files
% Because of the security risk, it is better to do it on the
% command line only:
% \begin{quote}
-% \texttt{--shell-escape} (te\TeX, \TeX\ Live)\\
+% \texttt{--shell-escape} (\TeX\ Live)\\
% \texttt{--enable-write18} (MiK\TeX)
% \end{quote}
% Example:
@@ -472,7 +456,7 @@ and the derived files
% EPS to PDF. Example that uses \xprogram{Ghostscript}:
% \begin{quote}
% |\DeclareGraphicsRule{.eps}{pdf}{.pdf}{%|\\
-% | \epstopdfcall{`ps2pdf -dEPSCrop #1 \noexpand\OutputFile}%|\\
+% | \epstopdfcall{`ps2pdf -dEPSCrop #1 \noexpand\OutputFile}%|\\
% |}|
% \end{quote}
% \cs{DeclareGraphicsRule} expands the argument, therefore \cs{noexpand}
@@ -592,7 +576,7 @@ and the derived files
\fi
\expandafter\x\csname ver@epstopdf.sty\endcsname
\ProvidesPackage{epstopdf}%
- [2019/11/24 v2.7 Conversion with epstopdf on the fly (HO)]%
+ [2019/11/27 v2.8 Conversion with epstopdf on the fly (HO)]%
% \end{macrocode}
% Larger catcode set because of configuration files needed.
% \begin{macrocode}
@@ -639,9 +623,14 @@ and the derived files
\edef\ETE@AtEnd{\ETE@AtEnd\noexpand\endinput}
% \end{macrocode}
%
+% Ensure packages loaded by the full \xpackage{epstopdf}, for compatibility.
% \begin{macrocode}
\let\ETE@SavedAtEnd\ETE@AtEnd
-\RequirePackage{epstopdf-base}[2019/11/24]
+\RequirePackage{infwarerr}[2007/09/09]
+\RequirePackage{grfext}\relax
+\RequirePackage{kvoptions}[2007/10/02]
+\RequirePackage{pdftexcmds}[2007/11/11]
+\RequirePackage{epstopdf-base}[2019/11/27]
\let\ETE@AtEnd\ETE@SavedAtEnd
% \end{macrocode}
%
@@ -740,7 +729,7 @@ and the derived files
\fi
\expandafter\x\csname ver@epstopdf-base.sty\endcsname
\ProvidesPackage{epstopdf-base}%
- [2019/11/24 v2.7 Base part for package epstopdf]%
+ [2019/11/27 v2.8 Base part for package epstopdf]%
% \end{macrocode}
%
% \subsubsection{Catcodes}
@@ -794,11 +783,55 @@ and the derived files
%
% \subsubsection{Load packages}
%
+% This package is split into \xpackage{epstopdf-base} and \xpackage{epstopdf}
+% The base version is called directly by the \xpackage{graphics} package. Unfortunately
+% it still includes many contributed packages which breaks the layering of the core
+% \LaTeX\ graphics release.
+%
+% Compatibility concerns mean refactoring the package to only have options
+% in \xpackage{epstopdf} is tricky, so from release 2.8, if no options have been passed in
+% to \xpackage{epstopdf-base}, the package loading and option setting are skipped and the default
+% settings are set directly. In the case of Lua\TeX, the Lua portion of \xpackage{pdftexcmds}
+% is used to provide the file handling functionality.
% \begin{macrocode}
-\RequirePackage{infwarerr}[2007/09/09]
-\RequirePackage{grfext}\relax
-\RequirePackage{kvoptions}[2007/10/02]
-\RequirePackage{pdftexcmds}[2007/11/11]
+\ifx\@curroptions\@empty
+ \ifx\@PackageInfo\@undefined
+ \let\@PackageInfo\PackageInfo
+ \let\@PackageWarningNoLine\PackageWarningNoLine
+ \def\@PackageInfoNoLine#1#2{\PackageInfo{#1}{#2\@gobble}}
+ \let\@PackageError\PackageError
+ \fi
+ \ifx\pdf@strcmp\@undefined
+ \ifx\directlua\@undefined
+ \def\pdf@strcmp{\pdfstrcmp}
+ \def\pdf@filemoddate{\pdffilemoddate}
+ \def\pdf@filesize{\pdffilesize}
+ \def\pdf@system#{\immediate\write18 }
+ \else
+ \directlua{require("pdftexcmds")}
+ \long\def\pdf@strcmp#1#2{\directlua{%
+ oberdiek.pdftexcmds.strcmp("\luaescapestring{#1}",
+ "\luaescapestring{#2}")}}%
+ \def\pdf@filemoddate#1{\directlua{%
+ oberdiek.pdftexcmds.filemoddate("\luaescapestring{#1}")}}
+ \def\pdf@filesize#1{\directlua0{%
+ oberdiek.pdftexcmds.filesize("\luaescapestring{#1}")}}
+ \def\pdf@system#1{\directlua{%
+ oberdiek.pdftexcmds.system("\luaescapestring{#1}")}}
+ \fi
+ \fi
+\else
+% \end{macrocode}
+%
+% \begin{macrocode}
+ \RequirePackage{infwarerr}[2007/09/09]
+ \RequirePackage{grfext}\relax
+ \RequirePackage{kvoptions}[2007/10/02]
+ \RequirePackage{pdftexcmds}[2007/11/11]
+% \end{macrocode}
+%
+% \begin{macrocode}
+\fi
% \end{macrocode}
%
% \subsection{Checks}
@@ -833,7 +866,7 @@ and the derived files
}%
\endgroup
\newcommand*{\epstopdfsetup}[1]{}%
- \expandafter\ETE@AtEnd
+ \expandafter\expandafter\expandafter\ETE@AtEnd
\fi%
\fi%
\endgroup
@@ -855,47 +888,65 @@ and the derived files
\endgroup
% \end{macrocode}
%
-% \subsection{Package loading}
-%
+% \subsection{Options}
+% As noted above, if no options have been passed in (typically if called directly
+% from \verb|pdftex.def|) then the \xpackage{kvoptions} handling is not loaded
+% and the defaults are set directly.
% \begin{macrocode}
+\newif\ifETE@prepend
+\ifx\SetupKeyvalOptions\@undefined
+ \def\ETE@let#1#2{%
+ \expandafter\let\csname ifETE@#1\expandafter\endcsname
+ \csname if#2\endcsname}
+ \ETE@let{verbose}{true}
+ \ETE@let{disable}{false}
+ \ETE@let{update}{true}
+ \ETE@let{prepend}{false}
+ \ETE@let{prefersuffix}{true}
+ \def\ETE@outdir{}
+ \def\ETE@suffix{-\SourceExt-converted-to}
+ \def\ETE@program@epstopdf{\epstopdf@sys@cmd}
+ \newcommand*{\epstopdfsetup}[1]{}%
+\else
% \end{macrocode}
%
-% \subsection{Options}
-%
% \begin{macrocode}
-\SetupKeyvalOptions{family=ETE,prefix=ETE@}
-\DeclareBoolOption{update}
-\DeclareBoolOption{verbose}
-\newif\ifETE@prepend
-\DeclareVoidOption{prepend}{\ETE@prependtrue}
-\DeclareVoidOption{append}{\ETE@prependfalse}
-\DeclareStringOption{outdir}
-\DeclareStringOption{suffix}
-\DeclareBoolOption{prefersuffix}
-\DeclareStringOption{program@epstopdf}
+ \SetupKeyvalOptions{family=ETE,prefix=ETE@}
+ \DeclareBoolOption{update}
+ \DeclareBoolOption{verbose}
+ \DeclareVoidOption{prepend}{\ETE@prependtrue}
+ \DeclareVoidOption{append}{\ETE@prependfalse}
+ \DeclareStringOption{outdir}
+ \DeclareStringOption{suffix}
+ \DeclareBoolOption{prefersuffix}
+ \DeclareStringOption{program@epstopdf}
% \end{macrocode}
% Options \xoption{disable} and \xoption{enable} are for testing
% only. Therefore they are not documented on purpose.
% \begin{macrocode}
-\DeclareBoolOption{disable}
-\DeclareComplementaryOption{enable}{disable}
+ \DeclareBoolOption{disable}
+ \DeclareComplementaryOption{enable}{disable}
% \end{macrocode}
% \begin{macrocode}
-\newcommand*{\epstopdfsetup}{\setkeys{ETE}}
+ \newcommand*{\epstopdfsetup}{\setkeys{ETE}}
% \end{macrocode}
%
% \subsubsection{Default setting}
%
% \begin{macrocode}
-\epstopdfsetup{%
- verbose,%
- enable,%
- append,%
- update,%
- prefersuffix,%
- suffix=-\SourceExt-converted-to,%
- program@epstopdf=epstopdf%
-}
+ \epstopdfsetup{%
+ verbose,%
+ enable,%
+ append,%
+ update,%
+ prefersuffix,%
+ suffix=-\SourceExt-converted-to,%
+ program@epstopdf=epstopdf%
+ }
+% \end{macrocode}
+%
+% \begin{macrocode}
+\fi
% \end{macrocode}
%
% \subsection{Make and verbose}
@@ -1163,13 +1214,33 @@ and the derived files
% \end{macrocode}
%
% \begin{macrocode}
+\ifx\AppendGraphicsExtensions\@undefined\else
+% \end{macrocode}
+%
+% \begin{macrocode}
\ifETE@prepend
\expandafter\PrependGraphicsExtensions
\else
\expandafter\AppendGraphicsExtensions
\fi
{.eps}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\fi
+% \end{macrocode}
+%
+% \begin{macrocode}
\let\ETE@prepend\@undefined
+% \end{macrocode}
+%
+% \begin{macrocode}
+\ifx\SetupKeyvalOptions\@undefined
+\InputIfFileExists{epstopdf-sys.cfg}{}{}
+\else
+% \end{macrocode}
+%
+% \begin{macrocode}
\DeclareVoidOption{prepend}{%
\PrependGraphicsExtensions{.eps}%
}
@@ -1185,6 +1256,10 @@ and the derived files
% \end{macrocode}
%
% \begin{macrocode}
+\fi
+% \end{macrocode}
+%
+% \begin{macrocode}
\ETE@AtEnd%
%</base>
% \end{macrocode}
@@ -1317,8 +1392,8 @@ and the derived files
% \paragraph{Package.} This package is available on
% CTAN\footnote{\CTANpkg{epstopdf-pkg}}:
% \begin{description}
-% \item[\CTAN{macros/latex/contrib/epstopdf/epstopdf.dtx}] The source file.
-% \item[\CTAN{macros/latex/contrib/epstopdf/epstopdf.pdf}] Documentation.
+% \item[\CTAN{macros/latex/contrib/epstopdf-pkg/epstopdf.dtx}] The source file.
+% \item[\CTAN{macros/latex/contrib/epstopdf-pkg/epstopdf.pdf}] Documentation.
% \end{description}
%
%
@@ -1327,10 +1402,10 @@ and the derived files
% the packages are already unpacked and the documentation files
% are generated. The files and directories obey the TDS standard.
% \begin{description}
-% \item[\CTANinstall{install/macros/latex/contrib/epstopdf.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/epstopdf-pkg.tds.zip}]
% \end{description}
% \emph{TDS} refers to the standard ``A Directory Structure
-% for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
+% for \TeX\ Files'' (\CTANpkg{tds}). Directories
% with \xfile{texmf} in their name are usually organized this way.
%
% \subsection{Bundle installation}
@@ -1430,8 +1505,8 @@ and the derived files
% \subsection{Refresh file name databases}
%
% If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
-% these. For example, \teTeX\ users run \verb|texhash| or
+% (\TeX\,Live, \mikTeX, \dots) relies on file name databases, you must refresh
+% these. For example, \TeX\,Live\ users run \verb|texhash| or
% \verb|mktexlsr|.
%
% \subsection{Some details for the interested}
@@ -1587,6 +1662,14 @@ and the derived files
% \item
% New epstopdf repository.
% \end{Version}
+% \begin{Version}{2019/11/27 v2.8}
+% \item
+% The base package configured not to require additional
+% packages if called with no arguments.
+% \item
+% Code re-arranged to avoidP
+% \verb|\end occurred when \ifx on line 165 was incomplete| warning in dvi mode.
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/epstopdf-pkg/epstopdf.ins b/Master/texmf-dist/source/latex/epstopdf-pkg/epstopdf.ins
index be0872bda32..222873c0d19 100644
--- a/Master/texmf-dist/source/latex/epstopdf-pkg/epstopdf.ins
+++ b/Master/texmf-dist/source/latex/epstopdf-pkg/epstopdf.ins
@@ -9,7 +9,7 @@
%% This is a generated file.
%%
%% Project: epstopdf
-%% Version: 2019/11/24 v2.7
+%% Version: 2019/11/27 v2.8
%%
%% Copyright (C)
%% 2001, 2006-2010 Heiko Oberdiek
@@ -40,7 +40,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: epstopdf 2019/11/24 v2.7 Conversion with epstopdf on the fly (HO)}
+\Msg{* Package: epstopdf 2019/11/27 v2.8 Conversion with epstopdf on the fly (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -52,7 +52,7 @@
This is a generated file.
Project: epstopdf
-Version: 2019/11/24 v2.7
+Version: 2019/11/27 v2.8
Copyright (C)
2001, 2006-2010 Heiko Oberdiek
diff --git a/Master/texmf-dist/tex/latex/epstopdf-pkg/epstopdf-base.sty b/Master/texmf-dist/tex/latex/epstopdf-pkg/epstopdf-base.sty
index 89e728ebec9..1db31203bb8 100644
--- a/Master/texmf-dist/tex/latex/epstopdf-pkg/epstopdf-base.sty
+++ b/Master/texmf-dist/tex/latex/epstopdf-pkg/epstopdf-base.sty
@@ -9,7 +9,7 @@
%% This is a generated file.
%%
%% Project: epstopdf
-%% Version: 2019/11/24 v2.7
+%% Version: 2019/11/27 v2.8
%%
%% Copyright (C)
%% 2001, 2006-2010 Heiko Oberdiek
@@ -103,7 +103,7 @@
\fi
\expandafter\x\csname ver@epstopdf-base.sty\endcsname
\ProvidesPackage{epstopdf-base}%
- [2019/11/24 v2.7 Base part for package epstopdf]%
+ [2019/11/27 v2.8 Base part for package epstopdf]%
\begingroup\catcode61\catcode48\catcode32=10\relax%
\catcode13=5 % ^^M
\endlinechar=13 %
@@ -148,10 +148,38 @@
\TMP@EnsureCode{62}{12}% >
\TMP@EnsureCode{96}{12}% `
\edef\ETE@AtEnd{\ETE@AtEnd\noexpand\endinput}
-\RequirePackage{infwarerr}[2007/09/09]
-\RequirePackage{grfext}\relax
-\RequirePackage{kvoptions}[2007/10/02]
-\RequirePackage{pdftexcmds}[2007/11/11]
+\ifx\@curroptions\@empty
+ \ifx\@PackageInfo\@undefined
+ \let\@PackageInfo\PackageInfo
+ \let\@PackageWarningNoLine\PackageWarningNoLine
+ \def\@PackageInfoNoLine#1#2{\PackageInfo{#1}{#2\@gobble}}
+ \let\@PackageError\PackageError
+ \fi
+ \ifx\pdf@strcmp\@undefined
+ \ifx\directlua\@undefined
+ \def\pdf@strcmp{\pdfstrcmp}
+ \def\pdf@filemoddate{\pdffilemoddate}
+ \def\pdf@filesize{\pdffilesize}
+ \def\pdf@system#{\immediate\write18 }
+ \else
+ \directlua{require("pdftexcmds")}
+ \long\def\pdf@strcmp#1#2{\directlua{%
+ oberdiek.pdftexcmds.strcmp("\luaescapestring{#1}",
+ "\luaescapestring{#2}")}}%
+ \def\pdf@filemoddate#1{\directlua{%
+ oberdiek.pdftexcmds.filemoddate("\luaescapestring{#1}")}}
+ \def\pdf@filesize#1{\directlua0{%
+ oberdiek.pdftexcmds.filesize("\luaescapestring{#1}")}}
+ \def\pdf@system#1{\directlua{%
+ oberdiek.pdftexcmds.system("\luaescapestring{#1}")}}
+ \fi
+ \fi
+\else
+ \RequirePackage{infwarerr}[2007/09/09]
+ \RequirePackage{grfext}\relax
+ \RequirePackage{kvoptions}[2007/10/02]
+ \RequirePackage{pdftexcmds}[2007/11/11]
+\fi
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname Gin@setfile\endcsname\relax
\@PackageWarningNoLine{epstopdf}{%
@@ -172,7 +200,7 @@
}%
\endgroup
\newcommand*{\epstopdfsetup}[1]{}%
- \expandafter\ETE@AtEnd
+ \expandafter\expandafter\expandafter\ETE@AtEnd
\fi%
\fi%
\endgroup
@@ -187,28 +215,43 @@
\fi
\fi
\endgroup
-\SetupKeyvalOptions{family=ETE,prefix=ETE@}
-\DeclareBoolOption{update}
-\DeclareBoolOption{verbose}
\newif\ifETE@prepend
-\DeclareVoidOption{prepend}{\ETE@prependtrue}
-\DeclareVoidOption{append}{\ETE@prependfalse}
-\DeclareStringOption{outdir}
-\DeclareStringOption{suffix}
-\DeclareBoolOption{prefersuffix}
-\DeclareStringOption{program@epstopdf}
-\DeclareBoolOption{disable}
-\DeclareComplementaryOption{enable}{disable}
-\newcommand*{\epstopdfsetup}{\setkeys{ETE}}
-\epstopdfsetup{%
- verbose,%
- enable,%
- append,%
- update,%
- prefersuffix,%
- suffix=-\SourceExt-converted-to,%
- program@epstopdf=epstopdf%
-}
+\ifx\SetupKeyvalOptions\@undefined
+ \def\ETE@let#1#2{%
+ \expandafter\let\csname ifETE@#1\expandafter\endcsname
+ \csname if#2\endcsname}
+ \ETE@let{verbose}{true}
+ \ETE@let{disable}{false}
+ \ETE@let{update}{true}
+ \ETE@let{prepend}{false}
+ \ETE@let{prefersuffix}{true}
+ \def\ETE@outdir{}
+ \def\ETE@suffix{-\SourceExt-converted-to}
+ \def\ETE@program@epstopdf{\epstopdf@sys@cmd}
+ \newcommand*{\epstopdfsetup}[1]{}%
+\else
+ \SetupKeyvalOptions{family=ETE,prefix=ETE@}
+ \DeclareBoolOption{update}
+ \DeclareBoolOption{verbose}
+ \DeclareVoidOption{prepend}{\ETE@prependtrue}
+ \DeclareVoidOption{append}{\ETE@prependfalse}
+ \DeclareStringOption{outdir}
+ \DeclareStringOption{suffix}
+ \DeclareBoolOption{prefersuffix}
+ \DeclareStringOption{program@epstopdf}
+ \DeclareBoolOption{disable}
+ \DeclareComplementaryOption{enable}{disable}
+ \newcommand*{\epstopdfsetup}{\setkeys{ETE}}
+ \epstopdfsetup{%
+ verbose,%
+ enable,%
+ append,%
+ update,%
+ prefersuffix,%
+ suffix=-\SourceExt-converted-to,%
+ program@epstopdf=epstopdf%
+ }
+\fi
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname pdf@filemoddate\endcsname\relax
\def\ETE@Make#1#2{%
@@ -452,13 +495,18 @@
\fi
#1%
}
+\ifx\AppendGraphicsExtensions\@undefined\else
\ifETE@prepend
\expandafter\PrependGraphicsExtensions
\else
\expandafter\AppendGraphicsExtensions
\fi
{.eps}
+\fi
\let\ETE@prepend\@undefined
+\ifx\SetupKeyvalOptions\@undefined
+\InputIfFileExists{epstopdf-sys.cfg}{}{}
+\else
\DeclareVoidOption{prepend}{%
\PrependGraphicsExtensions{.eps}%
}
@@ -468,6 +516,7 @@
}
\InputIfFileExists{epstopdf-sys.cfg}{}{}
\InputIfFileExists{epstopdf.cfg}{}{}
+\fi
\ETE@AtEnd%
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/epstopdf-pkg/epstopdf.sty b/Master/texmf-dist/tex/latex/epstopdf-pkg/epstopdf.sty
index 309d8616816..8edbd4cdca1 100644
--- a/Master/texmf-dist/tex/latex/epstopdf-pkg/epstopdf.sty
+++ b/Master/texmf-dist/tex/latex/epstopdf-pkg/epstopdf.sty
@@ -9,7 +9,7 @@
%% This is a generated file.
%%
%% Project: epstopdf
-%% Version: 2019/11/24 v2.7
+%% Version: 2019/11/27 v2.8
%%
%% Copyright (C)
%% 2001, 2006-2010 Heiko Oberdiek
@@ -103,7 +103,7 @@
\fi
\expandafter\x\csname ver@epstopdf.sty\endcsname
\ProvidesPackage{epstopdf}%
- [2019/11/24 v2.7 Conversion with epstopdf on the fly (HO)]%
+ [2019/11/27 v2.8 Conversion with epstopdf on the fly (HO)]%
\begingroup\catcode61\catcode48\catcode32=10\relax%
\catcode13=5 % ^^M
\endlinechar=13 %
@@ -146,7 +146,11 @@
\TMP@EnsureCode{93}{12}% ]
\edef\ETE@AtEnd{\ETE@AtEnd\noexpand\endinput}
\let\ETE@SavedAtEnd\ETE@AtEnd
-\RequirePackage{epstopdf-base}[2019/11/24]
+\RequirePackage{infwarerr}[2007/09/09]
+\RequirePackage{grfext}\relax
+\RequirePackage{kvoptions}[2007/10/02]
+\RequirePackage{pdftexcmds}[2007/11/11]
+\RequirePackage{epstopdf-base}[2019/11/27]
\let\ETE@AtEnd\ETE@SavedAtEnd
\DeclareOption*{%
\expandafter\epstopdfsetup\expandafter{\CurrentOption}%
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-10 17:40:44 +0000