[latex3-commits] [git/LaTeX3-latex3-pdfresources] main: better separate color and xcolor (b9e6d26)

[Ulrike Fischer]

Repository : https://github.com/latex3/pdfresources
On branch  : main
Link       : https://github.com/latex3/pdfresources/commit/b9e6d2606fa742a1b80985ceae5140f2a4aaa78e

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

commit b9e6d2606fa742a1b80985ceae5140f2a4aaa78e
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date:   Mon Feb 22 19:22:05 2021 +0100

    better separate color and xcolor


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

b9e6d2606fa742a1b80985ceae5140f2a4aaa78e
 firstaid/xcolor-patches-tmp-ltx.sty | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/firstaid/xcolor-patches-tmp-ltx.sty b/firstaid/xcolor-patches-tmp-ltx.sty
index 34e5db9..c49a000 100644
--- a/firstaid/xcolor-patches-tmp-ltx.sty
+++ b/firstaid/xcolor-patches-tmp-ltx.sty
@@ -4,8 +4,7 @@
 \@ifundefined{color_set:nn}{\RequirePackage{l3color}}{}
 
 \ExplSyntaxOn
- \cs_gset_eq:NN \@expl at color@set@@nnn \color_set:nnn
- \cs_gset_protected:Npn \@expl at color@set@@nnn #1 #2 #3
+\cs_gset_protected:Npn \@expl at xcolor@set@@nnn #1 #2 #3
     {
       \cs_if_exist:cTF { __color_parse_model_ #2 :w }
        {
@@ -24,7 +23,7 @@
        }
     }
  \cs_generate_variant:Nn \color_set:nn {ne}
- \cs_new_protected:Npn \@expl at color@set@@ne #1 #2
+ \cs_new_protected:Npn \@expl at xcolor@set@@ne #1 #2
     {
       \exp_args:Nx \__color_if_defined:nT {#2}
            { \color_set:ne {#1}{#2} }
@@ -32,7 +31,7 @@
 \ExplSyntaxOff
 %\pretocmd{\XC at col@rlet}   {\@expl at color@set@@ne{#2}{#4}}{}{\fail}
 \def\XC at col@rlet[#1]#2[#3]#4%
- {\@expl at color@set@@ne{#2}{#4}%
+ {\@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}%
   \XC at info\@@clr\@@tmp\XC@@tstfalse
@@ -59,7 +58,7 @@
 
 %\pretocmd{\XC at definec@lor}{\@expl at color@set@@nnn{#2}{#4}{#5}}{}{\fail}
 \def\XC at definec@lor[#1]#2[#3]#4#5%
- {\@expl at color@set@@nnn{#2}{#4}{#5}%
+ {\@expl at xcolor@set@@nnn{#2}{#4}{#5}%
   \begingroup
   \XC at sdef\@@cls{#1}\XC at edef\@@nam{#2}\edef\colornameprefix{#3}%
   \XC at logdef\@@nam