From 0174af21196c197a5b3672c87bc6f7a614fddd7d Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 10 Dec 2019 03:01:52 +0000 Subject: CTAN sync 201912100301 --- macros/latex/contrib/epstopdf-pkg/epstopdf.dtx | 160 +++---------------------- macros/latex/contrib/epstopdf-pkg/epstopdf.pdf | Bin 366251 -> 357389 bytes 2 files changed, 18 insertions(+), 142 deletions(-) (limited to 'macros/latex/contrib/epstopdf-pkg') diff --git a/macros/latex/contrib/epstopdf-pkg/epstopdf.dtx b/macros/latex/contrib/epstopdf-pkg/epstopdf.dtx index e5bd67ebcb..48a258ae07 100644 --- a/macros/latex/contrib/epstopdf-pkg/epstopdf.dtx +++ b/macros/latex/contrib/epstopdf-pkg/epstopdf.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment % % File: epstopdf.dtx -% Version: 2019-11-30 v2.9 +% Version: 2019-12-09 v2.10 % Info: Conversion with epstopdf on the fly % % Copyright (C) @@ -80,7 +80,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: epstopdf 2019-11-30 v2.9 Conversion with epstopdf on the fly (HO)} +\Msg{* Package: epstopdf 2019-12-09 v2.10 Conversion with epstopdf on the fly (HO)} \Msg{************************************************************************} \keepsilent @@ -92,7 +92,7 @@ This is a generated file. Project: epstopdf -Version: 2019-11-30 v2.9 +Version: 2019-12-09 v2.10 Copyright (C) 2001, 2006-2010 Heiko Oberdiek @@ -112,7 +112,7 @@ This work has the LPPL maintenance status "maintained". The Current Maintainers of this work are Heiko Oberdiek and the Oberdiek Package Support Group -https://github.com/ho-tex/oberdiek/issues +https://github.com/ho-tex/epstopdf/issues This work consists of the main source file epstopdf.dtx @@ -131,10 +131,6 @@ and the derived files \file{epstopdf-base.sty}{\from{epstopdf.dtx}{base}}% % \usedir{doc/latex/epstopdf/test}% % \file{epstopdf-test1.tex}{\from{epstopdf.dtx}{test1}}% - \nopreamble - \nopostamble -% \usedir{source/latex/epstopdf/catalogue}% -% \file{epstopdf-pkg.xml}{\from{epstopdf.dtx}{catalogue}}% } \catcode32=13\relax% active space @@ -161,7 +157,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{epstopdf.drv}% - [2019-11-30 v2.9 Conversion with epstopdf on the fly (HO)]% + [2019-12-09 v2.10 Conversion with epstopdf on the fly (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2011/11/22] \begin{document} @@ -174,7 +170,7 @@ and the derived files % \GetFileInfo{epstopdf.drv} % % \title{The \xpackage{epstopdf} package} -% \date{2019-11-30 v2.9} +% \date{2019-12-09 v2.10} % \author{Heiko Oberdiek\thanks % {Please report any issues at \url{https://github.com/ho-tex/epstopdf/issues}}} % @@ -576,7 +572,7 @@ and the derived files \fi \expandafter\x\csname ver@epstopdf.sty\endcsname \ProvidesPackage{epstopdf}% - [2019-11-30 v2.9 Conversion with epstopdf on the fly (HO)]% + [2019-12-09 v2.10 Conversion with epstopdf on the fly (HO)]% % \end{macrocode} % Larger catcode set because of configuration files needed. % \begin{macrocode} @@ -729,7 +725,7 @@ and the derived files \fi \expandafter\x\csname ver@epstopdf-base.sty\endcsname \ProvidesPackage{epstopdf-base}% - [2019-11-30 v2.9 Base part for package epstopdf]% + [2019-12-09 v2.10 Base part for package epstopdf]% % \end{macrocode} % % \subsubsection{Catcodes} @@ -808,16 +804,16 @@ and the derived files \def\pdf@filesize{\pdffilesize} \def\pdf@system#{\immediate\write18 } \else - \directlua{require("pdftexcmds")} + \directlua{require('pdftexcmds')} \long\def\pdf@strcmp#1#2{\directlua{% - oberdiek.pdftexcmds.strcmp("\luaescapestring{#1}", - "\luaescapestring{#2}")}}% + 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}")}} + oberdiek.pdftexcmds.filemoddate('\luaescapestring{#1}')}} + \def\pdf@filesize#1{\directlua{% + oberdiek.pdftexcmds.filesize('\luaescapestring{#1}')}} \def\pdf@system#1{\directlua{% - oberdiek.pdftexcmds.system("\luaescapestring{#1}")}} + oberdiek.pdftexcmds.system('\luaescapestring{#1}')}} \fi \fi \else @@ -1263,128 +1259,6 @@ and the derived files \ETE@AtEnd% % % \end{macrocode} -% -% \section{Test} -% -% \subsection{Preface for standard catcode check} -% -% \begin{macrocode} -%<*test1> -\input miniltx.tex\relax -\def\Gin@driver{pdftex.def} -\input graphicx.sty\relax -\resetatcatcode -% -% \end{macrocode} -% -% \subsection{Catcode checks for loading} -% -% \begin{macrocode} -%<*test1> -% \end{macrocode} -% \begin{macrocode} -\catcode`\{=1 % -\catcode`\}=2 % -\catcode`\#=6 % -\catcode`\@=11 % -\expandafter\ifx\csname count@\endcsname\relax - \countdef\count@=255 % -\fi -\expandafter\ifx\csname @gobble\endcsname\relax - \long\def\@gobble#1{}% -\fi -\expandafter\ifx\csname @firstofone\endcsname\relax - \long\def\@firstofone#1{#1}% -\fi -\expandafter\ifx\csname loop\endcsname\relax - \expandafter\@firstofone -\else - \expandafter\@gobble -\fi -{% - \def\loop#1\repeat{% - \def\body{#1}% - \iterate - }% - \def\iterate{% - \body - \let\next\iterate - \else - \let\next\relax - \fi - \next - }% - \let\repeat=\fi -}% -\def\RestoreCatcodes{} -\count@=0 % -\loop - \edef\RestoreCatcodes{% - \RestoreCatcodes - \catcode\the\count@=\the\catcode\count@\relax - }% -\ifnum\count@<255 % - \advance\count@ 1 % -\repeat - -\def\RangeCatcodeInvalid#1#2{% - \count@=#1\relax - \loop - \catcode\count@=15 % - \ifnum\count@<#2\relax - \advance\count@ 1 % - \repeat -} -\def\RangeCatcodeCheck#1#2#3{% - \count@=#1\relax - \loop - \ifnum#3=\catcode\count@ - \else - \errmessage{% - Character \the\count@\space - with wrong catcode \the\catcode\count@\space - instead of \number#3% - }% - \fi - \ifnum\count@<#2\relax - \advance\count@ 1 % - \repeat -} -\def\space{ } -\expandafter\ifx\csname LoadCommand\endcsname\relax - \def\LoadCommand{\input epstopdf.sty\relax}% -\fi -\def\Test{% - \RangeCatcodeInvalid{0}{47}% - \RangeCatcodeInvalid{58}{64}% - \RangeCatcodeInvalid{91}{96}% - \RangeCatcodeInvalid{123}{255}% - \catcode`\@=12 % - \catcode`\\=0 % - \catcode`\%=14 % - \LoadCommand - \RangeCatcodeCheck{0}{36}{15}% - \RangeCatcodeCheck{37}{37}{14}% - \RangeCatcodeCheck{38}{47}{15}% - \RangeCatcodeCheck{48}{57}{12}% - \RangeCatcodeCheck{58}{63}{15}% - \RangeCatcodeCheck{64}{64}{12}% - \RangeCatcodeCheck{65}{90}{11}% - \RangeCatcodeCheck{91}{91}{15}% - \RangeCatcodeCheck{92}{92}{0}% - \RangeCatcodeCheck{93}{96}{15}% - \RangeCatcodeCheck{97}{122}{11}% - \RangeCatcodeCheck{123}{255}{15}% - \RestoreCatcodes -} -\Test -\csname @@end\endcsname -\end -% \end{macrocode} -% \begin{macrocode} -% -% \end{macrocode} -% % \section{Installation} % % \subsection{Download} @@ -1435,7 +1309,6 @@ and the derived files % epstopdf.sty & tex/latex/epstopdf/epstopdf.sty\\ % epstopdf-base.sty & tex/latex/epstopdf/epstopdf-base.sty\\ % epstopdf.pdf & doc/latex/epstopdf/epstopdf.pdf\\ -% test/epstopdf-test1.tex & doc/latex/epstopdf/test/epstopdf-test1.tex\\ % epstopdf.dtx & source/latex/epstopdf/epstopdf.dtx\\ % \end{tabular}^^A % }^^A @@ -1673,6 +1546,9 @@ 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} +% \item use \verb|'| not \verb|"| for Lua strings, as the latter not made safe. +% \end{Version} % \end{History} % % \PrintIndex diff --git a/macros/latex/contrib/epstopdf-pkg/epstopdf.pdf b/macros/latex/contrib/epstopdf-pkg/epstopdf.pdf index 662a8d3324..5d214c2b8c 100644 Binary files a/macros/latex/contrib/epstopdf-pkg/epstopdf.pdf and b/macros/latex/contrib/epstopdf-pkg/epstopdf.pdf differ -- cgit v1.2.3