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 | |
parent | d6f947fa36ed3b76d36a8dfad4e9247319b4d622 (diff) |
CTAN sync 202203160301
Diffstat (limited to 'macros/latex-dev/required/graphics')
16 files changed, 52 insertions, 27 deletions
diff --git a/macros/latex-dev/required/graphics/README.md b/macros/latex-dev/required/graphics/README.md index fb478e598d..939930605f 100644 --- a/macros/latex-dev/required/graphics/README.md +++ b/macros/latex-dev/required/graphics/README.md @@ -1,7 +1,7 @@ The LaTeX `graphics` bundle =========================== -Release 2022-06-01 pre-release 1 +Release 2022-06-01 pre-release 2 Overview -------- diff --git a/macros/latex-dev/required/graphics/changes.txt b/macros/latex-dev/required/graphics/changes.txt index 72a106c3fd..2a542dca1b 100644 --- a/macros/latex-dev/required/graphics/changes.txt +++ b/macros/latex-dev/required/graphics/changes.txt @@ -4,11 +4,17 @@ completeness or accuracy and it contains some references to files that are not part of the distribution. ======================================================================= +2022-03-10 Phelype Oleinik <phelype.oleinik@latex-project.org> + + * graphics.dtx: + Use \set@curr@file@nosearch to avoid premature inclusion of path + from \cs{graphicspath} (gh/776). + 2022-01-06 Frank Mittelbach <Frank.Mittelbach@latex-project.org> * mathcolor.dtx: Support \mathcolor to correctly color parts of formulas without - spacing problems. + spacing problems. This command is *only* supported in math mode. ================================================================================ All changes above are only part of the development branch for the next release. diff --git a/macros/latex-dev/required/graphics/color.pdf b/macros/latex-dev/required/graphics/color.pdf Binary files differindex 499c81c1d0..ebf13b6cb9 100644 --- a/macros/latex-dev/required/graphics/color.pdf +++ b/macros/latex-dev/required/graphics/color.pdf diff --git a/macros/latex-dev/required/graphics/drivers.pdf b/macros/latex-dev/required/graphics/drivers.pdf Binary files differindex ba45790672..4d06da1f61 100644 --- a/macros/latex-dev/required/graphics/drivers.pdf +++ b/macros/latex-dev/required/graphics/drivers.pdf diff --git a/macros/latex-dev/required/graphics/epsfig.pdf b/macros/latex-dev/required/graphics/epsfig.pdf Binary files differindex e5feedc670..3ee5d92b01 100644 --- a/macros/latex-dev/required/graphics/epsfig.pdf +++ b/macros/latex-dev/required/graphics/epsfig.pdf 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. diff --git a/macros/latex-dev/required/graphics/graphics.pdf b/macros/latex-dev/required/graphics/graphics.pdf Binary files differindex d3d880dd69..39927a75eb 100644 --- a/macros/latex-dev/required/graphics/graphics.pdf +++ b/macros/latex-dev/required/graphics/graphics.pdf diff --git a/macros/latex-dev/required/graphics/graphicx.pdf b/macros/latex-dev/required/graphics/graphicx.pdf Binary files differindex 0a61531244..0a39aa56ce 100644 --- a/macros/latex-dev/required/graphics/graphicx.pdf +++ b/macros/latex-dev/required/graphics/graphicx.pdf diff --git a/macros/latex-dev/required/graphics/grfguide.pdf b/macros/latex-dev/required/graphics/grfguide.pdf Binary files differindex 70ed7ac3ac..a0c0914ae2 100644 --- a/macros/latex-dev/required/graphics/grfguide.pdf +++ b/macros/latex-dev/required/graphics/grfguide.pdf diff --git a/macros/latex-dev/required/graphics/keyval.pdf b/macros/latex-dev/required/graphics/keyval.pdf Binary files differindex 9b60667b03..c95033c86d 100644 --- a/macros/latex-dev/required/graphics/keyval.pdf +++ b/macros/latex-dev/required/graphics/keyval.pdf diff --git a/macros/latex-dev/required/graphics/lscape.pdf b/macros/latex-dev/required/graphics/lscape.pdf Binary files differindex 0eb191d662..51c7be6e47 100644 --- a/macros/latex-dev/required/graphics/lscape.pdf +++ b/macros/latex-dev/required/graphics/lscape.pdf diff --git a/macros/latex-dev/required/graphics/mathcolor.dtx b/macros/latex-dev/required/graphics/mathcolor.dtx index 6ed53f8f61..2341e71e28 100644 --- a/macros/latex-dev/required/graphics/mathcolor.dtx +++ b/macros/latex-dev/required/graphics/mathcolor.dtx @@ -14,8 +14,8 @@ %%% From File: mathcolor.dtx % % \begin{macrocode} -\def\mathcolorversion{v1.0a} -\def\mathcolordate{2022/01/07} +\def\mathcolorversion{v1.0b} +\def\mathcolordate{2022/01/28} % \end{macrocode} %<*driver> \documentclass{l3doc} @@ -165,7 +165,17 @@ % \begin{macrocode} \DeclareDocumentCommand \mathcolor { o m m } { % \end{macrocode} -% First action is to save the current color value on a stack +% The \cs{mathcolor} is only supported in math mode because in text +% mode it has problems scanning away a space after it, for example. +% We therefore raise an error if it executes +% anywhere else. The \LaTeXe{} error command is a +% bit strangely named, because in the kernel it is only used for +% math alphabets, but the message it gives is fine. +% \changes{v1.0b}{2022/01/28}{Restrict command to math mode} +% \begin{macrocode} + \mode_if_math:F { \non@alpherr {\mathcolor\space} } +% \end{macrocode} +% First real action is to save the current color value on a stack % (needed if the command is nested or contains some further color % changes with \cs{color} inside). % \begin{macrocode} diff --git a/macros/latex-dev/required/graphics/mathcolor.pdf b/macros/latex-dev/required/graphics/mathcolor.pdf Binary files differindex 1b5d8683e5..b4646281e4 100644 --- a/macros/latex-dev/required/graphics/mathcolor.pdf +++ b/macros/latex-dev/required/graphics/mathcolor.pdf diff --git a/macros/latex-dev/required/graphics/rotating.pdf b/macros/latex-dev/required/graphics/rotating.pdf Binary files differindex 5529771dcd..802e0b4716 100644 --- a/macros/latex-dev/required/graphics/rotating.pdf +++ b/macros/latex-dev/required/graphics/rotating.pdf diff --git a/macros/latex-dev/required/graphics/rotex.pdf b/macros/latex-dev/required/graphics/rotex.pdf Binary files differindex d7b41106d8..acd205bc79 100644 --- a/macros/latex-dev/required/graphics/rotex.pdf +++ b/macros/latex-dev/required/graphics/rotex.pdf diff --git a/macros/latex-dev/required/graphics/trig.pdf b/macros/latex-dev/required/graphics/trig.pdf Binary files differindex 52f717b3f5..6f0312bf7a 100644 --- a/macros/latex-dev/required/graphics/trig.pdf +++ b/macros/latex-dev/required/graphics/trig.pdf |