[latex3-commits] [git/LaTeX3-latex3-latex3] master, pdfescape: Extend l3color to allow for 'user' models (61fdb39e5)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branches: master,pdfescape
Link       : https://github.com/latex3/latex3/commit/61fdb39e598ac068d7cc0af8fd78b2fd061d5b2f

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

commit 61fdb39e598ac068d7cc0af8fd78b2fd061d5b2f
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Wed May 27 13:50:08 2020 +0100

    Extend l3color to allow for 'user' models
    
    Purely internal at this stage: it's adding additional
    models that will show up.


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

61fdb39e598ac068d7cc0af8fd78b2fd061d5b2f
 l3experimental/l3color/l3color.dtx | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/l3experimental/l3color/l3color.dtx b/l3experimental/l3color/l3color.dtx
index 9438e8110..6a6e65ffc 100644
--- a/l3experimental/l3color/l3color.dtx
+++ b/l3experimental/l3color/l3color.dtx
@@ -643,22 +643,28 @@
 % \begin{macro}[EXP]{\@@_parse_spot_aux:w}
 %   Turn the input into internal form, also tidying up the number quickly.
 %    \begin{macrocode}
-\cs_new:Npn \@@_parse_model_gray:w #1 , #2 \s_@@_stop { \@@_parse_number:n {#1} }
+\cs_new:Npn \@@_parse_model_gray:w #1 , #2 \s_@@_stop
+  { gray ~ \@@_parse_number:n {#1} }
 \cs_new:Npn \@@_parse_model_rgb:w #1 , #2 , #3 , #4 \s_@@_stop
   {
+    rgb ~
     \@@_parse_number:n {#1} ~
     \@@_parse_number:n {#2} ~
     \@@_parse_number:n {#3}
   }
 \cs_new:Npn \@@_parse_model_cmyk:w #1 , #2 , #3 , #4 , #5 \s_@@_stop
   {
+    cmyk ~
     \@@_parse_number:n {#1} ~
     \@@_parse_number:n {#2} ~
     \@@_parse_number:n {#3} ~
     \@@_parse_number:n {#4}
   }
 \cs_new:Npn \@@_parse_model_spot:w #1 , #2 \s_@@_stop
-  { \@@_parse_spot_aux:w #1 ! 100 ! \s_@@_stop }
+  {
+    spot ~
+    \@@_parse_spot_aux:w #1 ! 100 ! \s_@@_stop
+  }
 \cs_new:Npn \@@_parse_spot_aux:w #1 ! #2 ! #3 \s_@@_stop
   { #1 ~ \fp_eval:n { #2 / 100 } }
 \cs_new:Npn \@@_parse_number:n #1
@@ -750,7 +756,7 @@
     \cs_if_exist:cTF { @@_parse_model_ #1 :w }
       {
         \tl_set:Nx #3
-          { #1 ~ \use:c {  @@_parse_model_ #1 :w } #2 , 0 , 0 , 0 , 0 \s_@@_stop }
+          { \use:c {  @@_parse_model_ #1 :w } #2 , 0 , 0 , 0 , 0 \s_@@_stop }
         \@@_check_model:N #3
       }
       {