[latex3-commits] [latex3/graphics-def] XC-color: named model (96e8caf)

[github at latex-project.org]

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

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

commit 96e8caf6c07123205b63b3d054cad281489f44e5
Author: David Carlisle <d.p.carlisle at gmail.com>
Date:   Sat Dec 9 20:44:43 2023 +0000

    named model


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

96e8caf6c07123205b63b3d054cad281489f44e5
 pdftex.def          | 9 ++++++---
 testfiles/xc001.lvt | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pdftex.def b/pdftex.def
index 3f4c413..d00615b 100644
--- a/pdftex.def
+++ b/pdftex.def
@@ -22,8 +22,10 @@
 \ProvidesFile{pdftex.def}
   [2023/12/09 v1.3a Graphics/color driver for pdftex]
 \def\GPT at space{ }
-\providecommand\xcolor@[4]{#2}
-\def\GPT at xcolor@{\ifx\colorlet\@undefined\noexpand\xcolor@\else\expandafter\xcolor@\fi}
+\ifx\xcolor@\@undefined
+\protected\def\xcolor@#1#2#3#4{#2}
+\fi
+\def\GPT at xcolor@{\xcolor@}
 
 \def\c at lor@arg#1{%
   \dimen@#1\p@
@@ -65,7 +67,8 @@
 \def\c at lor@@named#1,#2,#3\@@#4{%
   \@ifundefined{col@#1}%
     {\PackageError{color}{Undefined color `#1'}\@ehd}%
-  {\edef#4{\csname col@#1\endcsname}}%
+  {%\expandafter\show\csname col@#1\endcsname
+  \edef#4{\csname col@#1\endcsname}}%
   }
 \chardef\main at pdfcolorstack=0 %
 \@ifundefined{@pdfcolorstack}
diff --git a/testfiles/xc001.lvt b/testfiles/xc001.lvt
index a88f449..aaab5eb 100644
--- a/testfiles/xc001.lvt
+++ b/testfiles/xc001.lvt
@@ -43,6 +43,6 @@
 \test{RGB}
 \test{cmyk}
 \test{gray}
-%\test{named}
+\test{named}
 
 \END
\ No newline at end of file