[latex3-commits] [git/LaTeX3-latex3-latex3] fallback-model: Remove \@@_model_init:nnn (22ccce6a5)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : fallback-model
Link       : https://github.com/latex3/latex3/commit/22ccce6a51f581e05cc82ce5f2c096484cd21d17

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

commit 22ccce6a51f581e05cc82ce5f2c096484cd21d17
Author: Marcel Fabian Krüger <tex at 2krueger.de>
Date:   Tue Oct 26 15:02:32 2021 +0200

    Remove \@@_model_init:nnn


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

22ccce6a51f581e05cc82ce5f2c096484cd21d17
 l3kernel/l3color.dtx | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/l3kernel/l3color.dtx b/l3kernel/l3color.dtx
index b9b296be7..d532dd683 100644
--- a/l3kernel/l3color.dtx
+++ b/l3kernel/l3color.dtx
@@ -1833,16 +1833,6 @@
     \use:c { @@_model_ #1 _white: }
   }
 \cs_generate_variant:Nn \@@_model_init:nnnnn { nnnxx }
-\cs_new_protected:Npn \@@_model_init:nnn #1#2#3
-  {
-    \@@_model_init:nnnxx { #1 } { #2 } { #3 }
-      {
-        1 \prg_replicate:nn { #2 - 1 } { ~ 1 }
-      }
-      {
-        0 \prg_replicate:nn { #2 - 1 } { ~ 0 }
-      }
-  }
 %    \end{macrocode}
 % \end{macro}
 %
@@ -1925,7 +1915,7 @@
 \cs_new_protected:Npn \@@_model_separation:w
   #1 , #2 , #3 , #4 , #5 \s_@@_stop #6#7#8
   {
-    \@@_model_init:nnn {#6} { 1 } { separation }
+    \@@_model_init:nnnnn {#6} { 1 } { separation } { 1 } { 0 }
     \cs_new_eq:cN { @@_parse_mix_ #6 :nw } \@@_parse_mix_gray:nw
     \cs_new:cpn { @@_parse_model_ #6 :w } ##1 , ##2 \s_@@_stop
       { {#6} { \@@_parse_number:n {##1} } }
@@ -2166,7 +2156,13 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_model_devicen:nnnn #1#2#3#4
   {
-    \@@_model_init:nnn {#4} {#1} { devicen }
+    \@@_model_init:nnnxx {#4} {#1} { devicen }
+      {
+        1 \prg_replicate:nn { #1 - 1 } { ~ 1 }
+      }
+      {
+        0 \prg_replicate:nn { #1 - 1 } { ~ 0 }
+      }
     \cs_if_exist_use:cF { @@_model_devicen_parse_ #1 :nn }
       { \@@_model_devicen_parse_generic:nn }
         {#4} {#1}