[latex3-commits] [git/LaTeX3-latex3-latex3] luacolor: Split general/fill/stroke/math backend color reset (16fccdfe1)

Joseph Wright joseph.wright at morningstar2.co.uk
Sun Feb 19 09:11:59 CET 2023


Repository : https://github.com/latex3/latex3
On branch  : luacolor
Link       : https://github.com/latex3/latex3/commit/16fccdfe17c3de90d199d4d9f65af0263d845e1c

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

commit 16fccdfe17c3de90d199d4d9f65af0263d845e1c
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Sun Feb 19 07:58:23 2023 +0000

    Split general/fill/stroke/math backend color reset
    
    This allows proper re-definition for luacolor,
    avoids inserting unneeded tokes after groups,
    and deals with the fact that otherwise color
    does not reset correct in math.


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

16fccdfe17c3de90d199d4d9f65af0263d845e1c
 l3backend/l3backend-color.dtx                    | 33 ++++++++--
 l3kernel/l3color.dtx                             |  6 +-
 l3kernel/testfiles-backend/m3color004.luatex.tlg | 84 +++++++++++++++---------
 l3kernel/testfiles/m3expl001.luatex.tlg          |  2 +
 l3kernel/testfiles/m3expl001.ptex.tlg            |  2 +
 l3kernel/testfiles/m3expl001.tlg                 |  2 +
 l3kernel/testfiles/m3expl001.uptex.tlg           |  2 +
 l3kernel/testfiles/m3expl001.xetex.tlg           |  2 +
 l3kernel/testfiles/m3expl003.luatex.tlg          |  2 +
 l3kernel/testfiles/m3expl003.ptex.tlg            |  2 +
 l3kernel/testfiles/m3expl003.tlg                 |  2 +
 l3kernel/testfiles/m3expl003.uptex.tlg           |  2 +
 l3kernel/testfiles/m3expl003.xetex.tlg           |  2 +
 13 files changed, 105 insertions(+), 38 deletions(-)

diff --git a/l3backend/l3backend-color.dtx b/l3backend/l3backend-color.dtx
index 9c3354bfe..8df92aa45 100644
--- a/l3backend/l3backend-color.dtx
+++ b/l3backend/l3backend-color.dtx
@@ -247,7 +247,7 @@
 %     \@@_backend_select_rgb:n   ,
 %     \@@_backend_select:n
 %   }
-% \begin{macro}{\@@_backend_reset:}
+% \begin{macro}{\@@_backend_reset:, \@@_backend_reset_aux:}
 % \begin{macro}{color.sc}
 %    Push the data to the stack. In the case of \texttt{dvips} also saves the
 %    drawing color in raw PostScript. The |spot| model is for handling data
@@ -269,6 +269,8 @@
 %</dvips>
   }
 \cs_new_protected:Npn \@@_backend_reset:
+  { \group_insert_after:N \@@_backend_reset_aux: }
+\cs_new_protected:Npn \@@_backend_reset_aux:
   { \__kernel_backend_literal:n { color~pop } }
 %    \end{macrocode}
 % \end{macro}
@@ -299,7 +301,7 @@
 %     \@@_backend_select_rgb:n
 %   }
 % \begin{macro}{\@@_backend_select:nn}
-% \begin{macro}{\@@_backend_reset:}
+% \begin{macro}{\@@_backend_reset:, \@@_backend_reset_aux:}
 % \begin{macro}{\@@_backend_stack_push:nn}
 % \begin{macro}
 %   {
@@ -324,6 +326,8 @@
     \@@_backend_stack_push:nn \l_@@_backend_stack_int { #1 ~ #2 }
   }
 \cs_new_protected:Npn \@@_backend_reset:
+  { \group_insert_after:N \@@_backend_reset_aux: }
+\cs_new_protected:Npn \@@_backend_reset_aux:
   { \__kernel_color_backend_stack_pop:n \l_@@_backend_stack_int }
 \cs_new_eq:NN \@@_backend_stack_push:nn \__kernel_color_backend_stack_push:nn
 \cs_new_protected:Npn \@@_backend_stack_push:nnn #1#2#3
@@ -361,7 +365,7 @@
 %     \@@_backend_select_gray:n ,
 %     \@@_backend_select_rgb:n
 %   }
-% \begin{macro}{\@@_backend_reset:}
+% \begin{macro}{\@@_backend_reset:, \@@_backend_reset_aux:}
 %   Using the single stack is relatively easy as there is only one route.
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_backend_select:n #1
@@ -370,6 +374,8 @@
 \cs_new_eq:NN \@@_backend_select_gray:n \@@_backend_select:n
 \cs_new_eq:NN \@@_backend_select_rgb:n  \@@_backend_select:n
 \cs_new_protected:Npn \@@_backend_reset:
+  { \group_insert_after:N \@@_backend_reset_aux: }
+\cs_new_protected:Npn \@@_backend_reset_aux:
   { \__kernel_backend_literal:n { pdf : ec } }
 %    \end{macrocode}
 % \end{macro}
@@ -1148,8 +1154,8 @@
 %
 % \begin{macro}{\@@_backend_fill_reset:, \@@_backend_stroke_reset:}
 %    \begin{macrocode}
-\cs_new_protected:Npn \@@_backend_fill_reset: { \@@_backend_reset: }
-\cs_new_protected:Npn \@@_backend_stroke_reset: { \@@_backend_reset: }
+\cs_new_eq:NN \@@_backend_fill_reset: \@@_backend_reset:
+\cs_new_eq:NN \@@_backend_stroke_reset: \@@_backend_reset:
 %    \end{macrocode}
 % \end{macro}
 %
@@ -1352,6 +1358,16 @@
 %</dvisvgm>
 %    \end{macrocode}
 %
+% \subsection{Math color}
+%
+% \begin{macro}{\@@_backend_math_reset:}
+%   No grouping so no \cs{group_insert_after:N}: all the engines are the same
+%   initially here but we need an abstraction for \LuaTeX{}.
+%    \begin{macrocode}
+\cs_new_eq:NN \@@_backend_math_reset: \@@_backend_reset_aux:
+%    \end{macrocode}
+% \end{macro}
+%
 %    \begin{macrocode}
 %</package>
 %    \end{macrocode}
@@ -1720,12 +1736,19 @@ end,'global','protected')
 % \begin{macro}{\@@_backend_stack_push:nn}
 % \begin{macro}{\@@_backend_reset:}
 %   A simple reworking: we may need to check about transparency here.
+%   Math color has to be manually reset as there is no group to rely on:
+%   we know that the current color tracked at the macro level will be the
+%   one we need.
 %    \begin{macrocode}
 \cs_gset_protected:Npn \@@_backend_stack_push:nn #1#2
   {
     \lua_now:e { ltx.color.select(" \lua_escape:n {#2} ") }
   }
 \cs_gset_protected:Npn \@@_backend_reset: { }
+\cs_gset_protected:Npn \@@_backend_fill_reset: { }
+\cs_gset_protected:Npn \@@_backend_stroke_reset: { }
+\cs_gset_protected:Npn \@@_backend_math_reset:
+  { \@@_select:N \l_@@_current_tl }
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
diff --git a/l3kernel/l3color.dtx b/l3kernel/l3color.dtx
index 8bb2c0449..0555ae530 100644
--- a/l3kernel/l3color.dtx
+++ b/l3kernel/l3color.dtx
@@ -589,7 +589,7 @@
 \cs_new_protected:Npn \@@_select:N #1
   {
     \exp_after:wN \@@_select:nn #1
-    \group_insert_after:N \@@_backend_reset:
+    \@@_backend_reset:
   }
 \cs_new_protected:Npn \@@_select_math:N #1
   { \exp_after:wN \@@_select:nn #1 }
@@ -1622,8 +1622,8 @@
   }
 \cs_new_protected:Npn \@@_math_scan_end:
   {
-    \@@_backend_reset:
     \seq_gpop:NN \g_@@_math_seq \l_@@_current_tl
+    \@@_backend_math_reset:
   }
 %    \end{macrocode}
 % \end{macro}
@@ -1707,7 +1707,7 @@
 \cs_new_protected:Npn \@@_draw:nnn #1#2#3
   {
     \use:c { @@_backend_ #3 _ #1 :n } {#2}
-    \exp_args:Nc \group_insert_after:N { @@_backend_ #3 _ reset: }
+    \use:c { @@_backend_ #3 _reset: }
   }
 %    \end{macrocode}
 % \end{macro}
diff --git a/l3kernel/testfiles-backend/m3color004.luatex.tlg b/l3kernel/testfiles-backend/m3color004.luatex.tlg
index d602fcf89..4e816bcfa 100644
--- a/l3kernel/testfiles-backend/m3color004.luatex.tlg
+++ b/l3kernel/testfiles-backend/m3color004.luatex.tlg
@@ -167,12 +167,12 @@ Completed box being shipped out [1]
 ......\glue 0.0 plus 1.0fil minus 1.0fil
 .....\kern1.0 (font)
 ....\glue(\thinmuskip) 1.66663
-....\pdfcolorstack 0 set {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
 ....\OML/cmm/m/it/10 x
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\OT1/cmr/m/n/10 =
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\hbox(0.0+22.22246)x5.55557, shifted -13.61122, direction TLT
+.....\pdfcolorstack 0 set {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
 .....\OMX/cmex/m/n/10 Z
 ....\vbox(24.76135+0.0)x8.93057, shifted 9.11122, direction TLT
 .....\hbox(4.51111+0.0)x4.48613, shifted 4.44444, direction TLT
@@ -182,36 +182,37 @@ Completed box being shipped out [1]
 .....\hbox(4.51111+0.0)x4.48613, direction TLT
 ......\OT1/cmr/m/n/7 1
 ....\glue(\thinmuskip) 1.66663
-....\pdfcolorstack 0 set {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
 ....\OML/cmm/m/it/10 x
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\OT1/cmr/m/n/10 =
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\hbox(0.0+22.22246)x5.55557, shifted -13.61122, direction TLT
+.....\pdfcolorstack 0 set {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
 .....\OMX/cmex/m/n/10 Z
 ....\hbox(4.51111+0.0)x4.48613, shifted 9.11122, direction TLT
 .....\pdfcolorstack 0 set {0 g 0 G}
 .....\OT1/cmr/m/n/7 1
 ....\glue(\thinmuskip) 1.66663
-....\pdfcolorstack 0 set {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
 ....\OML/cmm/m/it/10 x
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\OT1/cmr/m/n/10 =
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\hbox(0.0+22.22246)x10.00002, shifted -13.61122, direction TLT
+.....\pdfcolorstack 0 set {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
 .....\OMX/cmex/m/n/10 Z
 ....\hbox(4.51111+0.0)x4.48613, shifted -11.13902, direction TLT
 .....\pdfcolorstack 0 set {0 g 0 G}
 .....\OT1/cmr/m/n/7 2
 ....\glue(\thinmuskip) 1.66663
-....\pdfcolorstack 0 set {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
 ....\OML/cmm/m/it/10 x
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\OT1/cmr/m/n/10 =
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\hbox(0.0+22.22246)x10.00002, shifted -13.61122, direction TLT
+.....\pdfcolorstack 0 set {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
 .....\OMX/cmex/m/n/10 Z
 ....\glue(\thinmuskip) 1.66663
+....\pdfcolorstack 0 set {0 g 0 G}
 ....\OML/cmm/m/it/10 x
 ...\penalty 0
 ...\glue(\belowdisplayshortskip) 7.0 plus 3.0 minus 4.0
@@ -277,7 +278,6 @@ Completed box being shipped out [1]
 ......\glue 0.0 plus 1.0fil minus 1.0fil
 .....\kern1.0 (font)
 ....\glue(\thinmuskip) 1.66663
-....\pdfcolorstack 0 set {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
 ....\OML/cmm/m/it/10 x
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\OT1/cmr/m/n/10 =
@@ -285,6 +285,7 @@ Completed box being shipped out [1]
 ....\vbox(13.61122+15.789)x10.00002, direction TLT
 .....\hbox(13.61122+8.61124)x10.00002, direction TLT
 ......\hbox(0.0+22.22246)x10.00002, shifted -13.61122, direction TLT
+.......\pdfcolorstack 0 set {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
 .......\OMX/cmex/m/n/10 Z
 .....\kern1.66666 (font)
 .....\hbox(4.51111+0.0)x10.00002, glue set 3.00694fil, shifted -2.22223, direction TLT
@@ -294,7 +295,6 @@ Completed box being shipped out [1]
 ......\glue 0.0 plus 1.0fil minus 1.0fil
 .....\kern1.0 (font)
 ....\glue(\thinmuskip) 1.66663
-....\pdfcolorstack 0 set {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
 ....\OML/cmm/m/it/10 x
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\OT1/cmr/m/n/10 =
@@ -303,7 +303,6 @@ Completed box being shipped out [1]
 .....\kern1.0 (font)
 .....\hbox(4.51111+0.0)x10.00002, glue set 3.00694fil, shifted 2.22223, direction TLT
 ......\glue 0.0 plus 1.0fil minus 1.0fil
-......\pdfcolorstack 0 set {0 g 0 G}
 ......\OT1/cmr/m/n/7 2
 ......\glue 0.0 plus 1.0fil minus 1.0fil
 .....\kern1.99998 (font)
@@ -312,6 +311,7 @@ Completed box being shipped out [1]
 .......\pdfcolorstack 0 set {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
 .......\OMX/cmex/m/n/10 Z
 ....\glue(\thinmuskip) 1.66663
+....\pdfcolorstack 0 set {0 g 0 G}
 ....\OML/cmm/m/it/10 x
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\OT1/cmr/m/n/10 =
@@ -319,8 +319,10 @@ Completed box being shipped out [1]
 ....\vbox(13.61122+8.61124)x10.00002, direction TLT
 .....\hbox(13.61122+8.61124)x10.00002, direction TLT
 ......\hbox(0.0+22.22246)x10.00002, shifted -13.61122, direction TLT
+.......\pdfcolorstack 0 set {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
 .......\OMX/cmex/m/n/10 Z
 ....\glue(\thinmuskip) 1.66663
+....\pdfcolorstack 0 set {0 g 0 G}
 ....\OML/cmm/m/it/10 x
 ...\penalty 0
 ...\glue(\belowdisplayshortskip) 7.0 plus 3.0 minus 4.0
@@ -387,36 +389,37 @@ Completed box being shipped out [1]
 .....\hbox(4.51111+0.0)x4.48613, direction TLT
 ......\OT1/cmr/m/n/7 1
 ....\glue(\thinmuskip) 1.66663
-....\pdfcolorstack 0 set {0.7 0.3 0.2 rg 0.7 0.3 0.2 RG}
 ....\OML/cmm/m/it/10 x
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\OT1/cmr/m/n/10 =
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\hbox(0.0+22.22246)x5.55557, shifted -13.61122, direction TLT
+.....\pdfcolorstack 0 set {0.7 0.3 0.2 rg 0.7 0.3 0.2 RG}
 .....\OMX/cmex/m/n/10 Z
 ....\hbox(4.51111+0.0)x4.48613, shifted 9.11122, direction TLT
 .....\pdfcolorstack 0 set {0 g 0 G}
 .....\OT1/cmr/m/n/7 1
 ....\glue(\thinmuskip) 1.66663
-....\pdfcolorstack 0 set {0.7 0.3 0.2 rg 0.7 0.3 0.2 RG}
 ....\OML/cmm/m/it/10 x
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\OT1/cmr/m/n/10 =
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\hbox(0.0+22.22246)x10.00002, shifted -13.61122, direction TLT
+.....\pdfcolorstack 0 set {0.7 0.3 0.2 rg 0.7 0.3 0.2 RG}
 .....\OMX/cmex/m/n/10 Z
 ....\hbox(4.51111+0.0)x4.48613, shifted -11.13902, direction TLT
 .....\pdfcolorstack 0 set {0 g 0 G}
 .....\OT1/cmr/m/n/7 2
 ....\glue(\thinmuskip) 1.66663
-....\pdfcolorstack 0 set {0.7 0.3 0.2 rg 0.7 0.3 0.2 RG}
 ....\OML/cmm/m/it/10 x
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\OT1/cmr/m/n/10 =
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\hbox(0.0+22.22246)x10.00002, shifted -13.61122, direction TLT
+.....\pdfcolorstack 0 set {0.7 0.3 0.2 rg 0.7 0.3 0.2 RG}
 .....\OMX/cmex/m/n/10 Z
 ....\glue(\thinmuskip) 1.66663
+....\pdfcolorstack 0 set {0 g 0 G}
 ....\OML/cmm/m/it/10 x
 ...\penalty 0
 ...\glue(\belowdisplayskip) 12.0 plus 3.0 minus 9.0
@@ -611,11 +614,11 @@ Completed box being shipped out [1]
 ......\glue 0.0 plus 1.0fil minus 1.0fil
 .....\kern1.0 (font)
 ....\glue(\thinmuskip) 1.66663
-....\pdfcolorstack 0 set {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
 ....\OML/cmm/m/it/10 x
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\OT1/cmr/m/n/10 =
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
+....\pdfcolorstack 0 set {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
 ....\OML/cmm/m/it/10 a
 ....\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
 ....\OT1/cmr/m/n/10 +
@@ -632,11 +635,11 @@ Completed box being shipped out [1]
 ......\glue 0.0 plus 1.0fil minus 1.0fil
 .....\kern1.0 (font)
 ....\glue(\thinmuskip) 1.66663
-....\pdfcolorstack 0 set {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
 ....\OML/cmm/m/it/10 x
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\OT1/cmr/m/n/10 =
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
+....\pdfcolorstack 0 set {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
 ....\OML/cmm/m/it/10 a
 ....\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
 ....\OT1/cmr/m/n/10 +
@@ -654,10 +657,12 @@ Completed box being shipped out [1]
 .......\pdfcolorstack 0 set {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
 .......\OMX/cmex/m/n/10 X
 ....\glue(\thinmuskip) 1.66663
+....\pdfcolorstack 0 set {0 g 0 G}
 ....\OML/cmm/m/it/10 x
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\OT1/cmr/m/n/10 =
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
+....\pdfcolorstack 0 set {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
 ....\OML/cmm/m/it/10 a
 ....\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
 ....\OT1/cmr/m/n/10 +
@@ -667,6 +672,7 @@ Completed box being shipped out [1]
 ......\hbox(1.0+15.00012)x14.44447, shifted -9.50006, direction TLT
 .......\OMX/cmex/m/n/10 X
 ....\glue(\thinmuskip) 1.66663
+....\pdfcolorstack 0 set {0 g 0 G}
 ....\OML/cmm/m/it/10 x
 ...\penalty 0
 ...\glue(\belowdisplayshortskip) 7.0 plus 3.0 minus 4.0
@@ -754,10 +760,12 @@ Completed box being shipped out [1]
 ......\glue 0.0 plus 1.0fil minus 1.0fil
 .....\kern1.0 (font)
 ....\glue(\thinmuskip) 1.66663
+....\pdfcolorstack 0 set {0 g 0 G}
 ....\OML/cmm/m/it/10 x
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\OT1/cmr/m/n/10 =
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
+....\pdfcolorstack 0 set {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
 ....\OML/cmm/m/it/10 a
 ....\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
 ....\OT1/cmr/m/n/10 +
@@ -780,11 +788,11 @@ Completed box being shipped out [1]
 ......\glue 0.0 plus 1.0fil minus 1.0fil
 .....\kern1.0 (font)
 ....\glue(\thinmuskip) 1.66663
-....\pdfcolorstack 0 set {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
 ....\OML/cmm/m/it/10 x
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\OT1/cmr/m/n/10 =
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
+....\pdfcolorstack 0 set {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
 ....\OML/cmm/m/it/10 a
 ....\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
 ....\OT1/cmr/m/n/10 +
@@ -800,10 +808,12 @@ Completed box being shipped out [1]
 ......\glue 0.0 plus 1.0fil minus 1.0fil
 .....\kern1.0 (font)
 ....\glue(\thinmuskip) 1.66663
+....\pdfcolorstack 0 set {0 g 0 G}
 ....\OML/cmm/m/it/10 x
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\OT1/cmr/m/n/10 =
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
+....\pdfcolorstack 0 set {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
 ....\OML/cmm/m/it/10 a
 ....\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
 ....\OT1/cmr/m/n/10 +
@@ -819,6 +829,7 @@ Completed box being shipped out [1]
 ......\hbox(1.0+15.00012)x14.44447, shifted -9.50006, direction TLT
 .......\OMX/cmex/m/n/10 X
 ....\glue(\thinmuskip) 1.66663
+....\pdfcolorstack 0 set {0 g 0 G}
 ....\OML/cmm/m/it/10 x
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\OT1/cmr/m/n/10 =
@@ -935,7 +946,6 @@ Completed box being shipped out [1]
 ......\glue 0.0 plus 1.0fil minus 1.0fil
 .....\kern1.0 (font)
 ....\glue(\thinmuskip) 1.66663
-....\pdfcolorstack 0 set {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
 ....\OML/cmm/m/it/10 x
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\OT1/cmr/m/n/10 =
@@ -944,7 +954,6 @@ Completed box being shipped out [1]
 .....\kern1.0 (font)
 .....\hbox(4.51111+0.0)x14.44447, glue set 5.22917fil, direction TLT
 ......\glue 0.0 plus 1.0fil minus 1.0fil
-......\pdfcolorstack 0 set {0 g 0 G}
 ......\OT1/cmr/m/n/7 1
 ......\glue 0.0 plus 1.0fil minus 1.0fil
 .....\kern1.99998 (font)
@@ -963,7 +972,6 @@ Completed box being shipped out [1]
 ......\glue 0.0 plus 1.0fil minus 1.0fil
 .....\kern1.0 (font)
 ....\glue(\thinmuskip) 1.66663
-....\pdfcolorstack 0 set {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
 ....\OML/cmm/m/it/10 x
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\OT1/cmr/m/n/10 =
@@ -972,7 +980,6 @@ Completed box being shipped out [1]
 .....\kern1.0 (font)
 .....\hbox(4.8611+0.0)x14.44447, glue set 2.26385fil, direction TLT
 ......\glue 0.0 plus 1.0fil minus 1.0fil
-......\pdfcolorstack 0 set {0 g 0 G}
 ......\OT1/cmss/m/n/7 f
 ......\OT1/cmss/m/n/7 o
 ......\kern0.20659 (font)
@@ -995,7 +1002,6 @@ Completed box being shipped out [1]
 ......\glue 0.0 plus 1.0fil minus 1.0fil
 .....\kern1.0 (font)
 ....\glue(\thinmuskip) 1.66663
-....\pdfcolorstack 0 set {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
 ....\OML/cmm/m/it/10 x
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\OT1/cmr/m/n/10 =
@@ -1056,36 +1062,37 @@ Completed box being shipped out [1]
 .....\hbox(4.51111+0.0)x4.48613, direction TLT
 ......\OT1/cmr/m/n/7 1
 ....\glue(\thinmuskip) 1.66663
-....\pdfcolorstack 0 set {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
 ....\OML/cmm/m/it/10 x
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\OT1/cmr/m/n/10 =
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\hbox(1.0+15.00012)x14.44447, shifted -9.50006, direction TLT
+.....\pdfcolorstack 0 set {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
 .....\OMX/cmex/m/n/10 X
 ....\hbox(4.51111+0.0)x4.48613, shifted 6.00005, direction TLT
 .....\pdfcolorstack 0 set {0 g 0 G}
 .....\OT1/cmr/m/n/7 1
 ....\glue(\thinmuskip) 1.66663
-....\pdfcolorstack 0 set {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
 ....\OML/cmm/m/it/10 x
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\OT1/cmr/m/n/10 =
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\hbox(1.0+15.00012)x14.44447, shifted -9.50006, direction TLT
+.....\pdfcolorstack 0 set {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
 .....\OMX/cmex/m/n/10 X
 ....\hbox(4.51111+0.0)x4.48613, shifted -8.02786, direction TLT
 .....\pdfcolorstack 0 set {0 g 0 G}
 .....\OT1/cmr/m/n/7 2
 ....\glue(\thinmuskip) 1.66663
-....\pdfcolorstack 0 set {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
 ....\OML/cmm/m/it/10 x
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\OT1/cmr/m/n/10 =
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\hbox(1.0+15.00012)x14.44447, shifted -9.50006, direction TLT
+.....\pdfcolorstack 0 set {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
 .....\OMX/cmex/m/n/10 X
 ....\glue(\thinmuskip) 1.66663
+....\pdfcolorstack 0 set {0 g 0 G}
 ....\OML/cmm/m/it/10 x
 ...\penalty 0
 ...\glue(\belowdisplayshortskip) 7.0 plus 3.0 minus 4.0
@@ -1171,10 +1178,12 @@ Completed box being shipped out [2]
 .....\hbox(4.51111+0.0)x4.48613, direction TLT
 ......\pdfcolorstack 0 set {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
 ......\OT1/cmr/m/n/7 1
+....\pdfcolorstack 0 set {0 g 0 G}
 ....\OML/cmm/m/it/10 x
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\OT1/cmr/m/n/10 =
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
+....\pdfcolorstack 0 set {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
 ....\OML/cmm/m/it/10 ^^K
 ....\kern0.03702 (italic)
 ....\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
@@ -1183,10 +1192,12 @@ Completed box being shipped out [2]
 ....\OML/cmm/m/it/10 ^^L
 ....\hbox(4.51111+0.0)x4.48613, shifted 1.49998, direction TLT
 .....\OT1/cmr/m/n/7 1
+....\pdfcolorstack 0 set {0 g 0 G}
 ....\OML/cmm/m/it/10 x
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\OT1/cmr/m/n/10 =
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
+....\pdfcolorstack 0 set {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
 ....\OML/cmm/m/it/10 ^^K
 ....\kern0.03702 (italic)
 ....\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
@@ -1197,11 +1208,11 @@ Completed box being shipped out [2]
 ....\hbox(4.51111+0.0)x4.48613, shifted -4.12892, direction TLT
 .....\pdfcolorstack 0 set {0 g 0 G}
 .....\OT1/cmr/m/n/7 2
-....\pdfcolorstack 0 set {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
 ....\OML/cmm/m/it/10 x
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\OT1/cmr/m/n/10 =
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
+....\pdfcolorstack 0 set {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
 ....\OML/cmm/m/it/10 ^^K
 ....\kern0.03702 (italic)
 ....\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
@@ -1209,6 +1220,7 @@ Completed box being shipped out [2]
 ....\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
 ....\OML/cmm/m/it/10 ^^L
 ....\kern0.52777 (italic)
+....\pdfcolorstack 0 set {0 g 0 G}
 ....\OML/cmm/m/it/10 x
 ...\penalty 0
 ...\glue(\belowdisplayskip) 12.0 plus 3.0 minus 9.0
@@ -1390,6 +1402,7 @@ Completed box being shipped out [2]
 .......\hbox(0.0+0.0)x1.2, shifted -2.5, direction TLT
 .......\vbox(13.20952+6.85951)x5.00002, direction TLT
 ........\hbox(6.44444+0.0)x5.00002, direction TLT
+.........\pdfcolorstack 0 set {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
 .........\OT1/cmr/m/n/10 1
 ........\kern4.06508 (font)
 ........\rule(0.39998+0.0)x*
@@ -1398,8 +1411,10 @@ Completed box being shipped out [2]
 .........\OT1/cmr/m/n/10 2
 .......\hbox(0.0+0.0)x1.2, shifted -2.5, direction TLT
 .....\hbox(0.39998+23.60025)x7.50002, shifted -14.10013, direction TLT
+......\pdfcolorstack 0 set {0.0 0.0 1.0 rg 0.0 0.0 1.0 RG}
 ......\OMX/cmex/m/n/10 ^^[
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
+....\pdfcolorstack 0 set {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
 ....\OT1/cmr/m/n/10 =
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\OML/cmm/m/it/10 L
@@ -1511,6 +1526,7 @@ Completed box being shipped out [2]
 .....\hbox(4.30554+0.0)x5.28589, direction TLT
 ......\OML/cmm/m/it/10 a
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
+....\pdfcolorstack 0 set {0 g 0 G}
 ....\OMS/cmsy/m/n/10 6
 ....\OT1/cmr/m/n/10 =
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
@@ -1519,8 +1535,10 @@ Completed box being shipped out [2]
 ......\OT1/cmr/m/n/10 ^
 .....\kern-4.30554 (font)
 .....\hbox(4.30554+0.0)x5.28589, direction TLT
+......\pdfcolorstack 0 set {0.0 0.0 1.0 rg 0.0 0.0 1.0 RG}
 ......\OML/cmm/m/it/10 a
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
+....\pdfcolorstack 0 set {0 g 0 G}
 ....\OMS/cmsy/m/n/10 6
 ....\OT1/cmr/m/n/10 =
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
@@ -1529,8 +1547,10 @@ Completed box being shipped out [2]
 ......\OT1/cmr/m/n/10 ^
 .....\kern-4.30554 (font)
 .....\hbox(4.30554+1.49998)x9.77202, direction TLT
+......\pdfcolorstack 0 set {0.0 0.0 1.0 rg 0.0 0.0 1.0 RG}
 ......\OML/cmm/m/it/10 a
 ......\hbox(4.51111+0.0)x4.48613, shifted 1.49998, direction TLT
+.......\pdfcolorstack 0 set {0 g 0 G}
 .......\OT1/cmr/m/n/7 1
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\OMS/cmsy/m/n/10 6
@@ -1541,6 +1561,7 @@ Completed box being shipped out [2]
 ......\OMX/cmex/m/n/10 b
 .....\kern-4.30554 (font)
 .....\hbox(4.30554+1.49998)x9.77202, direction TLT
+......\pdfcolorstack 0 set {0.0 0.0 1.0 rg 0.0 0.0 1.0 RG}
 ......\OML/cmm/m/it/10 a
 ......\hbox(4.51111+0.0)x4.48613, shifted 1.49998, direction TLT
 .......\OT1/cmr/m/n/7 1
@@ -1635,6 +1656,7 @@ Completed box being shipped out [2]
 .....\hbox(6.83331+0.0)x5.18054, direction TLT
 ......\OML/cmm/m/it/10 I
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
+....\pdfcolorstack 0 set {0 g 0 G}
 ....\OMS/cmsy/m/n/10 6
 ....\OT1/cmr/m/n/10 =
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
@@ -1643,8 +1665,10 @@ Completed box being shipped out [2]
 ......\OT1/cmr/m/n/10 ^
 .....\kern-4.30554 (font)
 .....\hbox(6.83331+0.0)x5.18054, direction TLT
+......\pdfcolorstack 0 set {0.0 0.0 1.0 rg 0.0 0.0 1.0 RG}
 ......\OML/cmm/m/it/10 I
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
+....\pdfcolorstack 0 set {0 g 0 G}
 ....\OMS/cmsy/m/n/10 6
 ....\OT1/cmr/m/n/10 =
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
@@ -1653,8 +1677,10 @@ Completed box being shipped out [2]
 ......\OT1/cmr/m/n/10 ^
 .....\kern-4.30554 (font)
 .....\hbox(6.83331+1.49998)x8.88197, direction TLT
+......\pdfcolorstack 0 set {0.0 0.0 1.0 rg 0.0 0.0 1.0 RG}
 ......\OML/cmm/m/it/10 I
 ......\hbox(4.51111+0.0)x4.48613, shifted 1.49998, direction TLT
+.......\pdfcolorstack 0 set {0 g 0 G}
 .......\OT1/cmr/m/n/7 1
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\OMS/cmsy/m/n/10 6
@@ -1665,6 +1691,7 @@ Completed box being shipped out [2]
 ......\OMX/cmex/m/n/10 b
 .....\kern-4.30554 (font)
 .....\hbox(6.83331+1.49998)x8.88197, direction TLT
+......\pdfcolorstack 0 set {0.0 0.0 1.0 rg 0.0 0.0 1.0 RG}
 ......\OML/cmm/m/it/10 I
 ......\hbox(4.51111+0.0)x4.48613, shifted 1.49998, direction TLT
 .......\OT1/cmr/m/n/7 1
@@ -1740,11 +1767,11 @@ Completed box being shipped out [2]
 .....\OMS/cmsy/m/n/7 0
 .....\OMS/cmsy/m/n/7 0
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
-....\pdfcolorstack 0 set {0.0 0.0 1.0 rg 0.0 0.0 1.0 RG}
 ....\OMS/cmsy/m/n/10 6
 ....\OT1/cmr/m/n/10 =
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\hbox(0.0+22.22246)x10.00002, shifted -13.61122, direction TLT
+.....\pdfcolorstack 0 set {0.0 0.0 1.0 rg 0.0 0.0 1.0 RG}
 .....\OMX/cmex/m/n/10 Z
 ....\hbox(3.8889+0.0)x2.80556, shifted -11.13902, direction TLT
 .....\pdfcolorstack 0 set {0 g 0 G}
@@ -1790,6 +1817,7 @@ Completed box being shipped out [2]
 .......\pdfcolorstack 0 set {0.0 0.0 1.0 rg 0.0 0.0 1.0 RG}
 .......\OMX/cmex/m/n/10 X
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
+....\pdfcolorstack 0 set {0 g 0 G}
 ....\OMS/cmsy/m/n/10 6
 ....\OT1/cmr/m/n/10 =
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
@@ -1797,7 +1825,6 @@ Completed box being shipped out [2]
 .....\kern1.0 (font)
 .....\hbox(3.8889+0.0)x14.44447, glue set 6.06946fil, direction TLT
 ......\glue 0.0 plus 1.0fil minus 1.0fil
-......\pdfcolorstack 0 set {0 g 0 G}
 ......\OMS/cmsy/m/n/7 0
 ......\glue 0.0 plus 1.0fil minus 1.0fil
 .....\kern1.99998 (font)
@@ -1844,13 +1871,13 @@ Completed box being shipped out [2]
 .....\OMS/cmsy/m/n/7 0
 .....\OMS/cmsy/m/n/7 0
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
-....\pdfcolorstack 0 set {0.0 0.0 1.0 rg 0.0 0.0 1.0 RG}
 ....\OMS/cmsy/m/n/10 6
 ....\OT1/cmr/m/n/10 =
 ....\hbox(14.5001+9.50012)x7.36115, direction TLT
 .....\mathon
 .....\hbox(14.5001+9.50012)x7.36115, direction TLT
 ......\hbox(0.39998+23.60025)x7.36115, shifted -14.10013, direction TLT
+.......\pdfcolorstack 0 set {0.0 0.0 1.0 rg 0.0 0.0 1.0 RG}
 .......\OMX/cmex/m/n/10 ^^S
 ......\vbox(14.5+0.0)x0.0, direction TLT
 ......\hbox(0.0+0.0)x0.0, direction TLT
@@ -1928,7 +1955,7 @@ Completed box being shipped out [2]
 ......\glue 0.0 plus 1.0fil minus 1.0fil
 .....\kern1.0 (font)
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
-....\pdfcolorstack 0 set {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
+....\pdfcolorstack 0 set {0 g 0 G}
 ....\OML/cmm/m/it/10 <
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\OML/cmm/m/it/10 z
@@ -1995,12 +2022,12 @@ Completed box being shipped out [3]
 ......\glue 0.0 plus 1.0fil minus 1.0fil
 .....\kern1.0 (font)
 ....\glue(\thinmuskip) 1.66663
-....\pdfcolorstack 0 set {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
 ....\OML/cmm/m/it/10 x
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\OT1/cmr/m/n/10 =
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\hbox(1.0+15.00012)x14.44447, shifted -9.50006, direction TLT
+.....\pdfcolorstack 0 set {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
 .....\OMX/cmex/m/n/10 X
 ....\vbox(18.53902+0.0)x4.48613, shifted 6.00005, direction TLT
 .....\hbox(4.51111+0.0)x4.48613, direction TLT
@@ -2010,7 +2037,6 @@ Completed box being shipped out [3]
 .....\hbox(4.51111+0.0)x4.48613, direction TLT
 ......\OT1/cmr/m/n/7 1
 ....\glue(\thinmuskip) 1.66663
-....\pdfcolorstack 0 set {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
 ....\OML/cmm/m/it/10 x
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\OT1/cmr/m/n/10 =
@@ -2019,7 +2045,6 @@ Completed box being shipped out [3]
 .....\kern1.0 (font)
 .....\hbox(4.51111+0.0)x14.44447, glue set 5.22917fil, direction TLT
 ......\glue 0.0 plus 1.0fil minus 1.0fil
-......\pdfcolorstack 0 set {0 g 0 G}
 ......\OT1/cmr/m/n/7 2
 ......\glue 0.0 plus 1.0fil minus 1.0fil
 .....\kern1.99998 (font)
@@ -2035,7 +2060,6 @@ Completed box being shipped out [3]
 ......\glue 0.0 plus 1.0fil minus 1.0fil
 .....\kern1.0 (font)
 ....\glue(\thinmuskip) 1.66663
-....\pdfcolorstack 0 set {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
 ....\OML/cmm/m/it/10 x
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\OT1/cmr/m/n/10 =
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 6ca72750c..6bb7c7985 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -42,6 +42,7 @@ Defining \__color_backend_select_gray:n on line ...
 Defining \__color_backend_select_rgb:n on line ...
 Defining \__color_backend_select:nn on line ...
 Defining \__color_backend_reset: on line ...
+Defining \__color_backend_reset_aux: on line ...
 Defining \__color_backend_stack_push:nn on line ...
 Defining \__color_backend_stack_push:nnn on line ...
 Defining \__color_backend_stack_push:nVn on line ...
@@ -74,6 +75,7 @@ Defining \__color_backend_fill_devicen:nn on line ...
 Defining \__color_backend_stroke_devicen:nn on line ...
 Defining \__color_backend_fill_reset: on line ...
 Defining \__color_backend_stroke_reset: on line ...
+Defining \__color_backend_math_reset: on line ...
 Lua module: l3backend-luatex ....-..-..
 Lua-only attribute color = 1
 Inserting `color' at position 1 in `pre_shipout_filter'.
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index bf7b9dbce..86e577082 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -37,6 +37,7 @@ Defining \__color_backend_select_named:n on line ...
 Defining \__color_backend_select_rgb:n on line ...
 Defining \__color_backend_select:n on line ...
 Defining \__color_backend_reset: on line ...
+Defining \__color_backend_reset_aux: on line ...
 Defining \g__color_backend_colorant_prop on line ...
 Defining \__color_backend_devicen_colorants:n on line ...
 Defining \__color_backend_devicen_colorants:w on line ...
@@ -74,6 +75,7 @@ Defining \__color_backend_fill_devicen:nn on line ...
 Defining \__color_backend_stroke_devicen:nn on line ...
 Defining \__color_backend_fill_reset: on line ...
 Defining \__color_backend_stroke_reset: on line ...
+Defining \__color_backend_math_reset: on line ...
 Defining \__box_backend_clip:N on line ...
 Defining \__box_backend_rotate:Nn on line ...
 Defining \__box_backend_rotate_aux:Nn on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 8e6e7f4b9..b0ae3e4d9 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -42,6 +42,7 @@ Defining \__color_backend_select_gray:n on line ...
 Defining \__color_backend_select_rgb:n on line ...
 Defining \__color_backend_select:nn on line ...
 Defining \__color_backend_reset: on line ...
+Defining \__color_backend_reset_aux: on line ...
 Defining \__color_backend_stack_push:nn on line ...
 Defining \__color_backend_stack_push:nnn on line ...
 Defining \__color_backend_stack_push:nVn on line ...
@@ -74,6 +75,7 @@ Defining \__color_backend_fill_devicen:nn on line ...
 Defining \__color_backend_stroke_devicen:nn on line ...
 Defining \__color_backend_fill_reset: on line ...
 Defining \__color_backend_stroke_reset: on line ...
+Defining \__color_backend_math_reset: on line ...
 Defining \__box_backend_clip:N on line ...
 Defining \__box_backend_rotate:Nn on line ...
 Defining \__box_backend_rotate_aux:Nn on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index bf7b9dbce..86e577082 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -37,6 +37,7 @@ Defining \__color_backend_select_named:n on line ...
 Defining \__color_backend_select_rgb:n on line ...
 Defining \__color_backend_select:n on line ...
 Defining \__color_backend_reset: on line ...
+Defining \__color_backend_reset_aux: on line ...
 Defining \g__color_backend_colorant_prop on line ...
 Defining \__color_backend_devicen_colorants:n on line ...
 Defining \__color_backend_devicen_colorants:w on line ...
@@ -74,6 +75,7 @@ Defining \__color_backend_fill_devicen:nn on line ...
 Defining \__color_backend_stroke_devicen:nn on line ...
 Defining \__color_backend_fill_reset: on line ...
 Defining \__color_backend_stroke_reset: on line ...
+Defining \__color_backend_math_reset: on line ...
 Defining \__box_backend_clip:N on line ...
 Defining \__box_backend_rotate:Nn on line ...
 Defining \__box_backend_rotate_aux:Nn on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index dd96f48ae..1abf3e0a9 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -33,6 +33,7 @@ Defining \__color_backend_select_cmyk:n on line ...
 Defining \__color_backend_select_gray:n on line ...
 Defining \__color_backend_select_rgb:n on line ...
 Defining \__color_backend_reset: on line ...
+Defining \__color_backend_reset_aux: on line ...
 Defining \__color_backend_select_named:n on line ...
 Defining message color/unknown-named-color on line ...
 Defining \g__color_backend_colorant_prop on line ...
@@ -63,6 +64,7 @@ Defining \__color_backend_fill_devicen:nn on line ...
 Defining \__color_backend_stroke_devicen:nn on line ...
 Defining \__color_backend_fill_reset: on line ...
 Defining \__color_backend_stroke_reset: on line ...
+Defining \__color_backend_math_reset: on line ...
 Defining \__box_backend_clip:N on line ...
 Defining \__box_backend_rotate:Nn on line ...
 Defining \__box_backend_rotate_aux:Nn on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 6ca72750c..6bb7c7985 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -42,6 +42,7 @@ Defining \__color_backend_select_gray:n on line ...
 Defining \__color_backend_select_rgb:n on line ...
 Defining \__color_backend_select:nn on line ...
 Defining \__color_backend_reset: on line ...
+Defining \__color_backend_reset_aux: on line ...
 Defining \__color_backend_stack_push:nn on line ...
 Defining \__color_backend_stack_push:nnn on line ...
 Defining \__color_backend_stack_push:nVn on line ...
@@ -74,6 +75,7 @@ Defining \__color_backend_fill_devicen:nn on line ...
 Defining \__color_backend_stroke_devicen:nn on line ...
 Defining \__color_backend_fill_reset: on line ...
 Defining \__color_backend_stroke_reset: on line ...
+Defining \__color_backend_math_reset: on line ...
 Lua module: l3backend-luatex ....-..-..
 Lua-only attribute color = 1
 Inserting `color' at position 1 in `pre_shipout_filter'.
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index bf7b9dbce..86e577082 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -37,6 +37,7 @@ Defining \__color_backend_select_named:n on line ...
 Defining \__color_backend_select_rgb:n on line ...
 Defining \__color_backend_select:n on line ...
 Defining \__color_backend_reset: on line ...
+Defining \__color_backend_reset_aux: on line ...
 Defining \g__color_backend_colorant_prop on line ...
 Defining \__color_backend_devicen_colorants:n on line ...
 Defining \__color_backend_devicen_colorants:w on line ...
@@ -74,6 +75,7 @@ Defining \__color_backend_fill_devicen:nn on line ...
 Defining \__color_backend_stroke_devicen:nn on line ...
 Defining \__color_backend_fill_reset: on line ...
 Defining \__color_backend_stroke_reset: on line ...
+Defining \__color_backend_math_reset: on line ...
 Defining \__box_backend_clip:N on line ...
 Defining \__box_backend_rotate:Nn on line ...
 Defining \__box_backend_rotate_aux:Nn on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 8e6e7f4b9..b0ae3e4d9 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -42,6 +42,7 @@ Defining \__color_backend_select_gray:n on line ...
 Defining \__color_backend_select_rgb:n on line ...
 Defining \__color_backend_select:nn on line ...
 Defining \__color_backend_reset: on line ...
+Defining \__color_backend_reset_aux: on line ...
 Defining \__color_backend_stack_push:nn on line ...
 Defining \__color_backend_stack_push:nnn on line ...
 Defining \__color_backend_stack_push:nVn on line ...
@@ -74,6 +75,7 @@ Defining \__color_backend_fill_devicen:nn on line ...
 Defining \__color_backend_stroke_devicen:nn on line ...
 Defining \__color_backend_fill_reset: on line ...
 Defining \__color_backend_stroke_reset: on line ...
+Defining \__color_backend_math_reset: on line ...
 Defining \__box_backend_clip:N on line ...
 Defining \__box_backend_rotate:Nn on line ...
 Defining \__box_backend_rotate_aux:Nn on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index bf7b9dbce..86e577082 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -37,6 +37,7 @@ Defining \__color_backend_select_named:n on line ...
 Defining \__color_backend_select_rgb:n on line ...
 Defining \__color_backend_select:n on line ...
 Defining \__color_backend_reset: on line ...
+Defining \__color_backend_reset_aux: on line ...
 Defining \g__color_backend_colorant_prop on line ...
 Defining \__color_backend_devicen_colorants:n on line ...
 Defining \__color_backend_devicen_colorants:w on line ...
@@ -74,6 +75,7 @@ Defining \__color_backend_fill_devicen:nn on line ...
 Defining \__color_backend_stroke_devicen:nn on line ...
 Defining \__color_backend_fill_reset: on line ...
 Defining \__color_backend_stroke_reset: on line ...
+Defining \__color_backend_math_reset: on line ...
 Defining \__box_backend_clip:N on line ...
 Defining \__box_backend_rotate:Nn on line ...
 Defining \__box_backend_rotate_aux:Nn on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index dd96f48ae..1abf3e0a9 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -33,6 +33,7 @@ Defining \__color_backend_select_cmyk:n on line ...
 Defining \__color_backend_select_gray:n on line ...
 Defining \__color_backend_select_rgb:n on line ...
 Defining \__color_backend_reset: on line ...
+Defining \__color_backend_reset_aux: on line ...
 Defining \__color_backend_select_named:n on line ...
 Defining message color/unknown-named-color on line ...
 Defining \g__color_backend_colorant_prop on line ...
@@ -63,6 +64,7 @@ Defining \__color_backend_fill_devicen:nn on line ...
 Defining \__color_backend_stroke_devicen:nn on line ...
 Defining \__color_backend_fill_reset: on line ...
 Defining \__color_backend_stroke_reset: on line ...
+Defining \__color_backend_math_reset: on line ...
 Defining \__box_backend_clip:N on line ...
 Defining \__box_backend_rotate:Nn on line ...
 Defining \__box_backend_rotate_aux:Nn on line ...





More information about the latex3-commits mailing list.