summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/epstopdf-pkg
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-11-29 21:54:22 +0000
committerKarl Berry <karl@freefriends.org>2019-11-29 21:54:22 +0000
commit2770228050d72e4c94ecf302e8ee6804cf222913 (patch)
tree805f996ee8c8d2b585a02bc21dfb50de35fd12aa /Master/texmf-dist/tex/latex/epstopdf-pkg
parent345c5f37b84e1a82beb827efa58e843063a96896 (diff)
epstopdf-pkg (29nov19)
git-svn-id: svn://tug.org/texlive/trunk@52968 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/epstopdf-pkg')
-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
2 files changed, 84 insertions, 31 deletions
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}%