[latex3-commits] [git/LaTeX3-latex3-latex3] icc2: Support multiple separations for dvips (a740dd779)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : icc2
Link       : https://github.com/latex3/latex3/commit/a740dd7795808c1f9b985fc49eeb55f224ff8eb8

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

commit a740dd7795808c1f9b985fc49eeb55f224ff8eb8
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Thu Aug 12 11:18:03 2021 +0100

    Support multiple separations for dvips
    
    We need to expand the ref. number in the right place.


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

a740dd7795808c1f9b985fc49eeb55f224ff8eb8
 l3backend/CHANGELOG.md        |  3 +++
 l3backend/l3backend-color.dtx | 31 ++++++++++++++++++++++---------
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/l3backend/CHANGELOG.md b/l3backend/CHANGELOG.md
index f787acd70..1b9d1924b 100644
--- a/l3backend/CHANGELOG.md
+++ b/l3backend/CHANGELOG.md
@@ -6,6 +6,9 @@ this project uses date-based 'snapshot' version identifiers.
 
 ## [Unreleased]
 
+### Fixed
+- Support for multiple separations with `dvips`
+
 ## [2021-02-18]
 
 ### Changed
diff --git a/l3backend/l3backend-color.dtx b/l3backend/l3backend-color.dtx
index 8b35dd8a1..9248cf2e4 100644
--- a/l3backend/l3backend-color.dtx
+++ b/l3backend/l3backend-color.dtx
@@ -490,6 +490,11 @@
 %     \@@_backend_separation_init:nxxnn,
 %     \@@_backend_separation_init_aux:nnnnn
 %   }
+% \begin{macro}
+%   {
+%     \@@_backend_separation_init:nnnnnn    ,
+%     \@@_backend_separation_init_aux:nnnnnn
+%   }
 % \begin{macro}[EXP]
 %   {
 %     \@@_backend_separation_init_/DeviceCMYK:nnn ,
@@ -515,23 +520,30 @@
   {
     \bool_if:NT \g__kernel_backend_header_bool
       {
-        \cs_if_exist:NTF \AtBeginDvi
-          { \exp_not:N \AtBeginDvi }
-          { \use:n }
-            {
-              \exp_not:N \@@_backend_separation_init_aux:nnnnn
-                {#1} {#2} {#3} {#4} {#5}
-            }
+        \exp_not:N \exp_args:Ne
+          \exp_not:N \@@_backend_separation_init: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:Npx \@@_backend_separation_init:nnnnnn #1#2#3#4#5#6
+  {
+    \cs_if_exist:NTF \AtBeginDvi
+      { \exp_not:N \AtBeginDvi }
+      { \use:n }
+        {
+          \exp_not:N \@@_backend_separation_init_aux:nnnnnn
+            {#2} {#3} {#4} {#5} {#6} {#1}
+        }
+  }
+\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 #6
           {
             [ ~
               /Separation ~ ( \str_convert_pdfname:n {#1} ) ~
@@ -709,6 +721,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.