[latex3-commits] [git/LaTeX3-latex3-pdfresources] develop: xcolor patch moved to xcolor (5c40f6f)

[Ulrike Fischer]

Repository : https://github.com/latex3/pdfresources
On branch  : develop
Link       : https://github.com/latex3/pdfresources/commit/5c40f6fe7d00ab84aca695a7e499f555e727addd

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

commit 5c40f6fe7d00ab84aca695a7e499f555e727addd
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date:   Sun Jul 31 12:32:41 2022 +0200

    xcolor patch moved to xcolor


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

5c40f6fe7d00ab84aca695a7e499f555e727addd
 firstaid/xcolor-patches-tmp-ltx.sty | 84 -------------------------------------
 pdfmanagement-firstaid.dtx          |  5 +--
 2 files changed, 2 insertions(+), 87 deletions(-)

diff --git a/firstaid/xcolor-patches-tmp-ltx.sty b/firstaid/xcolor-patches-tmp-ltx.sty
index ad78d86..57dd795 100644
--- a/firstaid/xcolor-patches-tmp-ltx.sty
+++ b/firstaid/xcolor-patches-tmp-ltx.sty
@@ -1,7 +1,6 @@
 %% LaTeX2e file `xcolor-patches.sty'
 %%
 \ProvidesPackage{xcolor-patches-tmp-ltx}[2022-07-08 v0.95q patch xcolor for l3color]
-\@ifundefined{color_set:nn}{\RequirePackage{l3color}}{}
 
 \ExplSyntaxOn
 % #1 is the color name
@@ -55,88 +54,5 @@
        { \color_set:ne {#1}{\l__pdfmanagement_firstaid_tmpa_tl} }
    }
 \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 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
-  \ifnum\@@tmp=\@ne\ifx\@@mod\@empty
-    \ifx\@@cls\@empty
-      \XC@@tsttrue
-    \else
-      \edef\@@tmp
-       {\expandafter\expandafter\expandafter\@secondoffive
-         \csname\string\color@\@@clr\endcsname}%
-      \ifx\@@cls\@@tmp\XC@@tsttrue\fi
-    \fi
-  \fi\fi
-  \ifXC@@tst
-    \XC at logdef\@@nam\XC at c@l at rlet\@@nam\@@clr
-  \else
-    \extractcolorspec\@@clr\@@clr
-    \ifx\@@mod\@empty\else
-      \expandafter\convertcolorspec\@@clr\@@mod\@@clr
-      \edef\@@clr{{\@@mod}{\@@clr}}\fi
-    \edef\@@tmp{\noexpand\XC at definecolor[\@@cls]{\@@nam}\@@clr}%
-  \fi
-  \expandafter\endgroup\@@tmp\xglobal at stop}
-
-%\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 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}%
-   {\ifx\@@mod\XC at mod@named
-      \XC at c@l at rlet\@@nam\@@clr
-    \else
-      \ifx\@@cls\XC at mod@ps
-        \edef\@@drv{\@@mod\space\@@clr}\def\@@hue{0}%
-        \edef\@@clr{\@nameuse{XC at clr@\@@mod @white}}%
-      \else
-        \ifconvertcolorsD
-          \let\@@tmp\@@mod\XC at sdef\@@mod{\XC at tgt@mod\@@tmp}%
-          \convertcolorspec\@@tmp\@@clr\@@mod\@@clr
-        \fi
-        \XC at coremodel\@@mod\@@clr
-        \csname color@\@@mod\expandafter\endcsname
-          \expandafter\@@drv\expandafter{\@@clr}%
-        \ifcase\XC@@xcp@
-          \immediate\write\XC@@xcp{/\colornameprefix\@@nam{\expandafter
-            \XC at strip@comma\@@clr,,\@nnil}XC\@@mod}%
-          \let\@@cls\XC at mod@named
-        \fi
-        \ifx\@@cls\@empty\else
-          \let\@@tmp\@@cls
-          \@nameuse{define at color@\@@cls}\@@nam\@@drv
-          \csname color@\@@tmp\expandafter\endcsname
-            \expandafter\@@drv\expandafter{\@@nam}%
-        \fi
-      \fi
-      \toks@\expandafter{\@@drv}%
-      \edef\@@tmp
-       {\ifglobalcolors\global\else\xglobal@\fi
-        \noexpand\@namedef{\string\color@\@@nam}%
-         {\noexpand\xcolor@{\@@cls}{\the\toks@}{\@@mod}{\@@clr}}}%
-    \fi}%
-  \expandafter\endgroup\@@tmp\xglobal at stop}
-
-%re-predefine the colors
-\definecolorset{rgb/hsb/cmyk/gray}{}{}%
- {brown,.75,.5,.25/.083333,.66667,.75/0,.25,.5,.25/.5475;%
-  lime,.75,1,0/.20833,1,1/.25,0,1,0/.815;%
-  orange,1,.5,0/.083333,1,1/0,.5,1,0/.595;%
-  pink,1,.75,.75/0,.25,1/0,.25,.25,0/.825;%
-  purple,.75,0,.25/.94444,1,.75/0,.75,.5,.25/.2525;%
-  teal,0,.5,.5/.5,1,.5/.5,0,0,.5/.35;%
-  violet,.5,0,.5/.83333,1,.5/0,.5,0,.5/.205}%
-\definecolorset{cmyk/rgb/hsb/gray}{}{}%
- {olive,0,0,1,.5/.5,.5,0/.16667,1,.5/.39}
-\definecolorset{gray/rgb/hsb/cmyk}{}{}%
- {darkgray,.25/.25,.25,.25/0,0,.25/0,0,0,.75;%
-  gray,.5/.5,.5,.5/0,0,.5/0,0,0,.5;%
-  lightgray,.75/.75,.75,.75/0,0,.75/0,0,0,.25}
 
 \endinput
diff --git a/pdfmanagement-firstaid.dtx b/pdfmanagement-firstaid.dtx
index 266805f..9a374c4 100644
--- a/pdfmanagement-firstaid.dtx
+++ b/pdfmanagement-firstaid.dtx
@@ -173,10 +173,9 @@
   {
     \AddToHook
        {
-         package/xcolor/after
+         package/xcolor/before
        }
-       {\RequirePackage{xcolor-patches-tmp-ltx}\XC@@@@names}
-    \DeclareHookRule{package/xcolor/after}{pdfmanagement-firstaid}{before}{xcolor}
+       {\RequirePackage{xcolor-patches-tmp-ltx}}    
   }
 %    \end{macrocode}
 % \subsection{\pkg{pgf}}