From 40fca8cacf0d4b42d00a5f59e9f6c4294f7b5eff Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 3 Dec 2022 21:02:39 +0000 Subject: graphics-pln (3dec22) git-svn-id: svn://tug.org/texlive/trunk@65187 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/plain/graphics-pln/color.tex | 5 +++-- Master/texmf-dist/tex/plain/graphics-pln/graphicx.tex | 7 ++----- Master/texmf-dist/tex/plain/graphics-pln/miniltx.tex | 3 ++- 3 files changed, 7 insertions(+), 8 deletions(-) (limited to 'Master/texmf-dist/tex/plain') diff --git a/Master/texmf-dist/tex/plain/graphics-pln/color.tex b/Master/texmf-dist/tex/plain/graphics-pln/color.tex index b185a0e071e..3a9e095f8fb 100644 --- a/Master/texmf-dist/tex/plain/graphics-pln/color.tex +++ b/Master/texmf-dist/tex/plain/graphics-pln/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/Master/texmf-dist/tex/plain/graphics-pln/graphicx.tex b/Master/texmf-dist/tex/plain/graphics-pln/graphicx.tex index 460b82ec038..f872ad47bf0 100644 --- a/Master/texmf-dist/tex/plain/graphics-pln/graphicx.tex +++ b/Master/texmf-dist/tex/plain/graphics-pln/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/Master/texmf-dist/tex/plain/graphics-pln/miniltx.tex b/Master/texmf-dist/tex/plain/graphics-pln/miniltx.tex index 6aabb24d426..ff4e78d0e3e 100644 --- a/Master/texmf-dist/tex/plain/graphics-pln/miniltx.tex +++ b/Master/texmf-dist/tex/plain/graphics-pln/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 -- cgit v1.2.3