diff options
author | Norbert Preining <norbert@preining.info> | 2022-12-03 03:02:05 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2022-12-03 03:02:05 +0000 |
commit | 34896a353fe22e8ac88ef0b4e39f4fa878e2b0b6 (patch) | |
tree | 9b956161389da3b7c067aaa01731f1d11649e57e /macros/plain/graphics | |
parent | 42cda2ed3fa7472e6c064fdbf998d636556343db (diff) |
CTAN sync 202212030302
Diffstat (limited to 'macros/plain/graphics')
-rw-r--r-- | macros/plain/graphics/README.md | 3 | ||||
-rw-r--r-- | macros/plain/graphics/color.tex | 5 | ||||
-rw-r--r-- | macros/plain/graphics/graphicx.tex | 7 | ||||
-rw-r--r-- | macros/plain/graphics/miniltx.tex | 3 |
4 files changed, 9 insertions, 9 deletions
diff --git a/macros/plain/graphics/README.md b/macros/plain/graphics/README.md index 1695ddece9..d82138a650 100644 --- a/macros/plain/graphics/README.md +++ b/macros/plain/graphics/README.md @@ -24,7 +24,8 @@ David Carlisle 2021/11/15 2022/06/13 2022/09/27 -2022/09/28 +2022/09/28 +2022/12/02 Copyright 1995 1996 2016 2017 2018 2020 2021 2022 David Carlisle diff --git a/macros/plain/graphics/color.tex b/macros/plain/graphics/color.tex index b185a0e071..3a9e095f8f 100644 --- a/macros/plain/graphics/color.tex +++ b/macros/plain/graphics/color.tex @@ -21,10 +21,11 @@ \fi -\let\@color@protected\protected +\let\@color@ifcsname\ifcsname \expandafter\@gobble\csname protected\endcsname +\def\ifcsname mathcolor\endcsname{\iftrue\let\ifcsname\@color@ifcsname} \input color.sty -\let\protected\@color@protected + \resetatcatcode diff --git a/macros/plain/graphics/graphicx.tex b/macros/plain/graphics/graphicx.tex index 460b82ec03..f872ad47bf 100644 --- a/macros/plain/graphics/graphicx.tex +++ b/macros/plain/graphics/graphicx.tex @@ -31,14 +31,11 @@ \ifx\detokenize\@undefined \def\detokenize#1{#1} \fi -\let\GRAPHICS@protected\protected -\ifx\protected\@undefined - \let\protected\relax -\fi + \input graphicx.sty \let\detokenize\GRAPHICS@detokenize -\let\protected\GRAPHICS@protected + \resetatcatcode diff --git a/macros/plain/graphics/miniltx.tex b/macros/plain/graphics/miniltx.tex index 6aabb24d42..ff4e78d0e3 100644 --- a/macros/plain/graphics/miniltx.tex +++ b/macros/plain/graphics/miniltx.tex @@ -545,7 +545,8 @@ % 2022/06/13 \ifx\mathcolor\@undefined % simplified version of \mathcolor - \protected\def\mathcolor{\begingroup\@ifnextchar[\mlx@mathcolora\mlx@mathcolorb} +% 2022/12/02 + \csname protected\endcsname\def\mathcolor{\begingroup\@ifnextchar[\mlx@mathcolora\mlx@mathcolorb} \long\def\mlx@mathcolora[#1]#2#3{\color[#1]{#2}#3\endgroup} \long\def\mlx@mathcolorb#1#2{\color{#1}#2\endgroup} \fi |