[latex3-commits] [git/LaTeX3-latex3-latex3] master: Use correct number for color stack init. in (x)dvidpfmx (e1fb4d19c)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : master
Link       : https://github.com/latex3/latex3/commit/e1fb4d19c853e5e0d5155beb3e01b4ee872fdacd

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

commit e1fb4d19c853e5e0d5155beb3e01b4ee872fdacd
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Tue Mar 2 10:04:45 2021 +0000

    Use correct number for color stack init. in (x)dvidpfmx


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

e1fb4d19c853e5e0d5155beb3e01b4ee872fdacd
 l3backend/CHANGELOG.md        |  3 +++
 l3backend/l3backend-color.dtx | 21 ++++++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/l3backend/CHANGELOG.md b/l3backend/CHANGELOG.md
index c3993b30f..e2fdfc51b 100644
--- a/l3backend/CHANGELOG.md
+++ b/l3backend/CHANGELOG.md
@@ -10,6 +10,9 @@ this project uses date-based 'snapshot' version identifiers.
 - Drop 'correction' for link placement in `(x)dvidpfmx`: no longer required
 - Define `\main at pdfcolorstack` for `(x)dvipdfmx` if it does not exist
 
+### Fixed
+- Initialisation of color stacks for `(x)dvipdfmx`
+
 ## [2021-02-18]
 
 ### Changed
diff --git a/l3backend/l3backend-color.dtx b/l3backend/l3backend-color.dtx
index 85667caa0..f67bf440d 100644
--- a/l3backend/l3backend-color.dtx
+++ b/l3backend/l3backend-color.dtx
@@ -211,17 +211,20 @@
       {
         \int_gincr:N \exp_not:N \g_@@_backend_stack_int
         \int_const:Nn #1 { \exp_not:N \g_@@_backend_stack_int }
-        \cs_if_exist:NTF \AtBeginDvi
-          { \exp_not:N \AtBeginDvi }
-          { \exp_not:N \use:n }
+        \use:x
           {
-            \__kernel_backend_literal:x
+            \cs_if_exist:NTF \AtBeginDvi
+              { \exp_not:N \AtBeginDvi }
+              { \exp_not:N \use:n }
               {
-                pdfcolorstackinit ~
-                \exp_not:N \int_use:N \exp_not:N \g_@@_backend_stack_int
-                \c_space_tl
-                \exp_not:N \tl_if_blank:nF {#2} { #2 ~ }
-                (#3)
+                \__kernel_backend_literal:n
+                  {
+                    pdfcolorstackinit ~
+                    \exp_not:N \int_use:N \exp_not:N \g_@@_backend_stack_int
+                    \c_space_tl
+                    \exp_not:N \tl_if_blank:nF {#2} { #2 ~ }
+                    (#3)
+                  }
               }
           }
       }