[latex3-commits] [git/LaTeX3-latex3-xcolor] changekeyhandler: moved some of pdfmanagement-firstaid code (f6e11e9)

[Ulrike Fischer]

Repository : https://github.com/latex3/xcolor
On branch  : changekeyhandler
Link       : https://github.com/latex3/xcolor/commit/f6e11e9445503c0e34d6c63ee736a2c310dc64ef

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

commit f6e11e9445503c0e34d6c63ee736a2c310dc64ef
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date:   Sun Jul 31 12:31:05 2022 +0200

    moved some of pdfmanagement-firstaid code


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

f6e11e9445503c0e34d6c63ee736a2c310dc64ef
 ChangeLog  |  1 +
 xcolor.dtx | 12 +++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 548eccf..afaa55b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@ unreleased
 * The new LaTeX key/val handler is used
 * rowcolors command has moved to the colortbl package
 * the fixpdftex option is obsolete and does nothing at all (issue #20)
+* prepared optional support for l3colors (this is currently used by pdfmanagement-testphase)
 
 
 2022/06/12 v2.14
diff --git a/xcolor.dtx b/xcolor.dtx
index d4dd046..be56742 100644
--- a/xcolor.dtx
+++ b/xcolor.dtx
@@ -4833,10 +4833,12 @@
 \def\XC at definecolor[#1]#2%
  {\@testopt{\XC at definec@lor[#1]{#2}}\colornameprefix}
 %    \end{macrocode}
-%
+% |\@expl at xcolor@set@@nonn| prepares color for the l3color support.
 %    \begin{macrocode}
+\providecommand\@expl at xcolor@set@@nonn[4]{}
 \def\XC at definec@lor[#1]#2[#3]#4#5%
- {\begingroup
+ {\@expl at xcolor@set@@nonn{#2}{#4}{#5}{#1}%
+  \begingroup
   \XC at sdef\@@cls{#1}\XC at edef\@@nam{#2}\edef\colornameprefix{#3}%
   \XC at logdef\@@nam
   \XC at getmodclr02{#4}{#5}{\let\@@tmp\relax}%
@@ -5002,9 +5004,13 @@
 % Create a color `name' consisting of \Meta{color}, converted to \Meta{num model} if non-empty.
 %    \begin{macrocode}
 \def\colorlet{\@testopt{\XC at colorlet}{}}
+%    \end{macrocode}
+% |\@expl at xcolor@set@@ne| prepares colors also for l3color.
+\providecommand\@expl at xcolor@set@@ne[2]{}
 \def\XC at colorlet[#1]#2{\@testopt{\XC at col@rlet[#1]{#2}}{}}
 \def\XC at col@rlet[#1]#2[#3]#4%
- {\begingroup
+ {\@expl at xcolor@set@@ne{#2}{#4}%
+  \begingroup
   \edef\@@cls{#1}\XC at edef\@@nam{#2}\XC at sdef\@@mod{#3}\XC at edef\@@clr{#4}%
 %    \end{macrocode}
 %