[latex3-commits] [latex3/graphics-def] XC-color: unprotect \xcolor@ (160bb9f)

[github at latex-project.org]

Repository : https://github.com/latex3/graphics-def
On branch  : XC-color
Link       : https://github.com/latex3/graphics-def/commit/160bb9f2441bb779bb58a6bdbb2901e50fe96303

>---------------------------------------------------------------

commit 160bb9f2441bb779bb58a6bdbb2901e50fe96303
Author: David Carlisle <d.p.carlisle at gmail.com>
Date:   Sun Dec 10 23:33:02 2023 +0000

    unprotect \xcolor@


>---------------------------------------------------------------

160bb9f2441bb779bb58a6bdbb2901e50fe96303
 dvips.def  | 10 +++++-----
 luatex.def |  8 ++++----
 pdftex.def |  8 ++++----
 xetex.def  | 10 +++++-----
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/dvips.def b/dvips.def
index 49ae6cd..a841d79 100644
--- a/dvips.def
+++ b/dvips.def
@@ -20,7 +20,7 @@
   [2023/12/09 v3.2a Graphics/color driver for dvips]
 \def\GPT at space{ }
 \ifx\xcolor@\@undefined
-  \protected\def\xcolor@#1#2#3#4{#2}
+  \def\xcolor@#1#2#3#4{#2}
 \fi
 \def\c at lor@arg#1{%
   \dimen@#1\p@
@@ -30,7 +30,7 @@
   \fi}
 \def\color at gray#1#2{%
   \c at lor@arg{#2}%
-  \edef#1{\xcolor@{}{gray #2}{\detokenize{gray}}{#2}}%
+  \edef#1{\noexpand\xcolor@{}{gray #2}{\detokenize{gray}}{#2}}%
   }
 \def\color at cmyk#1#2{\c at lor@@cmyk#2\@@#1}
 \def\c at lor@@cmyk#1,#2,#3,#4\@@#5{%
@@ -38,14 +38,14 @@
   \c at lor@arg{#1}%
   \c at lor@arg{#2}%
   \c at lor@arg{#3}%
-  \edef#5{\xcolor@{}{cmyk #1 #2 #3 #4}{\detokenize{cmyk}}{#1,#2,#3,#4}}%
+  \edef#5{\noexpand\xcolor@{}{cmyk #1 #2 #3 #4}{\detokenize{cmyk}}{#1,#2,#3,#4}}%
   }
 \def\color at rgb#1#2{\c at lor@@rgb#2\@@#1}
 \def\c at lor@@rgb#1,#2,#3\@@#4{%
   \c at lor@arg{#1}%
   \c at lor@arg{#2}%
   \c at lor@arg{#3}%
-  \edef#4{\xcolor@{}{rgb #1 #2 #3}{\detokenize{rgb}}{#1,#2,#3}}%
+  \edef#4{\noexpand\xcolor@{}{rgb #1 #2 #3}{\detokenize{rgb}}{#1,#2,#3}}%
   }
 \def\color at RGB#1#2{\c at lor@@RGB#2\@@#1}
 \def\c at lor@@RGB#1,#2,#3\@@#4{%
@@ -63,7 +63,7 @@
   \c at lor@arg{#1}%
   \c at lor@arg{#2}%
   \c at lor@arg{#3}%
-  \edef#4{\xcolor@{}{hsb #1 #2 #3}{\detokenize{hsb}}{#1,#2,#3}}%
+  \edef#4{\noexpand\xcolor@{}{hsb #1 #2 #3}{\detokenize{hsb}}{#1,#2,#3}}%
   }
 \def\color at named#1#2{\c at lor@@named#2,,\@@#1}
 \def\c at lor@@named#1,#2,#3\@@#4{%
diff --git a/luatex.def b/luatex.def
index 874c45e..218bdaf 100644
--- a/luatex.def
+++ b/luatex.def
@@ -23,7 +23,7 @@
   [2023/12/09 v1.3a Graphics/color driver for luatex]
 \def\GPT at space{ }
 \ifx\xcolor@\@undefined
-  \protected\def\xcolor@#1#2#3#4{#2}
+  \def\xcolor@#1#2#3#4{#2}
 \fi
 \def\c at lor@arg#1{%
   \dimen@#1\p@
@@ -33,7 +33,7 @@
   \fi}
 \def\color at gray#1#2{%
   \c at lor@arg{#2}%
-  \edef#1{\xcolor@{}{#2 g #2 G}{\detokenize{gray}}{#2}}%
+  \edef#1{\noexpand\xcolor@{}{#2 g #2 G}{\detokenize{gray}}{#2}}%
   }
 \def\color at cmyk#1#2{\c at lor@@cmyk#2\@@#1}
 \def\c at lor@@cmyk#1,#2,#3,#4\@@#5{%
@@ -41,14 +41,14 @@
   \c at lor@arg{#1}%
   \c at lor@arg{#2}%
   \c at lor@arg{#3}%
-  \edef#5{\xcolor@{}{#1 #2 #3 #4 k #1 #2 #3 #4 K}{\detokenize{cmyk}}{#1,#2,#3,#4}}%
+  \edef#5{\noexpand\xcolor@{}{#1 #2 #3 #4 k #1 #2 #3 #4 K}{\detokenize{cmyk}}{#1,#2,#3,#4}}%
   }
 \def\color at rgb#1#2{\c at lor@@rgb#2\@@#1}
 \def\c at lor@@rgb#1,#2,#3\@@#4{%
   \c at lor@arg{#1}%
   \c at lor@arg{#2}%
   \c at lor@arg{#3}%
-  \edef#4{\xcolor@{}{#1 #2 #3 rg #1 #2 #3 RG}{\detokenize{rgb}}{#1,#2,#3}}%
+  \edef#4{\noexpand\xcolor@{}{#1 #2 #3 rg #1 #2 #3 RG}{\detokenize{rgb}}{#1,#2,#3}}%
   }
 \def\color at RGB#1#2{\c at lor@@RGB#2\@@#1}
 \def\c at lor@@RGB#1,#2,#3\@@#4{%
diff --git a/pdftex.def b/pdftex.def
index cda4cb9..72604b2 100644
--- a/pdftex.def
+++ b/pdftex.def
@@ -23,7 +23,7 @@
   [2023/12/09 v1.3a Graphics/color driver for pdftex]
 \def\GPT at space{ }
 \ifx\xcolor@\@undefined
-  \protected\def\xcolor@#1#2#3#4{#2}
+  \def\xcolor@#1#2#3#4{#2}
 \fi
 \def\c at lor@arg#1{%
   \dimen@#1\p@
@@ -33,7 +33,7 @@
   \fi}
 \def\color at gray#1#2{%
   \c at lor@arg{#2}%
-  \edef#1{\xcolor@{}{#2 g #2 G}{\detokenize{gray}}{#2}}%
+  \edef#1{\noexpand\xcolor@{}{#2 g #2 G}{\detokenize{gray}}{#2}}%
   }
 \def\color at cmyk#1#2{\c at lor@@cmyk#2\@@#1}
 \def\c at lor@@cmyk#1,#2,#3,#4\@@#5{%
@@ -41,14 +41,14 @@
   \c at lor@arg{#1}%
   \c at lor@arg{#2}%
   \c at lor@arg{#3}%
-  \edef#5{\xcolor@{}{#1 #2 #3 #4 k #1 #2 #3 #4 K}{\detokenize{cmyk}}{#1,#2,#3,#4}}%
+  \edef#5{\noexpand\xcolor@{}{#1 #2 #3 #4 k #1 #2 #3 #4 K}{\detokenize{cmyk}}{#1,#2,#3,#4}}%
   }
 \def\color at rgb#1#2{\c at lor@@rgb#2\@@#1}
 \def\c at lor@@rgb#1,#2,#3\@@#4{%
   \c at lor@arg{#1}%
   \c at lor@arg{#2}%
   \c at lor@arg{#3}%
-  \edef#4{\xcolor@{}{#1 #2 #3 rg #1 #2 #3 RG}{\detokenize{rgb}}{#1,#2,#3}}%
+  \edef#4{\noexpand\xcolor@{}{#1 #2 #3 rg #1 #2 #3 RG}{\detokenize{rgb}}{#1,#2,#3}}%
   }
 \def\color at RGB#1#2{\c at lor@@RGB#2\@@#1}
 \def\c at lor@@RGB#1,#2,#3\@@#4{%
diff --git a/xetex.def b/xetex.def
index 2bdecc7..61f89be 100644
--- a/xetex.def
+++ b/xetex.def
@@ -20,7 +20,7 @@
   [2023/12/09 v5.1a Graphics/color driver for xetex]
 \def\GPT at space{ }
 \ifx\xcolor@\@undefined
-  \protected\def\xcolor@#1#2#3#4{#2}
+  \def\xcolor@#1#2#3#4{#2}
 \fi
 \def\c at lor@arg#1{%
   \dimen@#1\p@
@@ -30,7 +30,7 @@
   \fi}
 \def\color at gray#1#2{%
   \c at lor@arg{#2}%
-  \edef#1{\xcolor@{}{gray #2}{\detokenize{gray}}{#2}}%
+  \edef#1{\noexpand\xcolor@{}{gray #2}{\detokenize{gray}}{#2}}%
   }
 \def\color at cmyk#1#2{\c at lor@@cmyk#2\@@#1}
 \def\c at lor@@cmyk#1,#2,#3,#4\@@#5{%
@@ -38,14 +38,14 @@
   \c at lor@arg{#1}%
   \c at lor@arg{#2}%
   \c at lor@arg{#3}%
-  \edef#5{\xcolor@{}{cmyk #1 #2 #3 #4}{\detokenize{cmyk}}{#1,#2,#3,#4}}%
+  \edef#5{\noexpand\xcolor@{}{cmyk #1 #2 #3 #4}{\detokenize{cmyk}}{#1,#2,#3,#4}}%
   }
 \def\color at rgb#1#2{\c at lor@@rgb#2\@@#1}
 \def\c at lor@@rgb#1,#2,#3\@@#4{%
   \c at lor@arg{#1}%
   \c at lor@arg{#2}%
   \c at lor@arg{#3}%
-  \edef#4{\xcolor@{}{rgb #1 #2 #3}{\detokenize{rgb}}{#1,#2,#3}}%
+  \edef#4{\noexpand\xcolor@{}{rgb #1 #2 #3}{\detokenize{rgb}}{#1,#2,#3}}%
   }
 \def\color at RGB#1#2{\c at lor@@RGB#2\@@#1}
 \def\c at lor@@RGB#1,#2,#3\@@#4{%
@@ -63,7 +63,7 @@
   \c at lor@arg{#1}%
   \c at lor@arg{#2}%
   \c at lor@arg{#3}%
-  \edef#4{\xcolor@{}{hsb #1 #2 #3}{\detokenize{hsb}}{#1,#2,#3}}%
+  \edef#4{\noexpand\xcolor@{}{hsb #1 #2 #3}{\detokenize{hsb}}{#1,#2,#3}}%
   }
 \def\color at named#1#2{\c at lor@@named#2,,\@@#1}
 \def\c at lor@@named#1,#2,#3\@@#4{%