Move l3color to l3kernel

This shows up in the coffin test as we now can always
color handles.

l3experimental/CHANGELOG.md

@@ -7,6 +7,9 @@ this project uses date-based 'snapshot' version identifiers.
 
 ## [Unreleased]
 
+### Removed
+- `l3color`: moved to `l3kernel`
+
 ## [2021-02-06]
 
 ### Changed

l3experimental/README.md

@@ -22,7 +22,6 @@ updated at the same time.
 Currently included in the CTAN release of l3experimental are the following
 bundles:
 * `l3benchmark`
-* `l3color`
 * `l3draw`
 * `l3graphics`
 * `l3pdf`
@@ -36,15 +35,6 @@ bundles:
 
 This module provides support for benchmarking the performance of code.
 
-
-`l3color`
----------
-
-This module provides support for setting colors using a range of color models.
-It also allows the construction of 'color expressions', in which multiple colors
-are mixed together at the macro level. There is also support for spot colors:
-the latter is highly experimental.
-
 `l3draw`
 --------
 
@@ -127,7 +117,7 @@ The LaTeX Project
 ------------------
 
 Development of LaTeX3 is carried out by
-[The LaTeX Project](https://www.latex-project.org/latex3/). 
+[The LaTeX Project](https://www.latex-project.org/latex3/).
 
 The development team can be contacted
 by e-mail: <latex-team@latex-project.org>; for general LaTeX3 discussion

l3experimental/build.lua

@@ -30,7 +30,6 @@ The present re­lease in­cludes:
 - `l3bench­mark` for mea­sur­ing the time taken by TeX to run cer­tain code;
 - `l3c­ctab`, sup­port for sav­ing and restor­ing cat­e­gory codes en masse in a
   ta­ble;
-- `l3­color`, sup­port for set­ting col­ors us­ing a range of color mod­els;
 - `l3­draw`, a code-level in­ter­face for con­struct­ing draw­ings;
 - `l3­graph­ics`, an in­ter­faces for the in­clu­sion of graph­ics files;
 - `l3pdf`, sup­port for core PDF con­cepts like com­pres­sion, ob­jects, PDF

l3experimental/l3draw/build.lua

@@ -12,9 +12,5 @@ maindir = "../.."
 
 typesetfiles = {"l3draw.dtx", "l3draw-code.tex"}
 
--- Need color support
-checkdeps = {maindir .. "/l3backend", maindir .. "/l3kernel", maindir .. "/l3experimental/l3color"}
-typesetdeps = checkdeps
-
 -- Load the common build code
 dofile(maindir .. "/build-config.lua")

l3experimental/l3draw/l3draw.dtx

@@ -231,7 +231,7 @@
 %   \begin{syntax}
 %     \cs{draw_linewidth:n} \Arg{width}
 %   \end{syntax}
-%   Sets the width to be used for stroking to the \meta{width} (an 
+%   Sets the width to be used for stroking to the \meta{width} (an
 %   \meta{fp expr}).
 % \end{function}
 %
@@ -268,7 +268,7 @@
 %     \draw_end:
 %   \end{demo}
 %   Setting an empty pattern will produce a solid line.
-%   
+%
 %   Note the \meta{pattern} interface here is different from that in \pkg{pgf}:
 %   the list is comma-separated not given in brace groups.
 % \end{function}
@@ -410,7 +410,7 @@
 %   Gives the co-ordinates of the point at \meta{angle} (an \meta{fp expr} in
 %   \emph{degrees}) and \meta{radius}. The three-argument version accepts
 %   two radii of different lengths.
-%   
+%
 %   Note the interface here is somewhat different from that in \pkg{pgf}:
 %   the one- and two-radii versions in \pkg{l3draw} use separate functions,
 %   whilst in \pkg{pgf} they use the same function and a keyword.
@@ -470,7 +470,7 @@
 %   \emph{degrees}) and \meta{radius}, relative to the prevailing
 %   $x$- and $y$-vectors. The three-argument version accepts two radii of
 %   different lengths.
-%   
+%
 %   Note the interface here is somewhat different from that in \pkg{pgf}:
 %   the one- and two-radii versions in \pkg{l3draw} use separate functions,
 %   whilst in \pkg{pgf} they use the same function and a keyword.
@@ -795,7 +795,7 @@
 %   \begin{syntax}
 %     \cs{draw_path_circle:nn} \Arg{center} \Arg{radius}
 %   \end{syntax}
-%   Appends a circle of \meta{radius} at \meta{center} to the current path. 
+%   Appends a circle of \meta{radius} at \meta{center} to the current path.
 %   This is a shortcut for \cs{draw_path_ellipse:nnn}.
 % \end{function}
 %
@@ -1140,10 +1140,6 @@
   {L3 Experimental core drawing support}
 %    \end{macrocode}
 %
-%    \begin{macrocode}
-\RequirePackage { l3color }
-%    \end{macrocode}
-%
 % \subsection{Internal auxiliaries}
 %
 % \begin{variable}{\s_@@_mark,\s_@@_stop}

l3experimental/l3draw/testfiles/m3draw000.tlg

@@ -3,11 +3,6 @@ Don't change this file in any respect.
 Author: Joseph Wright
 (l3draw.sty
 Package: l3draw ....-..-.. L3 Experimental core drawing support
-(l3color.sty
-Package: l3color ....-..-.. L3 Experimental color support
-\l__color_internal_int=\count...
-\g__color_model_int=\count...
-)
 \l__draw_tmp_box=\box...
 \g__draw_path_lastx_dim=\dimen...
 \g__draw_path_lasty_dim=\dimen...

l3kernel/CHANGELOG.md

@@ -7,6 +7,9 @@ this project uses date-based 'snapshot' version identifiers.
 
 ## [Unreleased]
 
+### Added
+- `l3color`: Moved from `l3experimental`
+
 ### Changed
 - Re-ordered `interface3` documentation
 

l3kernel/doc/source3body.tex

@@ -586,7 +586,7 @@ \part{Typesetting}
 
 \DocInput{l3box.dtx}
 \DocInput{l3coffins.dtx}
-\DocInput{l3color-base.dtx}
+\DocInput{l3color.dtx}
 
 \part{Additions and removals}
 

l3kernel/l3.ins

@@ -99,7 +99,7 @@ and all files in that bundle must be distributed together.
         \from{l3tl-analysis.dtx}{package}
         \from{l3regex.dtx}      {package}
         \from{l3box.dtx}        {package}
-        \from{l3color-base.dtx} {package}
+        \from{l3color.dtx}      {package}
         \from{l3coffins.dtx}    {package}
         \from{l3luatex.dtx}     {package,tex}
         \from{l3unicode.dtx}    {package}

l3kernel/l3coffins.dtx

@@ -2247,34 +2247,6 @@
 %    \end{macrocode}
 % \end{variable}
 %
-% \begin{macro}{\@@_color:n}
-%   Calls \tn{color}, and otherwise does nothing if \tn{color} is not defined.
-%   As this is relatively rarely used, we have it self-define rather than delay
-%   using a hook.
-%    \begin{macrocode}
-\cs_new_protected:Npn \@@_color:n #1 {#1}
-\bool_lazy_and:nnT
-  { \cs_if_exist_p:N \fmtname }
-  { \str_if_eq_p:Vn \fmtname { LaTeX2e } }
-  {
-    \cs_gset_protected:Npn \@@_color:n
-      {
-        \cs_gset_protected:Npx \@@_color:n
-          {
-            \cs_if_exist:NTF \color_select:n
-              { \color_select:n }
-              {
-                \cs_if_exist:NTF \color
-                  { \exp_not:N \color }
-                  { \exp_not:N \use_none:n }
-              }
-          }
-        \@@_color:n
-      }
-  }
-%    \end{macrocode}
-% \end{macro}
-%
 % \begin{macro}{\@@_rule:nn}
 %   Abstract out creation of rules here until there is a higher-level interface.
 %    \begin{macrocode}
@@ -2298,14 +2270,14 @@
   {
     \hcoffin_set:Nn \l_@@_display_pole_coffin
       {
-        \@@_color:n {#4}
+        \color_select:n {#4}
         \@@_rule:nn { 1pt } { 1pt }
       }
     \@@_attach_mark:NnnNnnnn #1 {#2} {#3}
       \l_@@_display_pole_coffin { hc } { vc } { 0pt } { 0pt }
     \hcoffin_set:Nn \l_@@_display_coord_coffin
       {
-        \@@_color:n {#4}
+        \color_select:n {#4}
         \l_@@_display_font_tl
         ( \tl_to_str:n { #2 , #3 } )
       }
@@ -2357,7 +2329,7 @@
   {
     \hcoffin_set:Nn \l_@@_display_pole_coffin
       {
-        \@@_color:n {#2}
+        \color_select:n {#2}
         \@@_rule:nn { 1pt } { 1pt }
       }
     \prop_set_eq:Nc \l_@@_display_poles_prop
@@ -2398,7 +2370,7 @@
               { 0pt } { 0pt }
             \hcoffin_set:Nn \l_@@_display_coord_coffin
               {
-                \@@_color:n {#6}
+                \color_select:n {#6}
                 \l_@@_display_font_tl
                 ( \tl_to_str:n { #1 , ##1 } )
               }