[latex3-commits] [git/LaTeX3-latex3-latex3] deviceNrgb: Fix tint transforms and RGB DeviceN conversions (5e525e7f1)

[Marcel Fabian Krüger]

Repository : https://github.com/latex3/latex3
On branch  : deviceNrgb
Link       : https://github.com/latex3/latex3/commit/5e525e7f1ea53d6752b52368a2c0abb140425b04

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

commit 5e525e7f1ea53d6752b52368a2c0abb140425b04
Author: Marcel Fabian Krüger <tex at 2krueger.de>
Date:   Fri Oct 22 09:31:04 2021 +0200

    Fix tint transforms and RGB DeviceN conversions


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

5e525e7f1ea53d6752b52368a2c0abb140425b04
 l3kernel/l3color.dtx              | 5 +++--
 l3kernel/testfiles/m3color002.tlg | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/l3kernel/l3color.dtx b/l3kernel/l3color.dtx
index 36517a45d..c90b1efa9 100644
--- a/l3kernel/l3color.dtx
+++ b/l3kernel/l3color.dtx
@@ -2314,7 +2314,7 @@
         \prop_get:NnN \g_@@_alternative_values_prop {##1}
           \l_@@_value_tl
         \exp_after:wN \@@_model_devicen_transform:w
-          \l_@@_value_tl , 0 , 0 , 0 \s_@@_stop {#1} {#2}
+          \l_@@_value_tl , 0 , 0 , 0 , \s_@@_stop {#1} {#2}
       }
     \tl_put_right:Nx \l_@@_internal_tl
       {
@@ -2406,12 +2406,13 @@
   }
 \cs_new_protected:Npn \@@_model_devicen_convert:nnnn #1#2#3#4
   {
-    \cs_new:cpx { @@_convert_ #1 _ #2 :w } ##1 \s_@@_stop
+    \cs_new:cpx { @@_convert_ #1 _ #2 :w } ##1 0 ~ 0 ~ 0 \s_@@_stop
       {
         \exp_not:c { @@_convert_devicen_ #2 : \prg_replicate:nn {#3} { n } w }
           \prg_replicate:nn {#3} { { 1 } }
           ##1 \exp_not:N \s_@@_mark
           \clist_map_function:nN {#4} \@@_model_devicen_convert:n
+          {}
           \exp_not:N \s_@@_stop
       }
   }
diff --git a/l3kernel/testfiles/m3color002.tlg b/l3kernel/testfiles/m3color002.tlg
index 62652ebb0..0111657d8 100644
--- a/l3kernel/testfiles/m3color002.tlg
+++ b/l3kernel/testfiles/m3color002.tlg
@@ -266,7 +266,7 @@ l. ...  }
 > \l_tmpa_tl=FFFFFF.
 <recently read> }
 l. ...  }
-> \l_tmpa_tl=57B285.
+> \l_tmpa_tl=035F31.
 <recently read> }
 l. ...  }
 > \l_tmpa_tl=0.48 0.12 0.3 0.18.
@@ -275,7 +275,7 @@ l. ...  }
 > \l_tmpa_tl=0 0 0 1.
 <recently read> }
 l. ...  }
-> \l_tmpa_tl=0.48 0.12 0.3 0.18.
+> \l_tmpa_tl=0.48 0.12 0.3 0.508.
 <recently read> }
 l. ...  }
 > \l_tmpa_tl=0.34 0.7 0.52.
@@ -284,7 +284,7 @@ l. ...  }
 > \l_tmpa_tl=1 1 1.
 <recently read> }
 l. ...  }
-> \l_tmpa_tl=0.34 0.7 0.52.
+> \l_tmpa_tl=0.012 0.372 0.192.
 <recently read> }
 l. ...  }
 ============================================================