diff options
Diffstat (limited to 'macros/latex-dev/required/graphics')
15 files changed, 23 insertions, 12 deletions
diff --git a/macros/latex-dev/required/graphics/README.md b/macros/latex-dev/required/graphics/README.md index c2ba96233d..e18f2f137b 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 2021-11-15 pre-release 2 +Release 2021-11-15 pre-release 3 Overview -------- @@ -40,7 +40,7 @@ In particular, to check that you are really seeing a bug, please write a short, self-contained document that shows the problem. This should include the `latexbug` package, which will warn if your test file is not suitable for one or the other reason. See the [CONTRIBUTING -guide](https://github.com/latex3/latex2e/blob/master/CONTRIBUTING.md) +guide](https://github.com/latex3/latex2e/blob/main/CONTRIBUTING.md) for further details, or if you need to obtain the `latexbug` package. If the bug turns out to be with third-party software then please diff --git a/macros/latex-dev/required/graphics/changes.txt b/macros/latex-dev/required/graphics/changes.txt index bd328646f1..c74d3abdf0 100644 --- a/macros/latex-dev/required/graphics/changes.txt +++ b/macros/latex-dev/required/graphics/changes.txt @@ -4,6 +4,12 @@ completeness or accuracy and it contains some references to files that are not part of the distribution. ======================================================================= +2021-09-27 David Carlisle <David.Carlisle@latex-project.org> + + * color.dtx: use \@backslashchar color rather than \string\color to + generate internal csnames, to avoid relying on the current setting + of \escapechar + 2021-09-16 David Carlisle <David.Carlisle@latex-project.org> * graphicx.dtx: Add an alt key to \includegraphics gh/651 diff --git a/macros/latex-dev/required/graphics/color.dtx b/macros/latex-dev/required/graphics/color.dtx index 2dfbb238da..9418a12477 100644 --- a/macros/latex-dev/required/graphics/color.dtx +++ b/macros/latex-dev/required/graphics/color.dtx @@ -21,7 +21,7 @@ %<driver> \ProvidesFile{color.drv} % \fi % \ProvidesFile{color.dtx} - [2020/02/24 v1.2b Standard LaTeX Color (DPC)] + [2021/10/11 v1.3b Standard LaTeX Color (DPC)] % % \iffalse %<*driver> @@ -78,6 +78,9 @@ % fixed values whilst this file is being read. % \changes{v0.3b}{1994/09/14} % {Save and restore catcodes} +% \changes{v1.3a}{2021/09/27} +% {Use \cs{@backslashchar} in preference to \cs{string} gh/659} +% % \begin{macrocode} \edef\Gin@codes{% \catcode`\noexpand\^^A\the\catcode`\^^A\relax @@ -185,9 +188,11 @@ % \begin{option}{dvipdfm} % \changes{v1.0h}{1999/01/13} % {dvipdfm added} -% Mark Wick's dvipdfm driver. +% \changes{v1.3b}{2021/10/11} +% {make dvipdfm an alias for dvipdfmx} +% Mark Wick's dvipdfm driver (now merged with xdvipdfmx). % \begin{macrocode} -\DeclareOption{dvipdfm}{\def\Gin@driver{dvipdfm.def}} +\DeclareOption{dvipdfm}{\def\Gin@driver{dvipdfmx.def}} % \end{macrocode} % \end{option} % @@ -375,7 +380,7 @@ % \begin{macrocode} \DeclareOption{usenames}{% \def\c@lor@usename#1{% - \expandafter\color@named\csname\string\color @#1\endcsname{#1}}} + \expandafter\color@named\csname\@backslashchar color @#1\endcsname{#1}}} % \end{macrocode} % \end{option} % @@ -432,10 +437,10 @@ % Finally call |\set@color| to effect the colour change. % \begin{macrocode} \def\@declaredcolor#1{% - \@ifundefined{\string\color @#1}% + \@ifundefined{\@backslashchar color @#1}% {\c@lor@error{`#1'}}% {\expandafter\let\expandafter\current@color - \csname\string\color @#1\endcsname + \csname\@backslashchar color @#1\endcsname \set@color}% \ignorespaces} % \end{macrocode} @@ -506,7 +511,7 @@ % \begin{macrocode} \protected\def\nopagecolor{% \@ifundefined{no@page@color}{% - \PackageInfo{color}{\string\nopagecolor\space is not supported}% + \PackageInfo{color}{\@backslashchar nopagecolor\space is not supported}% }{% \no@page@color }% @@ -545,10 +550,10 @@ \protected\def\definecolor#1#2#3{% \@ifundefined{color@#2}% {\c@lor@error{model `#2'}}% - {\@ifundefined{\string\color @#1}{}% + {\@ifundefined{\@backslashchar color @#1}{}% {\PackageInfo{color}{Redefining color #1}}% \csname color@#2\expandafter\endcsname - \csname\string\color @#1\endcsname{#3}}} + \csname\@backslashchar color @#1\endcsname{#3}}} % \end{macrocode} % \end{macro} % diff --git a/macros/latex-dev/required/graphics/color.pdf b/macros/latex-dev/required/graphics/color.pdf Binary files differindex dbc9c25788..f1829a454e 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 ecd63d0fb4..5e54fa719d 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 5787ecf75b..e4d4d1925e 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 0c5c9e88ec..cec35559ef 100644 --- a/macros/latex-dev/required/graphics/graphics.dtx +++ b/macros/latex-dev/required/graphics/graphics.dtx @@ -616,7 +616,7 @@ % \end{macrocode} % \end{option} % -% \begin{option}{luatex} +% \begin{option}{dvisvgm} % \changes{v1.0r}{2016/05/09} % {dvisvgm added} % dvisvgm driver. diff --git a/macros/latex-dev/required/graphics/graphics.pdf b/macros/latex-dev/required/graphics/graphics.pdf Binary files differindex 2a78345161..b822dadb4a 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 210d251efc..27467b0f6d 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 792686e0af..77d4881297 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 3571d1347e..e2dd512f7f 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 caf9f95ee7..14ac364242 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/rotating.pdf b/macros/latex-dev/required/graphics/rotating.pdf Binary files differindex e4c4a0df13..f74059ec6a 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 6a89c2edff..fe1850a507 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 fcfbf0a4da..b92253e175 100644 --- a/macros/latex-dev/required/graphics/trig.pdf +++ b/macros/latex-dev/required/graphics/trig.pdf |