[latex3-commits] [git/LaTeX3-latex3-latex3] main: Protect \c_alignment_token in \color_math:nn (46b91b515)
Joseph Wright
joseph.wright at morningstar2.co.uk
Wed Aug 3 13:11:23 CEST 2022
Repository : https://github.com/latex3/latex3
On branch : main
Link : https://github.com/latex3/latex3/commit/46b91b515c627e2ade62dff2e2de678fbac30065
>---------------------------------------------------------------
commit 46b91b515c627e2ade62dff2e2de678fbac30065
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Wed Aug 3 12:11:23 2022 +0100
Protect \c_alignment_token in \color_math:nn
A different approach but the same issue as came up
in the \mathcolor implementation (https://github.com/latex3/latex2e/issues/901).
>---------------------------------------------------------------
46b91b515c627e2ade62dff2e2de678fbac30065
l3kernel/CHANGELOG.md | 3 +
l3kernel/l3color.dtx | 15 +++-
.../testfiles-backend/m3color004.etex-dvips.tlg | 90 ++++++++++++++++++++-
.../testfiles-backend/m3color004.etex-dvisvgm.tlg | 88 +++++++++++++++++++-
l3kernel/testfiles-backend/m3color004.luatex.tlg | 93 +++++++++++++++++++++-
l3kernel/testfiles-backend/m3color004.lvt | 7 ++
l3kernel/testfiles-backend/m3color004.ptex.tlg | 90 ++++++++++++++++++++-
l3kernel/testfiles-backend/m3color004.tlg | 88 +++++++++++++++++++-
l3kernel/testfiles-backend/m3color004.uptex.tlg | 90 ++++++++++++++++++++-
l3kernel/testfiles-backend/m3color004.xetex.tlg | 88 +++++++++++++++++++-
10 files changed, 642 insertions(+), 10 deletions(-)
diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
index 07c940580..3a4e44ad3 100644
--- a/l3kernel/CHANGELOG.md
+++ b/l3kernel/CHANGELOG.md
@@ -12,6 +12,9 @@ this project uses date-based 'snapshot' version identifiers.
- Support accent removal when uppercasing Greek with 8-bit engines
- Function `\sys_ensure_backend:`
+### Fixed
+- Behavior of `\color_math:nn` in alignments
+
## [2022-07-21]
### Fixed
diff --git a/l3kernel/l3color.dtx b/l3kernel/l3color.dtx
index 4b94bf805..440969080 100644
--- a/l3kernel/l3color.dtx
+++ b/l3kernel/l3color.dtx
@@ -1456,20 +1456,29 @@
% need separate treatment. To avoid repeatedly collecting the same
% token, we first check for an alignment tab: assuming we don't have
% one of those, we can \enquote{recycle} \cs{l_peek_token} safely.
+% As we have an explicit \cs{c_alignment_token}, there needs to be
+% an align-safe group present.
% \begin{macrocode}
\cs_new_protected:Npn \@@_math_scan:w
{
\peek_remove_filler:n
{
+ \group_align_safe_begin:
\peek_catcode:NTF \c_alignment_token
- { \@@_math_scan_end: }
- { \@@_math_scan_auxi: }
+ {
+ \group_align_safe_end:
+ \@@_math_scan_end:
+ }
+ {
+ \group_align_safe_end:
+ \@@_math_scan_auxi:
+ }
}
}
% \end{macrocode}
% Dealing with literal |_| and |^| is easy, and as we have exactly two cases,
% we can hard-code this. We use a hard-coded list for limits: these are all
-% primitives. The \cs{use_none:n} herealso removes the test token so it is
+% primitives. The \cs{use_none:n} here also removes the test token so it is
% left just in the right place.
% \begin{macrocode}
\cs_new_protected:Npn \@@_math_scan_auxi:
diff --git a/l3kernel/testfiles-backend/m3color004.etex-dvips.tlg b/l3kernel/testfiles-backend/m3color004.etex-dvips.tlg
index cca772b4f..6e2c1c9d9 100644
--- a/l3kernel/testfiles-backend/m3color004.etex-dvips.tlg
+++ b/l3kernel/testfiles-backend/m3color004.etex-dvips.tlg
@@ -1888,7 +1888,7 @@ Completed box being shipped out [3]
....\hbox(0.0+0.0)x469.75499
..\glue 0.0
..\glue(\lineskip) 0.0
-..\vbox(578.15999+0.0)x469.75499, glue set 525.93753fil
+..\vbox(578.15999+0.0)x469.75499, glue set 477.93753fil
...\glue(\topskip) 10.0
...\hbox(0.0+0.0)x469.75499, glue set 167.89914fil
....\hbox(0.0+0.0)x20.0
@@ -1960,6 +1960,94 @@ Completed box being shipped out [3]
....\OT1/cmr/m/n/10 =
...\penalty 0
...\glue(\belowdisplayskip) 12.0 plus 3.0 minus 9.0
+...\glue(\parskip) 0.0 plus 1.0
+...\glue(\parskip) 0.0
+...\hbox(0.0+0.0)x469.75499, glue set 167.89914fil
+....\hbox(0.0+0.0)x20.0
+....\hbox(0.0+0.0)x281.85585, glue set 140.92793fil
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\penalty 10000
+...\glue(\abovedisplayskip) 12.0 plus 3.0 minus 9.0
+...\glue(\lineskip) 0.0
+...\hbox(14.5+9.5)x25.13307, shifted 222.31096, display
+....\vbox(14.5+9.5)x25.13307
+.....\hbox(8.39996+3.60004)x25.13307
+......\glue(\tabskip) 0.0
+......\hbox(8.39996+3.60004)x5.28589
+.......\rule(8.39996+3.60004)x0.0
+.......\glue 0.0
+.......\mathon
+.......\OML/cmm/m/it/10 a
+.......\mathoff
+.......\glue 0.0 plus 1.0fil
+.......\glue 0.0
+......\glue(\tabskip) 0.0
+......\hbox(8.39996+3.60004)x15.55553
+.......\glue 0.0
+.......\mathon
+.......\OT1/cmr/m/n/10 =
+.......\special{color push rgb 1.0 0.0 0.0}
+.......\special{ps:SDict begin /color.sc {} def end}
+.......\glue(\thickmuskip) 2.77771 plus 2.77771
+.......\OT1/cmr/m/n/10 1
+.......\special{color pop}
+.......\mathoff
+.......\glue 0.0 plus 1.0fil
+.......\glue 0.0
+......\glue(\tabskip) 0.0
+......\hbox(8.39996+3.60004)x4.29166
+.......\glue 0.0
+.......\mathon
+.......\OML/cmm/m/it/10 b
+.......\mathoff
+.......\mathon
+.......\hbox(0.0+0.0)x0.0
+.......\mathoff
+.......\glue 0.0 plus 1.0fil
+.......\glue 0.0
+......\glue(\tabskip) 0.0
+.....\glue(\lineskip) 0.0
+.....\hbox(8.39996+3.60004)x25.13307
+......\glue(\tabskip) 0.0
+......\hbox(8.39996+3.60004)x5.28589
+.......\rule(8.39996+3.60004)x0.0
+.......\glue 0.0
+.......\mathon
+.......\OML/cmm/m/it/10 a
+.......\mathoff
+.......\glue 0.0 plus 1.0fil
+.......\glue 0.0
+......\glue(\tabskip) 0.0
+......\hbox(8.39996+3.60004)x15.55553
+.......\glue 0.0
+.......\mathon
+.......\OT1/cmr/m/n/10 =
+.......\special{color push rgb 1.0 0.0 0.0}
+.......\special{ps:SDict begin /color.sc {} def end}
+.......\glue(\thickmuskip) 2.77771 plus 2.77771
+.......\OT1/cmr/m/n/10 1
+.......\special{color pop}
+.......\mathoff
+.......\glue 0.0 plus 1.0fil
+.......\glue 0.0
+......\glue(\tabskip) 0.0
+......\hbox(8.39996+3.60004)x4.29166
+.......\glue 0.0
+.......\mathon
+.......\OML/cmm/m/it/10 b
+.......\mathoff
+.......\mathon
+.......\hbox(0.0+0.0)x0.0
+.......\mathoff
+.......\glue 0.0 plus 1.0fil
+.......\glue 0.0
+......\glue(\tabskip) 0.0
+...\penalty 0
+...\glue(\belowdisplayskip) 12.0 plus 3.0 minus 9.0
...\glue -4.0
...\glue 0.0 plus 1.0fil
...\glue 0.0
diff --git a/l3kernel/testfiles-backend/m3color004.etex-dvisvgm.tlg b/l3kernel/testfiles-backend/m3color004.etex-dvisvgm.tlg
index 4523cd6cd..d8222e04a 100644
--- a/l3kernel/testfiles-backend/m3color004.etex-dvisvgm.tlg
+++ b/l3kernel/testfiles-backend/m3color004.etex-dvisvgm.tlg
@@ -1819,7 +1819,7 @@ Completed box being shipped out [3]
....\hbox(0.0+0.0)x469.75499
..\glue 0.0
..\glue(\lineskip) 0.0
-..\vbox(578.15999+0.0)x469.75499, glue set 525.93753fil
+..\vbox(578.15999+0.0)x469.75499, glue set 477.93753fil
...\glue(\topskip) 10.0
...\hbox(0.0+0.0)x469.75499, glue set 167.89914fil
....\hbox(0.0+0.0)x20.0
@@ -1888,6 +1888,92 @@ Completed box being shipped out [3]
....\OT1/cmr/m/n/10 =
...\penalty 0
...\glue(\belowdisplayskip) 12.0 plus 3.0 minus 9.0
+...\glue(\parskip) 0.0 plus 1.0
+...\glue(\parskip) 0.0
+...\hbox(0.0+0.0)x469.75499, glue set 167.89914fil
+....\hbox(0.0+0.0)x20.0
+....\hbox(0.0+0.0)x281.85585, glue set 140.92793fil
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\penalty 10000
+...\glue(\abovedisplayskip) 12.0 plus 3.0 minus 9.0
+...\glue(\lineskip) 0.0
+...\hbox(14.5+9.5)x25.13307, shifted 222.31096, display
+....\vbox(14.5+9.5)x25.13307
+.....\hbox(8.39996+3.60004)x25.13307
+......\glue(\tabskip) 0.0
+......\hbox(8.39996+3.60004)x5.28589
+.......\rule(8.39996+3.60004)x0.0
+.......\glue 0.0
+.......\mathon
+.......\OML/cmm/m/it/10 a
+.......\mathoff
+.......\glue 0.0 plus 1.0fil
+.......\glue 0.0
+......\glue(\tabskip) 0.0
+......\hbox(8.39996+3.60004)x15.55553
+.......\glue 0.0
+.......\mathon
+.......\OT1/cmr/m/n/10 =
+.......\special{color push rgb 1.0 0.0 0.0}
+.......\glue(\thickmuskip) 2.77771 plus 2.77771
+.......\OT1/cmr/m/n/10 1
+.......\special{color pop}
+.......\mathoff
+.......\glue 0.0 plus 1.0fil
+.......\glue 0.0
+......\glue(\tabskip) 0.0
+......\hbox(8.39996+3.60004)x4.29166
+.......\glue 0.0
+.......\mathon
+.......\OML/cmm/m/it/10 b
+.......\mathoff
+.......\mathon
+.......\hbox(0.0+0.0)x0.0
+.......\mathoff
+.......\glue 0.0 plus 1.0fil
+.......\glue 0.0
+......\glue(\tabskip) 0.0
+.....\glue(\lineskip) 0.0
+.....\hbox(8.39996+3.60004)x25.13307
+......\glue(\tabskip) 0.0
+......\hbox(8.39996+3.60004)x5.28589
+.......\rule(8.39996+3.60004)x0.0
+.......\glue 0.0
+.......\mathon
+.......\OML/cmm/m/it/10 a
+.......\mathoff
+.......\glue 0.0 plus 1.0fil
+.......\glue 0.0
+......\glue(\tabskip) 0.0
+......\hbox(8.39996+3.60004)x15.55553
+.......\glue 0.0
+.......\mathon
+.......\OT1/cmr/m/n/10 =
+.......\special{color push rgb 1.0 0.0 0.0}
+.......\glue(\thickmuskip) 2.77771 plus 2.77771
+.......\OT1/cmr/m/n/10 1
+.......\special{color pop}
+.......\mathoff
+.......\glue 0.0 plus 1.0fil
+.......\glue 0.0
+......\glue(\tabskip) 0.0
+......\hbox(8.39996+3.60004)x4.29166
+.......\glue 0.0
+.......\mathon
+.......\OML/cmm/m/it/10 b
+.......\mathoff
+.......\mathon
+.......\hbox(0.0+0.0)x0.0
+.......\mathoff
+.......\glue 0.0 plus 1.0fil
+.......\glue 0.0
+......\glue(\tabskip) 0.0
+...\penalty 0
+...\glue(\belowdisplayskip) 12.0 plus 3.0 minus 9.0
...\glue -4.0
...\glue 0.0 plus 1.0fil
...\glue 0.0
diff --git a/l3kernel/testfiles-backend/m3color004.luatex.tlg b/l3kernel/testfiles-backend/m3color004.luatex.tlg
index 14a45c8dd..0e27c4bf7 100644
--- a/l3kernel/testfiles-backend/m3color004.luatex.tlg
+++ b/l3kernel/testfiles-backend/m3color004.luatex.tlg
@@ -1988,7 +1988,7 @@ Completed box being shipped out [3]
....\hbox(0.0+0.0)x469.75499, direction TLT
..\glue 0.0
..\glue(\lineskip) 0.0
-..\vbox(578.15999+0.0)x469.75499, glue set 525.9375fil, direction TLT
+..\vbox(578.15999+0.0)x469.75499, glue set 477.93753fil, direction TLT
...\glue(\topskip) 10.0
...\hbox(0.0+0.0)x469.75499, glue set 167.89914fil, direction TLT
....\localpar
@@ -2065,6 +2065,97 @@ Completed box being shipped out [3]
....\OT1/cmr/m/n/10 =
...\penalty 0
...\glue(\belowdisplayskip) 12.0 plus 3.0 minus 9.0
+...\glue(\parskip) 0.0 plus 1.0
+...\glue(\parskip) 0.0
+...\hbox(0.0+0.0)x469.75499, glue set 167.89914fil, direction TLT
+....\localpar
+.....\localinterlinepenalty=0
+.....\localbrokenpenalty=0
+.....\localleftbox=null
+.....\localrightbox=null
+....\hbox(0.0+0.0)x20.0, direction TLT
+....\hbox(0.0+0.0)x281.85585, glue set 140.92792fil, direction TLT
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\penalty 10000
+...\glue(\abovedisplayskip) 12.0 plus 3.0 minus 9.0
+...\glue(\lineskip) 0.0
+...\hbox(14.5+9.5)x25.13307, shifted 222.31096, direction TLT
+....\vbox(14.5+9.5)x25.13307, direction TLT
+.....\hbox(8.39996+3.60004)x25.13307, direction TLT
+......\glue(\tabskip) 0.0
+......\hbox(8.39996+3.60004)x5.28589, direction TLT
+.......\rule(8.39996+3.60004)x0.0
+.......\glue 0.0
+.......\mathon
+.......\OML/cmm/m/it/10 a
+.......\mathoff
+.......\glue 0.0 plus 1.0fil
+.......\glue 0.0
+......\glue(\tabskip) 0.0
+......\hbox(8.39996+3.60004)x15.55553, direction TLT
+.......\glue 0.0
+.......\mathon
+.......\OT1/cmr/m/n/10 =
+.......\pdfcolorstack 0 push {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
+.......\glue(\thickmuskip) 2.77771 plus 2.77771
+.......\OT1/cmr/m/n/10 1
+.......\pdfcolorstack 0 pop
+.......\mathoff
+.......\glue 0.0 plus 1.0fil
+.......\glue 0.0
+......\glue(\tabskip) 0.0
+......\hbox(8.39996+3.60004)x4.29166, direction TLT
+.......\glue 0.0
+.......\mathon
+.......\OML/cmm/m/it/10 b
+.......\mathoff
+.......\mathon
+.......\hbox(0.0+0.0)x0.0, direction TLT
+.......\mathoff
+.......\glue 0.0 plus 1.0fil
+.......\glue 0.0
+......\glue(\tabskip) 0.0
+.....\glue(\lineskip) 0.0
+.....\hbox(8.39996+3.60004)x25.13307, direction TLT
+......\glue(\tabskip) 0.0
+......\hbox(8.39996+3.60004)x5.28589, direction TLT
+.......\rule(8.39996+3.60004)x0.0
+.......\glue 0.0
+.......\mathon
+.......\OML/cmm/m/it/10 a
+.......\mathoff
+.......\glue 0.0 plus 1.0fil
+.......\glue 0.0
+......\glue(\tabskip) 0.0
+......\hbox(8.39996+3.60004)x15.55553, direction TLT
+.......\glue 0.0
+.......\mathon
+.......\OT1/cmr/m/n/10 =
+.......\pdfcolorstack 0 push {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
+.......\glue(\thickmuskip) 2.77771 plus 2.77771
+.......\OT1/cmr/m/n/10 1
+.......\pdfcolorstack 0 pop
+.......\mathoff
+.......\glue 0.0 plus 1.0fil
+.......\glue 0.0
+......\glue(\tabskip) 0.0
+......\hbox(8.39996+3.60004)x4.29166, direction TLT
+.......\glue 0.0
+.......\mathon
+.......\OML/cmm/m/it/10 b
+.......\mathoff
+.......\mathon
+.......\hbox(0.0+0.0)x0.0, direction TLT
+.......\mathoff
+.......\glue 0.0 plus 1.0fil
+.......\glue 0.0
+......\glue(\tabskip) 0.0
+...\penalty 0
+...\glue(\belowdisplayskip) 12.0 plus 3.0 minus 9.0
...\glue -4.0
...\glue 0.0 plus 1.0fil
...\glue 0.0
diff --git a/l3kernel/testfiles-backend/m3color004.lvt b/l3kernel/testfiles-backend/m3color004.lvt
index a8bd8196f..4f7134a8a 100644
--- a/l3kernel/testfiles-backend/m3color004.lvt
+++ b/l3kernel/testfiles-backend/m3color004.lvt
@@ -128,6 +128,13 @@ S= \colormathnn{red}{\int}\limits_1^2 x =
\colormathnn{red}{\sum}\displaylimits_1^2 x =
\]
+\[
+ \begin{array}{lll}
+ a &= \colormathnn{red}{1}&b \\
+ a &= \colormathnn{red}{1} &b \\
+ \end{array}
+\]
+
\newpage
\OMIT
diff --git a/l3kernel/testfiles-backend/m3color004.ptex.tlg b/l3kernel/testfiles-backend/m3color004.ptex.tlg
index cca772b4f..6e2c1c9d9 100644
--- a/l3kernel/testfiles-backend/m3color004.ptex.tlg
+++ b/l3kernel/testfiles-backend/m3color004.ptex.tlg
@@ -1888,7 +1888,7 @@ Completed box being shipped out [3]
....\hbox(0.0+0.0)x469.75499
..\glue 0.0
..\glue(\lineskip) 0.0
-..\vbox(578.15999+0.0)x469.75499, glue set 525.93753fil
+..\vbox(578.15999+0.0)x469.75499, glue set 477.93753fil
...\glue(\topskip) 10.0
...\hbox(0.0+0.0)x469.75499, glue set 167.89914fil
....\hbox(0.0+0.0)x20.0
@@ -1960,6 +1960,94 @@ Completed box being shipped out [3]
....\OT1/cmr/m/n/10 =
...\penalty 0
...\glue(\belowdisplayskip) 12.0 plus 3.0 minus 9.0
+...\glue(\parskip) 0.0 plus 1.0
+...\glue(\parskip) 0.0
+...\hbox(0.0+0.0)x469.75499, glue set 167.89914fil
+....\hbox(0.0+0.0)x20.0
+....\hbox(0.0+0.0)x281.85585, glue set 140.92793fil
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\penalty 10000
+...\glue(\abovedisplayskip) 12.0 plus 3.0 minus 9.0
+...\glue(\lineskip) 0.0
+...\hbox(14.5+9.5)x25.13307, shifted 222.31096, display
+....\vbox(14.5+9.5)x25.13307
+.....\hbox(8.39996+3.60004)x25.13307
+......\glue(\tabskip) 0.0
+......\hbox(8.39996+3.60004)x5.28589
+.......\rule(8.39996+3.60004)x0.0
+.......\glue 0.0
+.......\mathon
+.......\OML/cmm/m/it/10 a
+.......\mathoff
+.......\glue 0.0 plus 1.0fil
+.......\glue 0.0
+......\glue(\tabskip) 0.0
+......\hbox(8.39996+3.60004)x15.55553
+.......\glue 0.0
+.......\mathon
+.......\OT1/cmr/m/n/10 =
+.......\special{color push rgb 1.0 0.0 0.0}
+.......\special{ps:SDict begin /color.sc {} def end}
+.......\glue(\thickmuskip) 2.77771 plus 2.77771
+.......\OT1/cmr/m/n/10 1
+.......\special{color pop}
+.......\mathoff
+.......\glue 0.0 plus 1.0fil
+.......\glue 0.0
+......\glue(\tabskip) 0.0
+......\hbox(8.39996+3.60004)x4.29166
+.......\glue 0.0
+.......\mathon
+.......\OML/cmm/m/it/10 b
+.......\mathoff
+.......\mathon
+.......\hbox(0.0+0.0)x0.0
+.......\mathoff
+.......\glue 0.0 plus 1.0fil
+.......\glue 0.0
+......\glue(\tabskip) 0.0
+.....\glue(\lineskip) 0.0
+.....\hbox(8.39996+3.60004)x25.13307
+......\glue(\tabskip) 0.0
+......\hbox(8.39996+3.60004)x5.28589
+.......\rule(8.39996+3.60004)x0.0
+.......\glue 0.0
+.......\mathon
+.......\OML/cmm/m/it/10 a
+.......\mathoff
+.......\glue 0.0 plus 1.0fil
+.......\glue 0.0
+......\glue(\tabskip) 0.0
+......\hbox(8.39996+3.60004)x15.55553
+.......\glue 0.0
+.......\mathon
+.......\OT1/cmr/m/n/10 =
+.......\special{color push rgb 1.0 0.0 0.0}
+.......\special{ps:SDict begin /color.sc {} def end}
+.......\glue(\thickmuskip) 2.77771 plus 2.77771
+.......\OT1/cmr/m/n/10 1
+.......\special{color pop}
+.......\mathoff
+.......\glue 0.0 plus 1.0fil
+.......\glue 0.0
+......\glue(\tabskip) 0.0
+......\hbox(8.39996+3.60004)x4.29166
+.......\glue 0.0
+.......\mathon
+.......\OML/cmm/m/it/10 b
+.......\mathoff
+.......\mathon
+.......\hbox(0.0+0.0)x0.0
+.......\mathoff
+.......\glue 0.0 plus 1.0fil
+.......\glue 0.0
+......\glue(\tabskip) 0.0
+...\penalty 0
+...\glue(\belowdisplayskip) 12.0 plus 3.0 minus 9.0
...\glue -4.0
...\glue 0.0 plus 1.0fil
...\glue 0.0
diff --git a/l3kernel/testfiles-backend/m3color004.tlg b/l3kernel/testfiles-backend/m3color004.tlg
index 82a3bf20c..ab94e3268 100644
--- a/l3kernel/testfiles-backend/m3color004.tlg
+++ b/l3kernel/testfiles-backend/m3color004.tlg
@@ -1819,7 +1819,7 @@ Completed box being shipped out [3]
....\hbox(0.0+0.0)x469.75499
..\glue 0.0
..\glue(\lineskip) 0.0
-..\vbox(578.15999+0.0)x469.75499, glue set 525.93753fil
+..\vbox(578.15999+0.0)x469.75499, glue set 477.93753fil
...\glue(\topskip) 10.0
...\hbox(0.0+0.0)x469.75499, glue set 167.89914fil
....\hbox(0.0+0.0)x20.0
@@ -1888,6 +1888,92 @@ Completed box being shipped out [3]
....\OT1/cmr/m/n/10 =
...\penalty 0
...\glue(\belowdisplayskip) 12.0 plus 3.0 minus 9.0
+...\glue(\parskip) 0.0 plus 1.0
+...\glue(\parskip) 0.0
+...\hbox(0.0+0.0)x469.75499, glue set 167.89914fil
+....\hbox(0.0+0.0)x20.0
+....\hbox(0.0+0.0)x281.85585, glue set 140.92793fil
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\penalty 10000
+...\glue(\abovedisplayskip) 12.0 plus 3.0 minus 9.0
+...\glue(\lineskip) 0.0
+...\hbox(14.5+9.5)x25.13307, shifted 222.31096, display
+....\vbox(14.5+9.5)x25.13307
+.....\hbox(8.39996+3.60004)x25.13307
+......\glue(\tabskip) 0.0
+......\hbox(8.39996+3.60004)x5.28589
+.......\rule(8.39996+3.60004)x0.0
+.......\glue 0.0
+.......\mathon
+.......\OML/cmm/m/it/10 a
+.......\mathoff
+.......\glue 0.0 plus 1.0fil
+.......\glue 0.0
+......\glue(\tabskip) 0.0
+......\hbox(8.39996+3.60004)x15.55553
+.......\glue 0.0
+.......\mathon
+.......\OT1/cmr/m/n/10 =
+.......\pdfcolorstack 0 push {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
+.......\glue(\thickmuskip) 2.77771 plus 2.77771
+.......\OT1/cmr/m/n/10 1
+.......\pdfcolorstack 0 pop
+.......\mathoff
+.......\glue 0.0 plus 1.0fil
+.......\glue 0.0
+......\glue(\tabskip) 0.0
+......\hbox(8.39996+3.60004)x4.29166
+.......\glue 0.0
+.......\mathon
+.......\OML/cmm/m/it/10 b
+.......\mathoff
+.......\mathon
+.......\hbox(0.0+0.0)x0.0
+.......\mathoff
+.......\glue 0.0 plus 1.0fil
+.......\glue 0.0
+......\glue(\tabskip) 0.0
+.....\glue(\lineskip) 0.0
+.....\hbox(8.39996+3.60004)x25.13307
+......\glue(\tabskip) 0.0
+......\hbox(8.39996+3.60004)x5.28589
+.......\rule(8.39996+3.60004)x0.0
+.......\glue 0.0
+.......\mathon
+.......\OML/cmm/m/it/10 a
+.......\mathoff
+.......\glue 0.0 plus 1.0fil
+.......\glue 0.0
+......\glue(\tabskip) 0.0
+......\hbox(8.39996+3.60004)x15.55553
+.......\glue 0.0
+.......\mathon
+.......\OT1/cmr/m/n/10 =
+.......\pdfcolorstack 0 push {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
+.......\glue(\thickmuskip) 2.77771 plus 2.77771
+.......\OT1/cmr/m/n/10 1
+.......\pdfcolorstack 0 pop
+.......\mathoff
+.......\glue 0.0 plus 1.0fil
+.......\glue 0.0
+......\glue(\tabskip) 0.0
+......\hbox(8.39996+3.60004)x4.29166
+.......\glue 0.0
+.......\mathon
+.......\OML/cmm/m/it/10 b
+.......\mathoff
+.......\mathon
+.......\hbox(0.0+0.0)x0.0
+.......\mathoff
+.......\glue 0.0 plus 1.0fil
+.......\glue 0.0
+......\glue(\tabskip) 0.0
+...\penalty 0
+...\glue(\belowdisplayskip) 12.0 plus 3.0 minus 9.0
...\glue -4.0
...\glue 0.0 plus 1.0fil
...\glue 0.0
diff --git a/l3kernel/testfiles-backend/m3color004.uptex.tlg b/l3kernel/testfiles-backend/m3color004.uptex.tlg
index cca772b4f..6e2c1c9d9 100644
--- a/l3kernel/testfiles-backend/m3color004.uptex.tlg
+++ b/l3kernel/testfiles-backend/m3color004.uptex.tlg
@@ -1888,7 +1888,7 @@ Completed box being shipped out [3]
....\hbox(0.0+0.0)x469.75499
..\glue 0.0
..\glue(\lineskip) 0.0
-..\vbox(578.15999+0.0)x469.75499, glue set 525.93753fil
+..\vbox(578.15999+0.0)x469.75499, glue set 477.93753fil
...\glue(\topskip) 10.0
...\hbox(0.0+0.0)x469.75499, glue set 167.89914fil
....\hbox(0.0+0.0)x20.0
@@ -1960,6 +1960,94 @@ Completed box being shipped out [3]
....\OT1/cmr/m/n/10 =
...\penalty 0
...\glue(\belowdisplayskip) 12.0 plus 3.0 minus 9.0
+...\glue(\parskip) 0.0 plus 1.0
+...\glue(\parskip) 0.0
+...\hbox(0.0+0.0)x469.75499, glue set 167.89914fil
+....\hbox(0.0+0.0)x20.0
+....\hbox(0.0+0.0)x281.85585, glue set 140.92793fil
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\penalty 10000
+...\glue(\abovedisplayskip) 12.0 plus 3.0 minus 9.0
+...\glue(\lineskip) 0.0
+...\hbox(14.5+9.5)x25.13307, shifted 222.31096, display
+....\vbox(14.5+9.5)x25.13307
+.....\hbox(8.39996+3.60004)x25.13307
+......\glue(\tabskip) 0.0
+......\hbox(8.39996+3.60004)x5.28589
+.......\rule(8.39996+3.60004)x0.0
+.......\glue 0.0
+.......\mathon
+.......\OML/cmm/m/it/10 a
+.......\mathoff
+.......\glue 0.0 plus 1.0fil
+.......\glue 0.0
+......\glue(\tabskip) 0.0
+......\hbox(8.39996+3.60004)x15.55553
+.......\glue 0.0
+.......\mathon
+.......\OT1/cmr/m/n/10 =
+.......\special{color push rgb 1.0 0.0 0.0}
+.......\special{ps:SDict begin /color.sc {} def end}
+.......\glue(\thickmuskip) 2.77771 plus 2.77771
+.......\OT1/cmr/m/n/10 1
+.......\special{color pop}
+.......\mathoff
+.......\glue 0.0 plus 1.0fil
+.......\glue 0.0
+......\glue(\tabskip) 0.0
+......\hbox(8.39996+3.60004)x4.29166
+.......\glue 0.0
+.......\mathon
+.......\OML/cmm/m/it/10 b
+.......\mathoff
+.......\mathon
+.......\hbox(0.0+0.0)x0.0
+.......\mathoff
+.......\glue 0.0 plus 1.0fil
+.......\glue 0.0
+......\glue(\tabskip) 0.0
+.....\glue(\lineskip) 0.0
+.....\hbox(8.39996+3.60004)x25.13307
+......\glue(\tabskip) 0.0
+......\hbox(8.39996+3.60004)x5.28589
+.......\rule(8.39996+3.60004)x0.0
+.......\glue 0.0
+.......\mathon
+.......\OML/cmm/m/it/10 a
+.......\mathoff
+.......\glue 0.0 plus 1.0fil
+.......\glue 0.0
+......\glue(\tabskip) 0.0
+......\hbox(8.39996+3.60004)x15.55553
+.......\glue 0.0
+.......\mathon
+.......\OT1/cmr/m/n/10 =
+.......\special{color push rgb 1.0 0.0 0.0}
+.......\special{ps:SDict begin /color.sc {} def end}
+.......\glue(\thickmuskip) 2.77771 plus 2.77771
+.......\OT1/cmr/m/n/10 1
+.......\special{color pop}
+.......\mathoff
+.......\glue 0.0 plus 1.0fil
+.......\glue 0.0
+......\glue(\tabskip) 0.0
+......\hbox(8.39996+3.60004)x4.29166
+.......\glue 0.0
+.......\mathon
+.......\OML/cmm/m/it/10 b
+.......\mathoff
+.......\mathon
+.......\hbox(0.0+0.0)x0.0
+.......\mathoff
+.......\glue 0.0 plus 1.0fil
+.......\glue 0.0
+......\glue(\tabskip) 0.0
+...\penalty 0
+...\glue(\belowdisplayskip) 12.0 plus 3.0 minus 9.0
...\glue -4.0
...\glue 0.0 plus 1.0fil
...\glue 0.0
diff --git a/l3kernel/testfiles-backend/m3color004.xetex.tlg b/l3kernel/testfiles-backend/m3color004.xetex.tlg
index 1be16f597..6a746609d 100644
--- a/l3kernel/testfiles-backend/m3color004.xetex.tlg
+++ b/l3kernel/testfiles-backend/m3color004.xetex.tlg
@@ -1819,7 +1819,7 @@ Completed box being shipped out [3]
....\hbox(0.0+0.0)x469.75499
..\glue 0.0
..\glue(\lineskip) 0.0
-..\vbox(578.15999+0.0)x469.75499, glue set 525.93753fil
+..\vbox(578.15999+0.0)x469.75499, glue set 477.93753fil
...\glue(\topskip) 10.0
...\hbox(0.0+0.0)x469.75499, glue set 167.89914fil
....\hbox(0.0+0.0)x20.0
@@ -1888,6 +1888,92 @@ Completed box being shipped out [3]
....\OT1/cmr/m/n/10 =
...\penalty 0
...\glue(\belowdisplayskip) 12.0 plus 3.0 minus 9.0
+...\glue(\parskip) 0.0 plus 1.0
+...\glue(\parskip) 0.0
+...\hbox(0.0+0.0)x469.75499, glue set 167.89914fil
+....\hbox(0.0+0.0)x20.0
+....\hbox(0.0+0.0)x281.85585, glue set 140.92793fil
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\penalty 10000
+...\glue(\abovedisplayskip) 12.0 plus 3.0 minus 9.0
+...\glue(\lineskip) 0.0
+...\hbox(14.5+9.5)x25.13307, shifted 222.31096, display
+....\vbox(14.5+9.5)x25.13307
+.....\hbox(8.39996+3.60004)x25.13307
+......\glue(\tabskip) 0.0
+......\hbox(8.39996+3.60004)x5.28589
+.......\rule(8.39996+3.60004)x0.0
+.......\glue 0.0
+.......\mathon
+.......\OML/cmm/m/it/10 a
+.......\mathoff
+.......\glue 0.0 plus 1.0fil
+.......\glue 0.0
+......\glue(\tabskip) 0.0
+......\hbox(8.39996+3.60004)x15.55553
+.......\glue 0.0
+.......\mathon
+.......\OT1/cmr/m/n/10 =
+.......\special{pdf:bc [1.0 0.0 0.0]}
+.......\glue(\thickmuskip) 2.77771 plus 2.77771
+.......\OT1/cmr/m/n/10 1
+.......\special{pdf:ec}
+.......\mathoff
+.......\glue 0.0 plus 1.0fil
+.......\glue 0.0
+......\glue(\tabskip) 0.0
+......\hbox(8.39996+3.60004)x4.29166
+.......\glue 0.0
+.......\mathon
+.......\OML/cmm/m/it/10 b
+.......\mathoff
+.......\mathon
+.......\hbox(0.0+0.0)x0.0
+.......\mathoff
+.......\glue 0.0 plus 1.0fil
+.......\glue 0.0
+......\glue(\tabskip) 0.0
+.....\glue(\lineskip) 0.0
+.....\hbox(8.39996+3.60004)x25.13307
+......\glue(\tabskip) 0.0
+......\hbox(8.39996+3.60004)x5.28589
+.......\rule(8.39996+3.60004)x0.0
+.......\glue 0.0
+.......\mathon
+.......\OML/cmm/m/it/10 a
+.......\mathoff
+.......\glue 0.0 plus 1.0fil
+.......\glue 0.0
+......\glue(\tabskip) 0.0
+......\hbox(8.39996+3.60004)x15.55553
+.......\glue 0.0
+.......\mathon
+.......\OT1/cmr/m/n/10 =
+.......\special{pdf:bc [1.0 0.0 0.0]}
+.......\glue(\thickmuskip) 2.77771 plus 2.77771
+.......\OT1/cmr/m/n/10 1
+.......\special{pdf:ec}
+.......\mathoff
+.......\glue 0.0 plus 1.0fil
+.......\glue 0.0
+......\glue(\tabskip) 0.0
+......\hbox(8.39996+3.60004)x4.29166
+.......\glue 0.0
+.......\mathon
+.......\OML/cmm/m/it/10 b
+.......\mathoff
+.......\mathon
+.......\hbox(0.0+0.0)x0.0
+.......\mathoff
+.......\glue 0.0 plus 1.0fil
+.......\glue 0.0
+......\glue(\tabskip) 0.0
+...\penalty 0
+...\glue(\belowdisplayskip) 12.0 plus 3.0 minus 9.0
...\glue -4.0
...\glue 0.0 plus 1.0fil
...\glue 0.0
More information about the latex3-commits
mailing list.