[latex3-commits] [latex3/graphics-def] XC-color: xetex, named model not passing (4ddd28a)

[github at latex-project.org]

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

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

commit 4ddd28aa0e5f7efb8fb14f4733453812c48db7b8
Author: David Carlisle <d.p.carlisle at gmail.com>
Date:   Sat Dec 9 21:29:57 2023 +0000

    xetex, named model not passing


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

4ddd28aa0e5f7efb8fb14f4733453812c48db7b8
 xetex.def | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/xetex.def b/xetex.def
index 6f9e00a..2bdecc7 100644
--- a/xetex.def
+++ b/xetex.def
@@ -1,5 +1,5 @@
 %% xetex.def
-%% Copyright (C) 2005-2022 LaTeX3 Project, Jin-Hwan Cho, Shunsaku Hirata
+%% Copyright (C) 2005-2023 LaTeX3 Project, Jin-Hwan Cho, Shunsaku Hirata
 %%                         (with contributions from many others)
 %%
 %% This work may be distributed and/or modified under the
@@ -17,8 +17,11 @@
 %% https://github.com/latex3/graphics-def/issues
 %%
 \ProvidesFile{xetex.def}
-  [2022/09/22 v5.0n Graphics/color driver for xetex]
+  [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}
+\fi
 \def\c at lor@arg#1{%
   \dimen@#1\p@
   \ifdim\dimen@<\z@\dimen@\maxdimen\fi
@@ -27,7 +30,7 @@
   \fi}
 \def\color at gray#1#2{%
   \c at lor@arg{#2}%
-  \edef#1{gray #2}%
+  \edef#1{\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{%
@@ -35,14 +38,14 @@
   \c at lor@arg{#1}%
   \c at lor@arg{#2}%
   \c at lor@arg{#3}%
-  \edef#5{cmyk #1 #2 #3 #4}%
+  \edef#5{\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{rgb #1 #2 #3}%
+  \edef#4{\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{%
@@ -60,7 +63,7 @@
   \c at lor@arg{#1}%
   \c at lor@arg{#2}%
   \c at lor@arg{#3}%
-  \edef#4{hsb #1 #2 #3}%
+  \edef#4{\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{%