[latex3-commits] [git/LaTeX3-latex3-latex3] main: Correct dvips DeviceN init. (5390c9d62)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : main
Link       : https://github.com/latex3/latex3/commit/5390c9d62eaf08eb7ce6a9fbea601a64717833e4

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

commit 5390c9d62eaf08eb7ce6a9fbea601a64717833e4
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Mon Oct 11 23:24:04 2021 +0100

    Correct dvips DeviceN init.


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

5390c9d62eaf08eb7ce6a9fbea601a64717833e4
 l3backend/CHANGELOG.md        |  3 +++
 l3backend/l3backend-color.dtx | 23 +++++++++++++----------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/l3backend/CHANGELOG.md b/l3backend/CHANGELOG.md
index 4a7347647..bc3c4a17e 100644
--- a/l3backend/CHANGELOG.md
+++ b/l3backend/CHANGELOG.md
@@ -6,6 +6,9 @@ this project uses date-based 'snapshot' version identifiers.
 
 ## [Unreleased]
 
+### Fixed
+- Issues with creating DeviceN color spaces
+
 ## [2021-08-04]
 
 ## Changed
diff --git a/l3backend/l3backend-color.dtx b/l3backend/l3backend-color.dtx
index 2d33f8ed4..3a1539328 100644
--- a/l3backend/l3backend-color.dtx
+++ b/l3backend/l3backend-color.dtx
@@ -500,9 +500,10 @@
 % \begin{macro}
 %   {
 %     \@@_backend_separation_init:nnnnn,
-%     \@@_backend_separation_init:nxxnn,
-%     \@@_backend_separation_init_aux:nnnnn
+%     \@@_backend_separation_init:nxxnn
 %   }
+% \begin{macro}
+%   {\@@_backend_separation_init_aux:nnnnnn}
 % \begin{macro}[EXP]
 %   {
 %     \@@_backend_separation_init_/DeviceCMYK:nnn ,
@@ -528,29 +529,30 @@
   {
     \bool_if:NT \g__kernel_backend_header_bool
       {
-        \__kernel_backend_first_shipout:n
+        \exp_args:Nx \__kernel_backend_first_shipout:n
           {
-            \exp_not:N \@@_backend_separation_init_aux:nnnnn
+            \exp_not:N \@@_backend_separation_init_aux:nnnnnn
+              { \exp_not:N \int_use:N \g_@@_model_int }
               {#1} {#2} {#3} {#4} {#5}
           }
       }
   }
 \cs_generate_variant:Nn \@@_backend_separation_init:nnnnn { nxx }
-\cs_new_protected:Npn \@@_backend_separation_init_aux:nnnnn #1#2#3#4#5
+\cs_new_protected:Npn \@@_backend_separation_init_aux:nnnnnn #1#2#3#4#5#6
   {
     \__kernel_backend_literal:e
       {
         !
         TeXDict ~ begin ~
-        /color \int_use:N \g_@@_model_int
+        /color #1
           {
             [ ~
-              /Separation ~ ( \str_convert_pdfname:n {#1} ) ~
-              [ ~ #2 ~ ] ~
+              /Separation ~ ( \str_convert_pdfname:n {#2} ) ~
+              [ ~ #3 ~ ] ~
                 {
-                  \cs_if_exist_use:cF { @@_backend_separation_init_ #2 :nnn }
+                  \cs_if_exist_use:cF { @@_backend_separation_init_ #3 :nnn }
                     { \@@_backend_separation_init:nnn }
-                      {#3} {#4} {#5}
+                      {#4} {#5} {#6}
                 }
             ] ~ setcolorspace
           } ~ def ~
@@ -720,6 +722,7 @@
 % \end{macro}
 % \end{macro}
 % \end{macro}
+% \end{macro}
 %
 % \begin{macro}{\@@_backend_devicen_init:nnn}
 %   Trivial as almost all of the work occurs in the shared code.