diff options
author | Norbert Preining <norbert@preining.info> | 2022-03-16 03:01:05 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2022-03-16 03:01:05 +0000 |
commit | 725ce6a3e602c7516d471df841ea433b8c5bcd9d (patch) | |
tree | 6cc54f5bd90984b9b63976a0386ae2681a08b7cb /macros/latex-dev/required/graphics/graphics.dtx | |
parent | d6f947fa36ed3b76d36a8dfad4e9247319b4d622 (diff) |
CTAN sync 202203160301
Diffstat (limited to 'macros/latex-dev/required/graphics/graphics.dtx')
-rw-r--r-- | macros/latex-dev/required/graphics/graphics.dtx | 53 |
1 files changed, 31 insertions, 22 deletions
diff --git a/macros/latex-dev/required/graphics/graphics.dtx b/macros/latex-dev/required/graphics/graphics.dtx index c9b381adad..92b3c8f335 100644 --- a/macros/latex-dev/required/graphics/graphics.dtx +++ b/macros/latex-dev/required/graphics/graphics.dtx @@ -27,7 +27,7 @@ %<driver> \ProvidesFile{graphics.drv} % \fi % \ProvidesFile{graphics.dtx} - [2021/03/04 v1.4d Standard LaTeX Graphics (DPC,SPQR)] + [2022/03/10 v1.4e Standard LaTeX Graphics (DPC,SPQR)] % % \iffalse %<*driver> @@ -1053,33 +1053,39 @@ % \edef{macrocode} % \end{macro} % -% \begin{macro}{\set@curr@file} +% \begin{macro}{\Gin@set@curr@file} % \begin{macro}{\quote@name} % \changes{v1.3c}{2019/10/08} % {Definitions added for old formats} +% \changes{v1.4e}{2022/03/10} +% {Use \cs{Gin@set@curr@file}, and define it appropriately} +% We have to cope with older formats (rollback as far as 2019-10-01) +% and Plain. Define a minimal \cs{Gin@set@curr@file} first: % \begin{macrocode} -\def\Gin@temp#1{% - \begingroup - \escapechar\m@ne - \xdef\@curr@file{\expandafter\string\csname #1\endcsname}% - \endgroup -} -\ifx\set@curr@file\@Gin@temp - \let\set@curr@file\@undefined -\fi -% \end{macrocode} -% -% \begin{macrocode} -\ifx\set@curr@file\@undefined -\def\set@curr@file#1{% +\def\Gin@set@curr@file#1{% \begingroup \escapechar\m@ne \xdef\@curr@file{\expandafter\string\csname\@firstofone#1\@empty\endcsname}% - \endgroup -} -\def\quote@name#1{"\quote@@name#1\@gobble""} -\def\quote@@name#1"{#1\quote@@name} -\def\unquote@name#1{\quote@@name#1\@gobble"} + \endgroup} +% \end{macrocode} +% Then, if \cs{set@curr@file@nosearch} is undefined, we're before +% 2022-06-01, and if \cs{set@curr@file} is undefined, we're before +% 2019-10-01 (aka Plain, as far as these tests are concerned). Make +% \cs{Gin@set@curr@file} be a copy of the most recent macro: +% \cs{set@curr@file@nosearch} if it exists, and \cs{set@curr@file} +% otherwise. If neither exist, we also need to define +% \cs{quote@name} et~al. +% \begin{macrocode} +\ifx\set@curr@file@nosearch\@undefined + \ifx\set@curr@file\@undefined + \def\quote@name#1{"\quote@@name#1\@gobble""} + \def\quote@@name#1"{#1\quote@@name} + \def\unquote@name#1{\quote@@name#1\@gobble"} + \else + \let\Gin@set@curr@file\set@curr@file + \fi +\else + \let\Gin@set@curr@file\set@curr@file@nosearch \fi % \end{macrocode} % \end{macro} @@ -1114,8 +1120,11 @@ % % \changes{v1.3d}{2019/11/01} % {\cs{curr@name} now unquoted} +% \changes{v1.4e}{2022/03/10} +% {Use \cs{set@curr@file@nosearch} to avoid premature inclusion of +% path from \cs{graphicspath}} % \begin{macrocode} - \set@curr@file{#1}% + \Gin@set@curr@file{#1}% \expandafter\filename@parse\expandafter{\@curr@file}% % \end{macrocode} % If extension is |.gz| tack on to previous extension, eg |.eps.gz| if available. |