From bfea31280bebe65648d90b3ad63dcfb6c0e2e8a2 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 25 Jan 2020 22:23:53 +0000 Subject: epstopdf-pkg (25jan20) git-svn-id: svn://tug.org/texlive/trunk@53546 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/latex/epstopdf-pkg/epstopdf.pdf | Bin 357389 -> 357805 bytes .../source/latex/epstopdf-pkg/epstopdf.drv | 10 +++--- .../source/latex/epstopdf-pkg/epstopdf.dtx | 38 +++++++++++++-------- .../source/latex/epstopdf-pkg/epstopdf.ins | 18 +++++----- .../tex/latex/epstopdf-pkg/epstopdf-base.sty | 13 ++++--- .../texmf-dist/tex/latex/epstopdf-pkg/epstopdf.sty | 10 +++--- 6 files changed, 50 insertions(+), 39 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/epstopdf-pkg/epstopdf.pdf b/Master/texmf-dist/doc/latex/epstopdf-pkg/epstopdf.pdf index 5d214c2b8ca..b56af41173d 100644 Binary files a/Master/texmf-dist/doc/latex/epstopdf-pkg/epstopdf.pdf and b/Master/texmf-dist/doc/latex/epstopdf-pkg/epstopdf.pdf differ diff --git a/Master/texmf-dist/source/latex/epstopdf-pkg/epstopdf.drv b/Master/texmf-dist/source/latex/epstopdf-pkg/epstopdf.drv index cd732e2edd0..ecb05990ee3 100644 --- a/Master/texmf-dist/source/latex/epstopdf-pkg/epstopdf.drv +++ b/Master/texmf-dist/source/latex/epstopdf-pkg/epstopdf.drv @@ -9,11 +9,11 @@ %% This is a generated file. %% %% Project: epstopdf -%% Version: 2019-12-09 v2.10 +%% Version: 2020-01-24 v2.11 %% %% Copyright (C) -%% 2001, 2006-2010 Heiko Oberdiek -%% 2016-2019 Oberdiek Package Support Group +%% 2001-2010 Heiko Oberdiek +%% 2016-2019 Oberdiek Package Support Group %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -35,11 +35,11 @@ %% This work consists of the main source file epstopdf.dtx %% and the derived files %% epstopdf.sty, epstopdf.pdf, epstopdf.ins, epstopdf.drv, -%% epstopdf-base.sty, epstopdf-test1.tex. +%% epstopdf-base.sty. %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{epstopdf.drv}% - [2019-12-09 v2.10 Conversion with epstopdf on the fly (HO)]% + [2020-01-24 v2.11 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 48a258ae073..00ef1a20373 100644 --- a/Master/texmf-dist/source/latex/epstopdf-pkg/epstopdf.dtx +++ b/Master/texmf-dist/source/latex/epstopdf-pkg/epstopdf.dtx @@ -1,12 +1,12 @@ % \iffalse meta-comment % % File: epstopdf.dtx -% Version: 2019-12-09 v2.10 +% Version: 2020-01-24 v2.11 % Info: Conversion with epstopdf on the fly % % Copyright (C) -% 2001, 2006-2010 Heiko Oberdiek -% 2016-2019 Oberdiek Package Support Group +% 2001-2010 Heiko Oberdiek +% 2016-2020 Oberdiek Package Support Group % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -80,7 +80,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: epstopdf 2019-12-09 v2.10 Conversion with epstopdf on the fly (HO)} +\Msg{* Package: epstopdf 2020-01-24 v2.11 Conversion with epstopdf on the fly (HO)} \Msg{************************************************************************} \keepsilent @@ -92,11 +92,11 @@ This is a generated file. Project: epstopdf -Version: 2019-12-09 v2.10 +Version: 2020-01-24 v2.11 Copyright (C) - 2001, 2006-2010 Heiko Oberdiek - 2016-2019 Oberdiek Package Support Group + 2001-2010 Heiko Oberdiek + 2016-2019 Oberdiek Package Support Group This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either @@ -118,7 +118,7 @@ https://github.com/ho-tex/epstopdf/issues This work consists of the main source file epstopdf.dtx and the derived files epstopdf.sty, epstopdf.pdf, epstopdf.ins, epstopdf.drv, - epstopdf-base.sty, epstopdf-test1.tex. + epstopdf-base.sty. \endpreamble \let\MetaPrefix\DoubleperCent @@ -129,8 +129,6 @@ and the derived files \usedir{tex/latex/epstopdf}% \file{epstopdf.sty}{\from{epstopdf.dtx}{package}}% \file{epstopdf-base.sty}{\from{epstopdf.dtx}{base}}% -% \usedir{doc/latex/epstopdf/test}% -% \file{epstopdf-test1.tex}{\from{epstopdf.dtx}{test1}}% } \catcode32=13\relax% active space @@ -157,7 +155,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{epstopdf.drv}% - [2019-12-09 v2.10 Conversion with epstopdf on the fly (HO)]% + [2020-01-24 v2.11 Conversion with epstopdf on the fly (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2011/11/22] \begin{document} @@ -170,7 +168,7 @@ and the derived files % \GetFileInfo{epstopdf.drv} % % \title{The \xpackage{epstopdf} package} -% \date{2019-12-09 v2.10} +% \date{2020-01-24 v2.11} % \author{Heiko Oberdiek\thanks % {Please report any issues at \url{https://github.com/ho-tex/epstopdf/issues}}} % @@ -572,7 +570,7 @@ and the derived files \fi \expandafter\x\csname ver@epstopdf.sty\endcsname \ProvidesPackage{epstopdf}% - [2019-12-09 v2.10 Conversion with epstopdf on the fly (HO)]% + [2020-01-24 v2.11 Conversion with epstopdf on the fly (HO)]% % \end{macrocode} % Larger catcode set because of configuration files needed. % \begin{macrocode} @@ -725,7 +723,7 @@ and the derived files \fi \expandafter\x\csname ver@epstopdf-base.sty\endcsname \ProvidesPackage{epstopdf-base}% - [2019-12-09 v2.10 Base part for package epstopdf]% + [2020-01-24 v2.11 Base part for package epstopdf]% % \end{macrocode} % % \subsubsection{Catcodes} @@ -1254,6 +1252,13 @@ and the derived files \InputIfFileExists{epstopdf.cfg}{}{} % \end{macrocode} % +% Use \texttt{epstpdf} if the cfg files have not set a default. +% \begin{macrocode} +\expandafter\ifx\csname epstopdf@sys@cmd\endcsname\relax + \def\epstopdf@sys@cmd{epstopdf} +\fi +% \end{macrocode} +% % % \begin{macrocode} \ETE@AtEnd% @@ -1546,9 +1551,12 @@ and the derived files % \begin{Version}{2019-11-30 v2.9} % \item Read the \verb|epstopdf.cfg| file even in the base code is being used. % \end{Version} -% \begin{Version}{2019-12-09 v2.10} +% \begin{Version}{2020-01-24 v2.11} % \item use \verb|'| not \verb|"| for Lua strings, as the latter not made safe. % \end{Version} +% \begin{Version}{2020-01-24 v2.11} +% \item Ensure that \verb|\epstopdf@sys@cmd| is defined even if no \texttt{cfg} file is found. +% \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 746b2312752..a313dc14bc4 100644 --- a/Master/texmf-dist/source/latex/epstopdf-pkg/epstopdf.ins +++ b/Master/texmf-dist/source/latex/epstopdf-pkg/epstopdf.ins @@ -9,11 +9,11 @@ %% This is a generated file. %% %% Project: epstopdf -%% Version: 2019-12-09 v2.10 +%% Version: 2020-01-24 v2.11 %% %% Copyright (C) -%% 2001, 2006-2010 Heiko Oberdiek -%% 2016-2019 Oberdiek Package Support Group +%% 2001-2010 Heiko Oberdiek +%% 2016-2019 Oberdiek Package Support Group %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -35,12 +35,12 @@ %% This work consists of the main source file epstopdf.dtx %% and the derived files %% epstopdf.sty, epstopdf.pdf, epstopdf.ins, epstopdf.drv, -%% epstopdf-base.sty, epstopdf-test1.tex. +%% epstopdf-base.sty. %% \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: epstopdf 2019-12-09 v2.10 Conversion with epstopdf on the fly (HO)} +\Msg{* Package: epstopdf 2020-01-24 v2.11 Conversion with epstopdf on the fly (HO)} \Msg{************************************************************************} \keepsilent @@ -52,11 +52,11 @@ This is a generated file. Project: epstopdf -Version: 2019-12-09 v2.10 +Version: 2020-01-24 v2.11 Copyright (C) - 2001, 2006-2010 Heiko Oberdiek - 2016-2019 Oberdiek Package Support Group + 2001-2010 Heiko Oberdiek + 2016-2019 Oberdiek Package Support Group This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either @@ -77,7 +77,7 @@ https://github.com/ho-tex/epstopdf/issues This work consists of the main source file epstopdf.dtx and the derived files epstopdf.sty, epstopdf.pdf, epstopdf.ins, epstopdf.drv, - epstopdf-base.sty, epstopdf-test1.tex. + epstopdf-base.sty. \endpreamble \let\MetaPrefix\DoubleperCent 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 d63967920c8..39f96254a06 100644 --- a/Master/texmf-dist/tex/latex/epstopdf-pkg/epstopdf-base.sty +++ b/Master/texmf-dist/tex/latex/epstopdf-pkg/epstopdf-base.sty @@ -9,11 +9,11 @@ %% This is a generated file. %% %% Project: epstopdf -%% Version: 2019-12-09 v2.10 +%% Version: 2020-01-24 v2.11 %% %% Copyright (C) -%% 2001, 2006-2010 Heiko Oberdiek -%% 2016-2019 Oberdiek Package Support Group +%% 2001-2010 Heiko Oberdiek +%% 2016-2019 Oberdiek Package Support Group %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -35,7 +35,7 @@ %% This work consists of the main source file epstopdf.dtx %% and the derived files %% epstopdf.sty, epstopdf.pdf, epstopdf.ins, epstopdf.drv, -%% epstopdf-base.sty, epstopdf-test1.tex. +%% epstopdf-base.sty. %% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M @@ -103,7 +103,7 @@ \fi \expandafter\x\csname ver@epstopdf-base.sty\endcsname \ProvidesPackage{epstopdf-base}% - [2019-12-09 v2.10 Base part for package epstopdf]% + [2020-01-24 v2.11 Base part for package epstopdf]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -516,6 +516,9 @@ \fi \InputIfFileExists{epstopdf-sys.cfg}{}{} \InputIfFileExists{epstopdf.cfg}{}{} +\expandafter\ifx\csname epstopdf@sys@cmd\endcsname\relax + \def\epstopdf@sys@cmd{epstopdf} +\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 f868ad45712..90be874d993 100644 --- a/Master/texmf-dist/tex/latex/epstopdf-pkg/epstopdf.sty +++ b/Master/texmf-dist/tex/latex/epstopdf-pkg/epstopdf.sty @@ -9,11 +9,11 @@ %% This is a generated file. %% %% Project: epstopdf -%% Version: 2019-12-09 v2.10 +%% Version: 2020-01-24 v2.11 %% %% Copyright (C) -%% 2001, 2006-2010 Heiko Oberdiek -%% 2016-2019 Oberdiek Package Support Group +%% 2001-2010 Heiko Oberdiek +%% 2016-2019 Oberdiek Package Support Group %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -35,7 +35,7 @@ %% This work consists of the main source file epstopdf.dtx %% and the derived files %% epstopdf.sty, epstopdf.pdf, epstopdf.ins, epstopdf.drv, -%% epstopdf-base.sty, epstopdf-test1.tex. +%% epstopdf-base.sty. %% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M @@ -103,7 +103,7 @@ \fi \expandafter\x\csname ver@epstopdf.sty\endcsname \ProvidesPackage{epstopdf}% - [2019-12-09 v2.10 Conversion with epstopdf on the fly (HO)]% + [2020-01-24 v2.11 Conversion with epstopdf on the fly (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % -- cgit v1.2.3