[latex3-commits] [latex3/graphics-def] XC-color: etex, named model not passing (6ed4823)

[github at latex-project.org]

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

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

commit 6ed4823433d313b1af7c118d704d971281700cdc
Author: David Carlisle <d.p.carlisle at gmail.com>
Date:   Sat Dec 9 21:34:32 2023 +0000

    etex, named model not passing


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

6ed4823433d313b1af7c118d704d971281700cdc
 dvips.def | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/dvips.def b/dvips.def
index f5ba5bf..49ae6cd 100644
--- a/dvips.def
+++ b/dvips.def
@@ -1,6 +1,6 @@
 %% dvips.def Copyright (C) 1994      David Carlisle Sebastian Rahtz
 %%           Copyright (C) 1995-1999 David Carlisle
-%%           Copyright (C) 2000-2022 David Carlisle, LaTeX3 Project
+%%           Copyright (C) 2000-2023 David Carlisle, LaTeX3 Project
 %%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3c
@@ -17,8 +17,11 @@
 %% https://github.com/latex3/graphics-def/issues
 %%
 \ProvidesFile{dvips.def}
-  [2022/09/22 v3.1e Graphics/color driver for dvips]
+  [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}
+\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{%