[latex3-commits] [git/LaTeX3-latex3-latex2e] gh652-2: move incr at eqnum inside equation, issue #652 (57941583)
Ulrike Fischer
fischer at troubleshooting-tex.de
Tue Aug 24 16:21:24 CEST 2021
Repository : https://github.com/latex3/latex2e
On branch : gh652-2
Link : https://github.com/latex3/latex2e/commit/57941583d75a7843fb58baedd057b599b924e50b
>---------------------------------------------------------------
commit 57941583d75a7843fb58baedd057b599b924e50b
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date: Tue Aug 24 16:21:24 2021 +0200
move incr at eqnum inside equation, issue #652
>---------------------------------------------------------------
57941583d75a7843fb58baedd057b599b924e50b
required/amsmath/amsmath.dtx | 17 +-
required/amsmath/changes.txt | 5 +
required/amsmath/testfiles/amsldoc-1.luatex.tlg | 2 +
required/amsmath/testfiles/amsldoc-1.tlg | 2 +
required/amsmath/testfiles/amsldoc-2.luatex.tlg | 1 +
required/amsmath/testfiles/amsldoc-2.tlg | 1 +
required/amsmath/testfiles/amsldoc-2.xetex.tlg | 1 +
...doc-4.luatex.tlg => amsldoc-4-fleqn.luatex.tlg} | 349 +++++++++++----------
.../{amsldoc-4.lvt => amsldoc-4-fleqn.lvt} | 2 +-
.../{amsldoc-4.tlg => amsldoc-4-fleqn.tlg} | 347 ++++++++++----------
required/amsmath/testfiles/amsldoc-4.luatex.tlg | 2 +
required/amsmath/testfiles/amsldoc-4.tlg | 2 +
required/amsmath/testfiles/amsldoc-5.luatex.tlg | 6 +
required/amsmath/testfiles/amsldoc-5.tlg | 6 +
required/amsmath/testfiles/amsldoc-5.xetex.tlg | 6 +
15 files changed, 413 insertions(+), 336 deletions(-)
diff --git a/required/amsmath/amsmath.dtx b/required/amsmath/amsmath.dtx
index 17c11314..3263893e 100644
--- a/required/amsmath/amsmath.dtx
+++ b/required/amsmath/amsmath.dtx
@@ -6502,8 +6502,22 @@ Cannot use `split' here;\MessageBreak trying to recover with `aligned'}%
\let\mathdisplay at pop\@empty
\def\mathdisplay@@pop{\the\mathdisplay at stack}
% \end{macrocode}
-%
+%\changes{v2.17k}{2021/08/24}{Move the counter inside the equation and guard
+% with a mathopen for better compability with hyperref, issue gh/652}
+% If fleqn is activated it has to be outside to avoid problems with labels.
% \begin{macrocode}
+\if at fleqn
+\renewenvironment{equation}{%
+ \incr at eqnum
+ \mathdisplay at push
+ \st at rredfalse \global\@eqnswtrue
+ \mathdisplay{equation}%
+}{%
+ \endmathdisplay{equation}%
+ \mathdisplay at pop
+ \ignorespacesafterend
+}
+\else
\renewenvironment{equation}{%
\mathdisplay at push
\st at rredfalse \global\@eqnswtrue
@@ -6514,6 +6528,7 @@ Cannot use `split' here;\MessageBreak trying to recover with `aligned'}%
\mathdisplay at pop
\ignorespacesafterend
}
+\fi
% \end{macrocode}
%
% \begin{macrocode}
diff --git a/required/amsmath/changes.txt b/required/amsmath/changes.txt
index 63bea7e7..a07a5cee 100644
--- a/required/amsmath/changes.txt
+++ b/required/amsmath/changes.txt
@@ -2,6 +2,11 @@
All changes above are only part of the development branch for the next release.
================================================================================
+2021-08-24 Ulrike Fischer <Ulrike.Fischer at latex-project.org>
+ * amsmath.dtx (subsection{Implementing tags and labels}):
+ move \incr at eqnum inside the equation if fleqn isn't used and guard
+ it with a mathopen for better compability with hyperref, issue gh/652
+
#########################
# 2021-06-01 Release
#########################
diff --git a/required/amsmath/testfiles/amsldoc-1.luatex.tlg b/required/amsmath/testfiles/amsldoc-1.luatex.tlg
index 239d78f6..03784585 100644
--- a/required/amsmath/testfiles/amsldoc-1.luatex.tlg
+++ b/required/amsmath/testfiles/amsldoc-1.luatex.tlg
@@ -74,6 +74,7 @@ Completed box being shipped out [1]
...\hbox(7.5+2.5)x345.0, direction TLT
....\kern161.04462 (font)
....\hbox(6.94444+0.0)x22.91077, direction TLT
+.....\hbox(0.0+0.0)x0.0, direction TLT
.....\OML/cmm/m/it/10 a
.....\glue(\thickmuskip) 2.77771 plus 2.77771
.....\OT1/cmr/m/n/10 =
@@ -110,6 +111,7 @@ Completed box being shipped out [1]
...\glue(\abovedisplayskip) 10.0 plus 2.0 minus 5.0
...\glue(\lineskip) 4.0
...\hbox(29.5+24.5)x345.0, direction TLT
+....\hbox(0.0+0.0)x0.0, direction TLT
....\vbox(29.5+24.5)x345.0, direction TLT
.....\glue -3.0
.....\glue 0.0
diff --git a/required/amsmath/testfiles/amsldoc-1.tlg b/required/amsmath/testfiles/amsldoc-1.tlg
index fb7f54b8..eab4b66b 100644
--- a/required/amsmath/testfiles/amsldoc-1.tlg
+++ b/required/amsmath/testfiles/amsldoc-1.tlg
@@ -59,6 +59,7 @@ Completed box being shipped out [1]
...\glue(\baselineskip) 2.55556
...\hbox(7.5+2.5)x183.95538, shifted 161.04462
....\hbox(6.94444+0.0)x22.91077, display
+.....\hbox(0.0+0.0)x0.0
.....\OML/cmm/m/it/10 a
.....\glue(\thickmuskip) 2.77771 plus 2.77771
.....\OT1/cmr/m/n/10 =
@@ -90,6 +91,7 @@ Completed box being shipped out [1]
...\glue(\abovedisplayskip) 10.0 plus 2.0 minus 5.0
...\glue(\lineskip) 4.0
...\hbox(29.5+24.5)x345.0, display
+....\hbox(0.0+0.0)x0.0
....\vbox(29.5+24.5)x345.0
.....\glue -3.0
.....\glue 0.0
diff --git a/required/amsmath/testfiles/amsldoc-2.luatex.tlg b/required/amsmath/testfiles/amsldoc-2.luatex.tlg
index 8e521eb8..760e1a04 100644
--- a/required/amsmath/testfiles/amsldoc-2.luatex.tlg
+++ b/required/amsmath/testfiles/amsldoc-2.luatex.tlg
@@ -221,6 +221,7 @@ Completed box being shipped out [1]
...\glue(\abovedisplayskip) 10.0 plus 2.0 minus 5.0
...\glue(\lineskip) 4.0
...\hbox(34.56606+29.56604)x345.0, direction TLT
+....\hbox(0.0+0.0)x0.0, direction TLT
....\vbox(34.56606+29.56604)x345.0, direction TLT
.....\glue -3.0
.....\glue 0.0
diff --git a/required/amsmath/testfiles/amsldoc-2.tlg b/required/amsmath/testfiles/amsldoc-2.tlg
index a203f4df..9cf918f5 100644
--- a/required/amsmath/testfiles/amsldoc-2.tlg
+++ b/required/amsmath/testfiles/amsldoc-2.tlg
@@ -209,6 +209,7 @@ Completed box being shipped out [1]
...\glue(\abovedisplayskip) 10.0 plus 2.0 minus 5.0
...\glue(\lineskip) 4.0
...\hbox(34.56606+29.56604)x345.0, display
+....\hbox(0.0+0.0)x0.0
....\vbox(34.56606+29.56604)x345.0
.....\glue -3.0
.....\glue 0.0
diff --git a/required/amsmath/testfiles/amsldoc-2.xetex.tlg b/required/amsmath/testfiles/amsldoc-2.xetex.tlg
index edeaf28e..84015a44 100644
--- a/required/amsmath/testfiles/amsldoc-2.xetex.tlg
+++ b/required/amsmath/testfiles/amsldoc-2.xetex.tlg
@@ -209,6 +209,7 @@ Completed box being shipped out [1]
...\glue(\abovedisplayskip) 10.0 plus 2.0 minus 5.0
...\glue(\lineskip) 4.0
...\hbox(34.56606+29.56604)x345.0, display
+....\hbox(0.0+0.0)x0.0
....\vbox(34.56606+29.56604)x345.0
.....\glue -3.0
.....\glue 0.0
diff --git a/required/amsmath/testfiles/amsldoc-4.luatex.tlg b/required/amsmath/testfiles/amsldoc-4-fleqn.luatex.tlg
similarity index 80%
copy from required/amsmath/testfiles/amsldoc-4.luatex.tlg
copy to required/amsmath/testfiles/amsldoc-4-fleqn.luatex.tlg
index 498234ba..6986d501 100644
--- a/required/amsmath/testfiles/amsldoc-4.luatex.tlg
+++ b/required/amsmath/testfiles/amsldoc-4-fleqn.luatex.tlg
@@ -10,7 +10,7 @@ Completed box being shipped out [1]
....\hbox(0.0+0.0)x345.0, direction TLT
..\glue 25.0
..\glue(\lineskip) 0.0
-..\vbox(550.0+0.0)x345.0, glue set 276.99628fil, direction TLT
+..\vbox(550.0+0.0)x345.0, glue set 235.00076fil, direction TLT
...\write-{}
...\glue(\topskip) 3.05556
...\hbox(6.94444+1.94444)x345.0, glue set 298.8888fil, direction TLT
@@ -31,138 +31,143 @@ Completed box being shipped out [1]
....\glue(\parfillskip) 0.0 plus 1.0fil
....\glue(\rightskip) 0.0
...\penalty 10000
-...\glue(\abovedisplayshortskip) 0.0 plus 3.0
+...\glue(\abovedisplayskip) 10.0 plus 2.0 minus 5.0
...\glue(\lineskip) 1.0
-...\hbox(17.50014+12.50015)x201.07095, shifted 71.96452, direction TLT
-....\hbox(17.50014+12.50015)x91.51524, direction TLT
-.....\hbox(0.0+0.0)x1.2, shifted -2.5, direction TLT
-.....\hbox(0.0+0.0)x0.0, direction TLT
-.....\glue 1.66663
-.....\vbox(16.0+11.0)x80.59303, direction TLT
-......\hbox(8.39996+3.60004)x80.59303, direction TLT
-.......\glue(\tabskip) 0.0
-.......\hbox(8.39996+3.60004)x10.89236, direction TLT
-........\glue 0.0 plus 1.0fil
-........\hbox(8.39996+3.60004)x0.0, direction TLT
-.........\vbox(8.39996+3.60004)x0.0, direction TLT
-..........\kern0.0
-..........\hbox(8.39996+3.60004)x0.0, direction TLT
-...........\rule(8.39996+3.60004)x0.0
-........\mathon
-........\hbox(8.01782+0.0)x10.89236, direction TLT
-.........\OML/cmm/m/it/10 B
-.........\kern0.50172 (italic)
-.........\hbox(3.8889+0.0)x2.80556, shifted -4.12892, direction TLT
-..........\OMS/cmsy/m/n/7 0
-........\mathoff
-.......\glue(\tabskip) 0.0
-.......\hbox(8.39996+3.60004)x69.70067, glue set 19.76683fil, direction TLT
-........\mathon
-........\hbox(6.94444+1.94444)x49.93384, direction TLT
-.........\hbox(0.0+0.0)x0.0, direction TLT
-.........\glue(\thickmuskip) 2.77771 plus 2.77771
-.........\OT1/cmr/m/n/10 =
-.........\glue(\thickmuskip) 2.77771 plus 2.77771
-.........\OMS/cmsy/m/n/10 ^^@
-.........\OML/cmm/m/it/10 @
-.........\kern0.55554 (italic)
-.........\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
-.........\OMS/cmsy/m/n/10 ^^B
-.........\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
-.........\OML/cmm/m/it/10 E
-.........\kern0.57637 (italic)
-.........\OML/cmm/m/it/10 ;
-........\mathoff
-........\glue 0.0 plus 1.0fil
-.......\glue(\tabskip) 10.0
-.......\hbox(8.39996+3.60004)x-10.0, direction TLT
-........\glue 0.0 plus 1.0fil
-........\hbox(8.39996+3.60004)x0.0, direction TLT
-.........\vbox(8.39996+3.60004)x0.0, direction TLT
-..........\kern0.0
-..........\hbox(8.39996+3.60004)x0.0, direction TLT
-...........\rule(8.39996+3.60004)x0.0
-........\mathon
-........\hbox(0.0+0.0)x-10.0, direction TLT
-.........\kern-10.0
-........\mathoff
-.......\glue(\tabskip) 0.0
-......\glue 0.0
-......\glue(\baselineskip) 3.0
-......\hbox(8.39996+3.60004)x80.59303, direction TLT
-.......\glue(\tabskip) 0.0
-.......\hbox(8.39996+3.60004)x10.89236, glue set 0.1285fil, direction TLT
-........\glue 0.0 plus 1.0fil
-........\hbox(8.39996+3.60004)x0.0, direction TLT
-.........\vbox(8.39996+3.60004)x0.0, direction TLT
-..........\kern0.0
-..........\hbox(8.39996+3.60004)x0.0, direction TLT
-...........\rule(8.39996+3.60004)x0.0
-........\mathon
-........\hbox(8.01782+0.0)x10.76387, direction TLT
-.........\OML/cmm/m/it/10 E
-.........\kern0.57637 (italic)
-.........\hbox(3.8889+0.0)x2.80556, shifted -4.12892, direction TLT
-..........\OMS/cmsy/m/n/7 0
-........\mathoff
-.......\glue(\tabskip) 0.0
-.......\hbox(8.39996+3.60004)x69.70067, direction TLT
-........\mathon
-........\hbox(6.94444+1.94444)x69.70067, direction TLT
-.........\hbox(0.0+0.0)x0.0, direction TLT
-.........\glue(\thickmuskip) 2.77771 plus 2.77771
-.........\OT1/cmr/m/n/10 =
-.........\glue(\thickmuskip) 2.77771 plus 2.77771
-.........\OML/cmm/m/it/10 @
-.........\kern0.55554 (italic)
-.........\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
-.........\OMS/cmsy/m/n/10 ^^B
-.........\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
-.........\OML/cmm/m/it/10 B
-.........\kern0.50172 (italic)
-.........\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
-.........\OMS/cmsy/m/n/10 ^^@
-.........\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
-.........\OT1/cmr/m/n/10 4
-.........\OML/cmm/m/it/10 ^^Y
-.........\kern0.35878 (italic)
-.........\OML/cmm/m/it/10 j
-.........\kern0.57243 (italic)
-.........\kern-0.55556 (font)
-.........\OML/cmm/m/it/10 ;
-........\mathoff
-........\glue 0.0 plus 1.0fil
-.......\glue(\tabskip) 10.0
-.....\hbox(0.39998+29.60031)x8.05559, shifted -17.10016, direction TLT
-......\OMX/cmex/m/n/10 )
-....\glue 20.00003
-....\glue(\thinmuskip) 1.66663
-....\hbox(6.94444+1.94444)x87.88905, direction TLT
+...\hbox(17.50014+12.50015)x345.0, direction TLT
+....\hbox(17.50014+12.50015)x345.0, glue set 118.92902fil, direction TLT
+.....\glue 25.00003 minus 25.00003
+.....\mathon
+.....\hbox(17.50014+12.50015)x91.51524, direction TLT
+......\hbox(0.0+0.0)x1.2, shifted -2.5, direction TLT
+......\hbox(0.0+0.0)x0.0, direction TLT
+......\glue 1.66663
+......\vbox(16.0+11.0)x80.59303, direction TLT
+.......\hbox(8.39996+3.60004)x80.59303, direction TLT
+........\glue(\tabskip) 0.0
+........\hbox(8.39996+3.60004)x10.89236, direction TLT
+.........\glue 0.0 plus 1.0fil
+.........\hbox(8.39996+3.60004)x0.0, direction TLT
+..........\vbox(8.39996+3.60004)x0.0, direction TLT
+...........\kern0.0
+...........\hbox(8.39996+3.60004)x0.0, direction TLT
+............\rule(8.39996+3.60004)x0.0
+.........\mathon
+.........\hbox(8.01782+0.0)x10.89236, direction TLT
+..........\OML/cmm/m/it/10 B
+..........\kern0.50172 (italic)
+..........\hbox(3.8889+0.0)x2.80556, shifted -4.12892, direction TLT
+...........\OMS/cmsy/m/n/7 0
+.........\mathoff
+........\glue(\tabskip) 0.0
+........\hbox(8.39996+3.60004)x69.70067, glue set 19.76683fil, direction TLT
+.........\mathon
+.........\hbox(6.94444+1.94444)x49.93384, direction TLT
+..........\hbox(0.0+0.0)x0.0, direction TLT
+..........\glue(\thickmuskip) 2.77771 plus 2.77771
+..........\OT1/cmr/m/n/10 =
+..........\glue(\thickmuskip) 2.77771 plus 2.77771
+..........\OMS/cmsy/m/n/10 ^^@
+..........\OML/cmm/m/it/10 @
+..........\kern0.55554 (italic)
+..........\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
+..........\OMS/cmsy/m/n/10 ^^B
+..........\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
+..........\OML/cmm/m/it/10 E
+..........\kern0.57637 (italic)
+..........\OML/cmm/m/it/10 ;
+.........\mathoff
+.........\glue 0.0 plus 1.0fil
+........\glue(\tabskip) 10.0
+........\hbox(8.39996+3.60004)x-10.0, direction TLT
+.........\glue 0.0 plus 1.0fil
+.........\hbox(8.39996+3.60004)x0.0, direction TLT
+..........\vbox(8.39996+3.60004)x0.0, direction TLT
+...........\kern0.0
+...........\hbox(8.39996+3.60004)x0.0, direction TLT
+............\rule(8.39996+3.60004)x0.0
+.........\mathon
+.........\hbox(0.0+0.0)x-10.0, direction TLT
+..........\kern-10.0
+.........\mathoff
+........\glue(\tabskip) 0.0
+.......\glue 0.0
+.......\glue(\baselineskip) 3.0
+.......\hbox(8.39996+3.60004)x80.59303, direction TLT
+........\glue(\tabskip) 0.0
+........\hbox(8.39996+3.60004)x10.89236, glue set 0.1285fil, direction TLT
+.........\glue 0.0 plus 1.0fil
+.........\hbox(8.39996+3.60004)x0.0, direction TLT
+..........\vbox(8.39996+3.60004)x0.0, direction TLT
+...........\kern0.0
+...........\hbox(8.39996+3.60004)x0.0, direction TLT
+............\rule(8.39996+3.60004)x0.0
+.........\mathon
+.........\hbox(8.01782+0.0)x10.76387, direction TLT
+..........\OML/cmm/m/it/10 E
+..........\kern0.57637 (italic)
+..........\hbox(3.8889+0.0)x2.80556, shifted -4.12892, direction TLT
+...........\OMS/cmsy/m/n/7 0
+.........\mathoff
+........\glue(\tabskip) 0.0
+........\hbox(8.39996+3.60004)x69.70067, direction TLT
+.........\mathon
+.........\hbox(6.94444+1.94444)x69.70067, direction TLT
+..........\hbox(0.0+0.0)x0.0, direction TLT
+..........\glue(\thickmuskip) 2.77771 plus 2.77771
+..........\OT1/cmr/m/n/10 =
+..........\glue(\thickmuskip) 2.77771 plus 2.77771
+..........\OML/cmm/m/it/10 @
+..........\kern0.55554 (italic)
+..........\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
+..........\OMS/cmsy/m/n/10 ^^B
+..........\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
+..........\OML/cmm/m/it/10 B
+..........\kern0.50172 (italic)
+..........\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
+..........\OMS/cmsy/m/n/10 ^^@
+..........\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
+..........\OT1/cmr/m/n/10 4
+..........\OML/cmm/m/it/10 ^^Y
+..........\kern0.35878 (italic)
+..........\OML/cmm/m/it/10 j
+..........\kern0.57243 (italic)
+..........\kern-0.55556 (font)
+..........\OML/cmm/m/it/10 ;
+.........\mathoff
+.........\glue 0.0 plus 1.0fil
+........\glue(\tabskip) 10.0
+......\hbox(0.39998+29.60031)x8.05559, shifted -17.10016, direction TLT
+.......\OMX/cmex/m/n/10 )
+.....\glue 20.00003
+.....\glue(\thinmuskip) 1.66663
.....\hbox(6.94444+1.94444)x87.88905, direction TLT
-......\OT1/cmr/m/n/10 M
-......\OT1/cmr/m/n/10 a
-......\OT1/cmr/m/n/10 x
-......\OT1/cmr/m/n/10 w
-......\kern-0.27779 (font)
-......\OT1/cmr/m/n/10 e
-......\OT1/cmr/m/n/10 l
-......\OT1/cmr/m/n/10 l
-......\OT1/cmr/m/n/10 '
-......\OT1/cmr/m/n/10 s
-......\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
-......\OT1/cmr/m/n/10 e
-......\OT1/cmr/m/n/10 q
-......\OT1/cmr/m/n/10 u
-......\OT1/cmr/m/n/10 a
-......\discretionary (penalty 50)
-.......< \OT1/cmr/m/n/10 -
-......\OT1/cmr/m/n/10 t
-......\OT1/cmr/m/n/10 i
-......\OT1/cmr/m/n/10 o
-......\OT1/cmr/m/n/10 n
-......\OT1/cmr/m/n/10 s
+......\hbox(6.94444+1.94444)x87.88905, direction TLT
+.......\OT1/cmr/m/n/10 M
+.......\OT1/cmr/m/n/10 a
+.......\OT1/cmr/m/n/10 x
+.......\OT1/cmr/m/n/10 w
+.......\kern-0.27779 (font)
+.......\OT1/cmr/m/n/10 e
+.......\OT1/cmr/m/n/10 l
+.......\OT1/cmr/m/n/10 l
+.......\OT1/cmr/m/n/10 '
+.......\OT1/cmr/m/n/10 s
+.......\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
+.......\OT1/cmr/m/n/10 e
+.......\OT1/cmr/m/n/10 q
+.......\OT1/cmr/m/n/10 u
+.......\OT1/cmr/m/n/10 a
+.......\discretionary (penalty 50)
+........< \OT1/cmr/m/n/10 -
+.......\OT1/cmr/m/n/10 t
+.......\OT1/cmr/m/n/10 i
+.......\OT1/cmr/m/n/10 o
+.......\OT1/cmr/m/n/10 n
+.......\OT1/cmr/m/n/10 s
+.....\mathoff
+.....\glue 0.0 plus 1.0fil
...\penalty 0
-...\glue(\belowdisplayshortskip) 6.0 plus 3.0 minus 3.0
+...\glue(\belowdisplayskip) 10.0 plus 2.0 minus 5.0
...\glue(\parskip) 0.0 plus 1.0
...\glue(\parskip) 0.0
...\glue(\lineskip) 1.0
@@ -182,11 +187,12 @@ Completed box being shipped out [1]
....\glue(\parfillskip) 0.0 plus 1.0fil
....\glue(\rightskip) 0.0
...\penalty 10000
-...\glue(\abovedisplayshortskip) 0.0 plus 3.0
+...\glue(\abovedisplayskip) 10.0 plus 2.0 minus 5.0
...\glue(\lineskip) 1.0
...\hbox(17.50014+12.50015)x345.0, direction TLT
-....\kern83.30238 (font)
-....\hbox(17.50014+12.50015)x178.39523, direction TLT
+....\hbox(17.50014+12.50015)x345.0, glue set 61.91347fil, direction TLT
+.....\glue 25.00003 minus 25.00003
+.....\mathon
.....\OML/cmm/m/it/10 P
.....\hbox(4.63193+1.3611)x14.39183, shifted 1.49998, direction TLT
......\OML/cmm/m/it/7 r
@@ -312,16 +318,19 @@ Completed box being shipped out [1]
.........\mathoff
........\glue(\tabskip) 0.0
......\hbox(0.0+0.0)x1.2, shifted -2.5, direction TLT
-....\kern70.52457 (font)
-....\hbox(7.5+2.5)x12.77782, direction TLT
+.....\mathoff
+.....\glue 0.0 plus 1.0fil
+.....\glue 0.0 plus 1.0fil
+.....\glue 5.0
.....\hbox(7.5+2.5)x12.77782, direction TLT
-......\OT1/cmr/m/n/10 (
-......\OT1/cmr/m/n/10 1
-......\kern0.0 (italic)
-......\OT1/cmr/m/n/10 )
-.....\write1{\newlabel{eq:C}{{1}{\thepage }}}
+......\hbox(7.5+2.5)x12.77782, direction TLT
+.......\OT1/cmr/m/n/10 (
+.......\OT1/cmr/m/n/10 1
+.......\kern0.0 (italic)
+.......\OT1/cmr/m/n/10 )
+......\write1{\newlabel{eq:C}{{1}{\thepage }}}
...\penalty 0
-...\glue(\belowdisplayshortskip) 6.0 plus 3.0 minus 3.0
+...\glue(\belowdisplayskip) 10.0 plus 2.0 minus 5.0
...\glue(\parskip) 0.0 plus 1.0
...\glue(\parskip) 0.0
...\glue(\lineskip) 1.0
@@ -355,7 +364,7 @@ Completed box being shipped out [1]
...\glue 0.0
...\glue(\baselineskip) 6.60004
...\hbox(8.39996+3.60004)x345.0, direction TLT
-....\glue(\tabskip) 115.0174
+....\glue(\tabskip) 25.00003
....\hbox(8.39996+3.60004)x11.98615, direction TLT
.....\glue 0.0 plus 1.0fil
.....\hbox(8.39996+3.60004)x0.0, direction TLT
@@ -405,10 +414,10 @@ Completed box being shipped out [1]
.......\OML/cmm/m/it/10 ;
......\mathoff
.....\glue 0.0 plus 1.0fil
-....\glue(\tabskip) 115.0174
-....\hbox(8.39996+3.60004)x0.00002, direction TLT
-.....\kern-115.0174
-.....\kern115.01741
+....\glue(\tabskip) 205.03477
+....\hbox(8.39996+3.60004)x0.0, direction TLT
+.....\kern-205.03477
+.....\kern205.03477
.....\hbox(8.39996+3.60004)x0.0, glue set - 12.77782fil, direction TLT
......\glue 0.0 plus 1.0fil minus 1.0fil
......\hbox(8.39996+3.60004)x12.77782, direction TLT
@@ -427,7 +436,7 @@ Completed box being shipped out [1]
...\glue 0.0
...\glue(\baselineskip) 3.0
...\hbox(8.39996+3.60004)x345.0, direction TLT
-....\glue(\tabskip) 115.0174
+....\glue(\tabskip) 25.00003
....\hbox(8.39996+3.60004)x11.98615, direction TLT
.....\glue 0.0 plus 1.0fil
.....\hbox(8.39996+3.60004)x0.0, direction TLT
@@ -473,10 +482,10 @@ Completed box being shipped out [1]
.......\OML/cmm/m/it/10 ;
......\mathoff
.....\glue 0.0 plus 1.0fil
-....\glue(\tabskip) 115.0174
-....\hbox(8.39996+3.60004)x0.00002, direction TLT
-.....\kern-115.0174
-.....\kern115.01741
+....\glue(\tabskip) 205.03477
+....\hbox(8.39996+3.60004)x0.0, direction TLT
+.....\kern-205.03477
+.....\kern205.03477
.....\hbox(8.39996+3.60004)x0.0, glue set - 12.77782fil, direction TLT
......\glue 0.0 plus 1.0fil minus 1.0fil
......\hbox(8.39996+3.60004)x12.77782, direction TLT
@@ -513,7 +522,7 @@ Completed box being shipped out [1]
...\glue 10.0 plus 2.0 minus 5.0
...\glue(\baselineskip) 6.60004
...\hbox(8.39996+3.60004)x345.0, direction TLT
-....\glue(\tabskip) 115.0174
+....\glue(\tabskip) 25.00003
....\hbox(8.39996+3.60004)x11.98615, direction TLT
.....\glue 0.0 plus 1.0fil
.....\hbox(8.39996+3.60004)x0.0, direction TLT
@@ -549,10 +558,10 @@ Completed box being shipped out [1]
.......\OML/cmm/m/it/10 :
......\mathoff
.....\glue 0.0 plus 1.0fil
-....\glue(\tabskip) 115.0174
-....\hbox(8.39996+3.60004)x0.00002, direction TLT
-.....\kern-115.0174
-.....\kern115.01741
+....\glue(\tabskip) 205.03477
+....\hbox(8.39996+3.60004)x0.0, direction TLT
+.....\kern-205.03477
+.....\kern205.03477
.....\hbox(8.39996+3.60004)x0.0, glue set - 12.77782fil, direction TLT
......\glue 0.0 plus 1.0fil minus 1.0fil
......\hbox(8.39996+3.60004)x12.77782, direction TLT
@@ -682,11 +691,12 @@ Completed box being shipped out [1]
....\glue(\parfillskip) 0.0 plus 1.0fil
....\glue(\rightskip) 0.0
...\penalty 10000
-...\glue(\abovedisplayshortskip) 0.0 plus 3.0
+...\glue(\abovedisplayskip) 10.0 plus 2.0 minus 5.0
...\glue(\lineskip) 1.0
...\hbox(26.50023+21.50023)x345.0, direction TLT
-....\kern93.49698 (font)
-....\hbox(26.50023+21.50023)x158.00606, direction TLT
+....\hbox(26.50023+21.50023)x345.0, glue set 72.10805fil, direction TLT
+.....\glue 25.00003 minus 25.00003
+.....\mathon
.....\hbox(26.50023+21.50023)x153.56165, direction TLT
......\vbox(48.00046+0.0)x8.75002, shifted 21.50023, direction TLT
.......\hbox(0.39998+17.60019)x8.75002, direction TLT
@@ -936,16 +946,19 @@ Completed box being shipped out [1]
........\OMX/cmex/m/n/10 A
.....\glue(\thinmuskip) 1.66663
.....\OML/cmm/m/it/10 ;
-....\kern80.71915 (font)
-....\hbox(7.5+2.5)x12.77782, direction TLT
+.....\mathoff
+.....\glue 0.0 plus 1.0fil
+.....\glue 0.0 plus 1.0fil
+.....\glue 5.0
.....\hbox(7.5+2.5)x12.77782, direction TLT
-......\OT1/cmr/m/n/10 (
-......\OT1/cmr/m/n/10 5
-......\kern0.0 (italic)
-......\OT1/cmr/m/n/10 )
-.....\write1{\newlabel{eq:D}{{5}{\thepage }}}
+......\hbox(7.5+2.5)x12.77782, direction TLT
+.......\OT1/cmr/m/n/10 (
+.......\OT1/cmr/m/n/10 5
+.......\kern0.0 (italic)
+.......\OT1/cmr/m/n/10 )
+......\write1{\newlabel{eq:D}{{5}{\thepage }}}
...\penalty 0
-...\glue(\belowdisplayshortskip) 6.0 plus 3.0 minus 3.0
+...\glue(\belowdisplayskip) 10.0 plus 2.0 minus 5.0
...\glue -5.0
...\glue 0.0 plus 1.0fil
...\glue 0.0
@@ -956,4 +969,4 @@ Completed box being shipped out [1]
....\glue 0.0 plus 1.0fil
....\OT1/cmr/m/n/10 1
....\glue 0.0 plus 1.0fil
-(amsldoc-4.aux)
+(amsldoc-4-fleqn.aux)
diff --git a/required/amsmath/testfiles/amsldoc-4.lvt b/required/amsmath/testfiles/amsldoc-4-fleqn.lvt
similarity index 95%
copy from required/amsmath/testfiles/amsldoc-4.lvt
copy to required/amsmath/testfiles/amsldoc-4-fleqn.lvt
index 59316e93..ab9d2c9b 100644
--- a/required/amsmath/testfiles/amsldoc-4.lvt
+++ b/required/amsmath/testfiles/amsldoc-4-fleqn.lvt
@@ -1,4 +1,4 @@
-\documentclass{article}
+\documentclass[fleqn]{article}
\usepackage[alignedleftspaceyes]{amsmath}
diff --git a/required/amsmath/testfiles/amsldoc-4.tlg b/required/amsmath/testfiles/amsldoc-4-fleqn.tlg
similarity index 79%
copy from required/amsmath/testfiles/amsldoc-4.tlg
copy to required/amsmath/testfiles/amsldoc-4-fleqn.tlg
index fb70bf54..e2ddc09e 100644
--- a/required/amsmath/testfiles/amsldoc-4.tlg
+++ b/required/amsmath/testfiles/amsldoc-4-fleqn.tlg
@@ -10,7 +10,7 @@ Completed box being shipped out [1]
....\hbox(0.0+0.0)x345.0
..\glue 25.0
..\glue(\lineskip) 0.0
-..\vbox(550.0+0.0)x345.0, glue set 276.99628fil
+..\vbox(550.0+0.0)x345.0, glue set 235.00076fil
...\write-{}
...\glue(\topskip) 3.05556
...\hbox(6.94444+1.94444)x345.0, glue set 298.88881fil
@@ -26,136 +26,141 @@ Completed box being shipped out [1]
....\glue(\parfillskip) 0.0 plus 1.0fil
....\glue(\rightskip) 0.0
...\penalty 10000
-...\glue(\abovedisplayshortskip) 0.0 plus 3.0
+...\glue(\abovedisplayskip) 10.0 plus 2.0 minus 5.0
...\glue(\lineskip) 1.0
-...\hbox(17.50014+12.50015)x201.07095, shifted 71.96452, display
-....\hbox(17.50014+12.50015)x91.51524
-.....\hbox(0.0+0.0)x1.2, shifted -2.5
-.....\hbox(0.0+0.0)x0.0
-.....\glue 1.66663
-.....\vbox(16.0+11.0)x80.59303
-......\hbox(8.39996+3.60004)x80.59303
-.......\glue(\tabskip) 0.0
-.......\hbox(8.39996+3.60004)x10.89236
-........\glue 0.0 plus 1.0fil
-........\hbox(8.39996+3.60004)x0.0
-.........\vbox(8.39996+3.60004)x0.0
-..........\kern 0.0
-..........\hbox(8.39996+3.60004)x0.0
-...........\rule(8.39996+3.60004)x0.0
-........\mathon
-........\hbox(8.01782+0.0)x10.89236
-.........\OML/cmm/m/it/10 B
-.........\kern0.50172
-.........\hbox(3.8889+0.0)x2.80556, shifted -4.12892
-..........\OMS/cmsy/m/n/7 0
-........\mathoff
-.......\glue(\tabskip) 0.0
-.......\hbox(8.39996+3.60004)x69.70067, glue set 19.76683fil
-........\mathon
-........\hbox(6.94444+1.94444)x49.93384
-.........\hbox(0.0+0.0)x0.0
-.........\glue(\thickmuskip) 2.77771 plus 2.77771
-.........\OT1/cmr/m/n/10 =
-.........\glue(\thickmuskip) 2.77771 plus 2.77771
-.........\OMS/cmsy/m/n/10 ^^@
-.........\OML/cmm/m/it/10 @
-.........\kern0.55554
-.........\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
-.........\OMS/cmsy/m/n/10 ^^B
-.........\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
-.........\OML/cmm/m/it/10 E
-.........\kern0.57637
-.........\OML/cmm/m/it/10 ;
-........\mathoff
-........\glue 0.0 plus 1.0fil
-.......\glue(\tabskip) 10.0
-.......\hbox(8.39996+3.60004)x-10.0
-........\glue 0.0 plus 1.0fil
-........\hbox(8.39996+3.60004)x0.0
-.........\vbox(8.39996+3.60004)x0.0
-..........\kern 0.0
-..........\hbox(8.39996+3.60004)x0.0
-...........\rule(8.39996+3.60004)x0.0
-........\mathon
-........\hbox(0.0+0.0)x-10.0
-.........\kern -10.0
-........\mathoff
-.......\glue(\tabskip) 0.0
-......\glue 0.0
-......\glue(\baselineskip) 3.0
-......\hbox(8.39996+3.60004)x80.59303
-.......\glue(\tabskip) 0.0
-.......\hbox(8.39996+3.60004)x10.89236, glue set 0.1285fil
-........\glue 0.0 plus 1.0fil
-........\hbox(8.39996+3.60004)x0.0
-.........\vbox(8.39996+3.60004)x0.0
-..........\kern 0.0
-..........\hbox(8.39996+3.60004)x0.0
-...........\rule(8.39996+3.60004)x0.0
-........\mathon
-........\hbox(8.01782+0.0)x10.76387
-.........\OML/cmm/m/it/10 E
-.........\kern0.57637
-.........\hbox(3.8889+0.0)x2.80556, shifted -4.12892
-..........\OMS/cmsy/m/n/7 0
-........\mathoff
-.......\glue(\tabskip) 0.0
-.......\hbox(8.39996+3.60004)x69.70067
-........\mathon
-........\hbox(6.94444+1.94444)x69.70067
-.........\hbox(0.0+0.0)x0.0
-.........\glue(\thickmuskip) 2.77771 plus 2.77771
-.........\OT1/cmr/m/n/10 =
-.........\glue(\thickmuskip) 2.77771 plus 2.77771
-.........\OML/cmm/m/it/10 @
-.........\kern0.55554
-.........\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
-.........\OMS/cmsy/m/n/10 ^^B
-.........\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
-.........\OML/cmm/m/it/10 B
-.........\kern0.50172
-.........\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
-.........\OMS/cmsy/m/n/10 ^^@
-.........\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
-.........\OT1/cmr/m/n/10 4
-.........\OML/cmm/m/it/10 ^^Y
-.........\kern0.35878
-.........\OML/cmm/m/it/10 j
-.........\kern0.57243
-.........\kern-0.55556
-.........\OML/cmm/m/it/10 ;
-........\mathoff
-........\glue 0.0 plus 1.0fil
-.......\glue(\tabskip) 10.0
-.....\hbox(0.39998+29.60031)x8.05559, shifted -17.10016
-......\OMX/cmex/m/n/10 )
-....\glue 20.00003
-....\glue(\thinmuskip) 1.66663
-....\hbox(6.94444+1.94444)x87.88905
+...\hbox(17.50014+12.50015)x345.0, display
+....\hbox(17.50014+12.50015)x345.0, glue set 118.92902fil
+.....\glue 25.00003 minus 25.00003
+.....\mathon
+.....\hbox(17.50014+12.50015)x91.51524
+......\hbox(0.0+0.0)x1.2, shifted -2.5
+......\hbox(0.0+0.0)x0.0
+......\glue 1.66663
+......\vbox(16.0+11.0)x80.59303
+.......\hbox(8.39996+3.60004)x80.59303
+........\glue(\tabskip) 0.0
+........\hbox(8.39996+3.60004)x10.89236
+.........\glue 0.0 plus 1.0fil
+.........\hbox(8.39996+3.60004)x0.0
+..........\vbox(8.39996+3.60004)x0.0
+...........\kern 0.0
+...........\hbox(8.39996+3.60004)x0.0
+............\rule(8.39996+3.60004)x0.0
+.........\mathon
+.........\hbox(8.01782+0.0)x10.89236
+..........\OML/cmm/m/it/10 B
+..........\kern0.50172
+..........\hbox(3.8889+0.0)x2.80556, shifted -4.12892
+...........\OMS/cmsy/m/n/7 0
+.........\mathoff
+........\glue(\tabskip) 0.0
+........\hbox(8.39996+3.60004)x69.70067, glue set 19.76683fil
+.........\mathon
+.........\hbox(6.94444+1.94444)x49.93384
+..........\hbox(0.0+0.0)x0.0
+..........\glue(\thickmuskip) 2.77771 plus 2.77771
+..........\OT1/cmr/m/n/10 =
+..........\glue(\thickmuskip) 2.77771 plus 2.77771
+..........\OMS/cmsy/m/n/10 ^^@
+..........\OML/cmm/m/it/10 @
+..........\kern0.55554
+..........\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
+..........\OMS/cmsy/m/n/10 ^^B
+..........\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
+..........\OML/cmm/m/it/10 E
+..........\kern0.57637
+..........\OML/cmm/m/it/10 ;
+.........\mathoff
+.........\glue 0.0 plus 1.0fil
+........\glue(\tabskip) 10.0
+........\hbox(8.39996+3.60004)x-10.0
+.........\glue 0.0 plus 1.0fil
+.........\hbox(8.39996+3.60004)x0.0
+..........\vbox(8.39996+3.60004)x0.0
+...........\kern 0.0
+...........\hbox(8.39996+3.60004)x0.0
+............\rule(8.39996+3.60004)x0.0
+.........\mathon
+.........\hbox(0.0+0.0)x-10.0
+..........\kern -10.0
+.........\mathoff
+........\glue(\tabskip) 0.0
+.......\glue 0.0
+.......\glue(\baselineskip) 3.0
+.......\hbox(8.39996+3.60004)x80.59303
+........\glue(\tabskip) 0.0
+........\hbox(8.39996+3.60004)x10.89236, glue set 0.1285fil
+.........\glue 0.0 plus 1.0fil
+.........\hbox(8.39996+3.60004)x0.0
+..........\vbox(8.39996+3.60004)x0.0
+...........\kern 0.0
+...........\hbox(8.39996+3.60004)x0.0
+............\rule(8.39996+3.60004)x0.0
+.........\mathon
+.........\hbox(8.01782+0.0)x10.76387
+..........\OML/cmm/m/it/10 E
+..........\kern0.57637
+..........\hbox(3.8889+0.0)x2.80556, shifted -4.12892
+...........\OMS/cmsy/m/n/7 0
+.........\mathoff
+........\glue(\tabskip) 0.0
+........\hbox(8.39996+3.60004)x69.70067
+.........\mathon
+.........\hbox(6.94444+1.94444)x69.70067
+..........\hbox(0.0+0.0)x0.0
+..........\glue(\thickmuskip) 2.77771 plus 2.77771
+..........\OT1/cmr/m/n/10 =
+..........\glue(\thickmuskip) 2.77771 plus 2.77771
+..........\OML/cmm/m/it/10 @
+..........\kern0.55554
+..........\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
+..........\OMS/cmsy/m/n/10 ^^B
+..........\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
+..........\OML/cmm/m/it/10 B
+..........\kern0.50172
+..........\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
+..........\OMS/cmsy/m/n/10 ^^@
+..........\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
+..........\OT1/cmr/m/n/10 4
+..........\OML/cmm/m/it/10 ^^Y
+..........\kern0.35878
+..........\OML/cmm/m/it/10 j
+..........\kern0.57243
+..........\kern-0.55556
+..........\OML/cmm/m/it/10 ;
+.........\mathoff
+.........\glue 0.0 plus 1.0fil
+........\glue(\tabskip) 10.0
+......\hbox(0.39998+29.60031)x8.05559, shifted -17.10016
+.......\OMX/cmex/m/n/10 )
+.....\glue 20.00003
+.....\glue(\thinmuskip) 1.66663
.....\hbox(6.94444+1.94444)x87.88905
-......\OT1/cmr/m/n/10 M
-......\OT1/cmr/m/n/10 a
-......\OT1/cmr/m/n/10 x
-......\OT1/cmr/m/n/10 w
-......\kern-0.27779
-......\OT1/cmr/m/n/10 e
-......\OT1/cmr/m/n/10 l
-......\OT1/cmr/m/n/10 l
-......\OT1/cmr/m/n/10 '
-......\OT1/cmr/m/n/10 s
-......\glue 3.33333 plus 1.66666 minus 1.11111
-......\OT1/cmr/m/n/10 e
-......\OT1/cmr/m/n/10 q
-......\OT1/cmr/m/n/10 u
-......\OT1/cmr/m/n/10 a
-......\OT1/cmr/m/n/10 t
-......\OT1/cmr/m/n/10 i
-......\OT1/cmr/m/n/10 o
-......\OT1/cmr/m/n/10 n
-......\OT1/cmr/m/n/10 s
+......\hbox(6.94444+1.94444)x87.88905
+.......\OT1/cmr/m/n/10 M
+.......\OT1/cmr/m/n/10 a
+.......\OT1/cmr/m/n/10 x
+.......\OT1/cmr/m/n/10 w
+.......\kern-0.27779
+.......\OT1/cmr/m/n/10 e
+.......\OT1/cmr/m/n/10 l
+.......\OT1/cmr/m/n/10 l
+.......\OT1/cmr/m/n/10 '
+.......\OT1/cmr/m/n/10 s
+.......\glue 3.33333 plus 1.66666 minus 1.11111
+.......\OT1/cmr/m/n/10 e
+.......\OT1/cmr/m/n/10 q
+.......\OT1/cmr/m/n/10 u
+.......\OT1/cmr/m/n/10 a
+.......\OT1/cmr/m/n/10 t
+.......\OT1/cmr/m/n/10 i
+.......\OT1/cmr/m/n/10 o
+.......\OT1/cmr/m/n/10 n
+.......\OT1/cmr/m/n/10 s
+.....\mathoff
+.....\glue 0.0 plus 1.0fil
...\penalty 0
-...\glue(\belowdisplayshortskip) 6.0 plus 3.0 minus 3.0
+...\glue(\belowdisplayskip) 10.0 plus 2.0 minus 5.0
...\glue(\parskip) 0.0 plus 1.0
...\glue(\parskip) 0.0
...\glue(\lineskip) 1.0
@@ -170,10 +175,12 @@ Completed box being shipped out [1]
....\glue(\parfillskip) 0.0 plus 1.0fil
....\glue(\rightskip) 0.0
...\penalty 10000
-...\glue(\abovedisplayshortskip) 0.0 plus 3.0
+...\glue(\abovedisplayskip) 10.0 plus 2.0 minus 5.0
...\glue(\lineskip) 1.0
-...\hbox(17.50014+12.50015)x261.69762, shifted 83.30238
-....\hbox(17.50014+12.50015)x178.39523, display
+...\hbox(17.50014+12.50015)x345.0, display
+....\hbox(17.50014+12.50015)x345.0, glue set 61.91347fil
+.....\glue 25.00003 minus 25.00003
+.....\mathon
.....\OML/cmm/m/it/10 P
.....\hbox(4.63193+1.3611)x14.39183, shifted 1.49998
......\OML/cmm/m/it/7 r
@@ -299,16 +306,19 @@ Completed box being shipped out [1]
.........\mathoff
........\glue(\tabskip) 0.0
......\hbox(0.0+0.0)x1.2, shifted -2.5
-....\kern70.52457
-....\hbox(7.5+2.5)x12.77782, display
+.....\mathoff
+.....\glue 0.0 plus 1.0fil
+.....\glue 0.0 plus 1.0fil
+.....\glue 5.0
.....\hbox(7.5+2.5)x12.77782
-......\OT1/cmr/m/n/10 (
-......\OT1/cmr/m/n/10 1
-......\kern 0.0
-......\OT1/cmr/m/n/10 )
-.....\write1{\newlabel{eq:C}{{1}{\thepage }}}
+......\hbox(7.5+2.5)x12.77782
+.......\OT1/cmr/m/n/10 (
+.......\OT1/cmr/m/n/10 1
+.......\kern 0.0
+.......\OT1/cmr/m/n/10 )
+......\write1{\newlabel{eq:C}{{1}{\thepage }}}
...\penalty 0
-...\glue(\belowdisplayshortskip) 6.0 plus 3.0 minus 3.0
+...\glue(\belowdisplayskip) 10.0 plus 2.0 minus 5.0
...\glue(\parskip) 0.0 plus 1.0
...\glue(\parskip) 0.0
...\glue(\lineskip) 1.0
@@ -333,7 +343,7 @@ Completed box being shipped out [1]
...\glue 0.0
...\glue(\baselineskip) 6.60004
...\hbox(8.39996+3.60004)x345.0, display
-....\glue(\tabskip) 115.0174
+....\glue(\tabskip) 25.00003
....\hbox(8.39996+3.60004)x11.98615
.....\glue 0.0 plus 1.0fil
.....\hbox(8.39996+3.60004)x0.0
@@ -383,10 +393,10 @@ Completed box being shipped out [1]
.......\OML/cmm/m/it/10 ;
......\mathoff
.....\glue 0.0 plus 1.0fil
-....\glue(\tabskip) 115.0174
-....\hbox(8.39996+3.60004)x0.00002
-.....\kern -115.0174
-.....\kern 115.01741
+....\glue(\tabskip) 205.03477
+....\hbox(8.39996+3.60004)x0.0
+.....\kern -205.03477
+.....\kern 205.03477
.....\hbox(8.39996+3.60004)x0.0, glue set - 12.77782fil
......\glue 0.0 plus 1.0fil minus 1.0fil
......\hbox(8.39996+3.60004)x12.77782
@@ -405,7 +415,7 @@ Completed box being shipped out [1]
...\glue 0.0
...\glue(\baselineskip) 3.0
...\hbox(8.39996+3.60004)x345.0, display
-....\glue(\tabskip) 115.0174
+....\glue(\tabskip) 25.00003
....\hbox(8.39996+3.60004)x11.98615
.....\glue 0.0 plus 1.0fil
.....\hbox(8.39996+3.60004)x0.0
@@ -451,10 +461,10 @@ Completed box being shipped out [1]
.......\OML/cmm/m/it/10 ;
......\mathoff
.....\glue 0.0 plus 1.0fil
-....\glue(\tabskip) 115.0174
-....\hbox(8.39996+3.60004)x0.00002
-.....\kern -115.0174
-.....\kern 115.01741
+....\glue(\tabskip) 205.03477
+....\hbox(8.39996+3.60004)x0.0
+.....\kern -205.03477
+.....\kern 205.03477
.....\hbox(8.39996+3.60004)x0.0, glue set - 12.77782fil
......\glue 0.0 plus 1.0fil minus 1.0fil
......\hbox(8.39996+3.60004)x12.77782
@@ -486,7 +496,7 @@ Completed box being shipped out [1]
...\glue 10.0 plus 2.0 minus 5.0
...\glue(\baselineskip) 6.60004
...\hbox(8.39996+3.60004)x345.0, display
-....\glue(\tabskip) 115.0174
+....\glue(\tabskip) 25.00003
....\hbox(8.39996+3.60004)x11.98615
.....\glue 0.0 plus 1.0fil
.....\hbox(8.39996+3.60004)x0.0
@@ -522,10 +532,10 @@ Completed box being shipped out [1]
.......\OML/cmm/m/it/10 :
......\mathoff
.....\glue 0.0 plus 1.0fil
-....\glue(\tabskip) 115.0174
-....\hbox(8.39996+3.60004)x0.00002
-.....\kern -115.0174
-.....\kern 115.01741
+....\glue(\tabskip) 205.03477
+....\hbox(8.39996+3.60004)x0.0
+.....\kern -205.03477
+.....\kern 205.03477
.....\hbox(8.39996+3.60004)x0.0, glue set - 12.77782fil
......\glue 0.0 plus 1.0fil minus 1.0fil
......\hbox(8.39996+3.60004)x12.77782
@@ -639,10 +649,12 @@ Completed box being shipped out [1]
....\glue(\parfillskip) 0.0 plus 1.0fil
....\glue(\rightskip) 0.0
...\penalty 10000
-...\glue(\abovedisplayshortskip) 0.0 plus 3.0
+...\glue(\abovedisplayskip) 10.0 plus 2.0 minus 5.0
...\glue(\lineskip) 1.0
-...\hbox(26.50023+21.50023)x251.50302, shifted 93.49698
-....\hbox(26.50023+21.50023)x158.00606, display
+...\hbox(26.50023+21.50023)x345.0, display
+....\hbox(26.50023+21.50023)x345.0, glue set 72.10805fil
+.....\glue 25.00003 minus 25.00003
+.....\mathon
.....\hbox(26.50023+21.50023)x153.56165
......\vbox(0.39998+47.60048)x8.75002, shifted -26.10025
.......\hbox(0.39998+17.60019)x8.75002
@@ -892,16 +904,19 @@ Completed box being shipped out [1]
........\OMX/cmex/m/n/10 A
.....\glue(\thinmuskip) 1.66663
.....\OML/cmm/m/it/10 ;
-....\kern80.71915
-....\hbox(7.5+2.5)x12.77782, display
+.....\mathoff
+.....\glue 0.0 plus 1.0fil
+.....\glue 0.0 plus 1.0fil
+.....\glue 5.0
.....\hbox(7.5+2.5)x12.77782
-......\OT1/cmr/m/n/10 (
-......\OT1/cmr/m/n/10 5
-......\kern 0.0
-......\OT1/cmr/m/n/10 )
-.....\write1{\newlabel{eq:D}{{5}{\thepage }}}
+......\hbox(7.5+2.5)x12.77782
+.......\OT1/cmr/m/n/10 (
+.......\OT1/cmr/m/n/10 5
+.......\kern 0.0
+.......\OT1/cmr/m/n/10 )
+......\write1{\newlabel{eq:D}{{5}{\thepage }}}
...\penalty 0
-...\glue(\belowdisplayshortskip) 6.0 plus 3.0 minus 3.0
+...\glue(\belowdisplayskip) 10.0 plus 2.0 minus 5.0
...\glue -5.0
...\glue 0.0 plus 1.0fil
...\glue 0.0
@@ -912,4 +927,4 @@ Completed box being shipped out [1]
....\glue 0.0 plus 1.0fil
....\OT1/cmr/m/n/10 1
....\glue 0.0 plus 1.0fil
-(amsldoc-4.aux)
+(amsldoc-4-fleqn.aux)
diff --git a/required/amsmath/testfiles/amsldoc-4.luatex.tlg b/required/amsmath/testfiles/amsldoc-4.luatex.tlg
index 498234ba..b81d002a 100644
--- a/required/amsmath/testfiles/amsldoc-4.luatex.tlg
+++ b/required/amsmath/testfiles/amsldoc-4.luatex.tlg
@@ -187,6 +187,7 @@ Completed box being shipped out [1]
...\hbox(17.50014+12.50015)x345.0, direction TLT
....\kern83.30238 (font)
....\hbox(17.50014+12.50015)x178.39523, direction TLT
+.....\hbox(0.0+0.0)x0.0, direction TLT
.....\OML/cmm/m/it/10 P
.....\hbox(4.63193+1.3611)x14.39183, shifted 1.49998, direction TLT
......\OML/cmm/m/it/7 r
@@ -687,6 +688,7 @@ Completed box being shipped out [1]
...\hbox(26.50023+21.50023)x345.0, direction TLT
....\kern93.49698 (font)
....\hbox(26.50023+21.50023)x158.00606, direction TLT
+.....\hbox(0.0+0.0)x0.0, direction TLT
.....\hbox(26.50023+21.50023)x153.56165, direction TLT
......\vbox(48.00046+0.0)x8.75002, shifted 21.50023, direction TLT
.......\hbox(0.39998+17.60019)x8.75002, direction TLT
diff --git a/required/amsmath/testfiles/amsldoc-4.tlg b/required/amsmath/testfiles/amsldoc-4.tlg
index fb70bf54..3350ef87 100644
--- a/required/amsmath/testfiles/amsldoc-4.tlg
+++ b/required/amsmath/testfiles/amsldoc-4.tlg
@@ -174,6 +174,7 @@ Completed box being shipped out [1]
...\glue(\lineskip) 1.0
...\hbox(17.50014+12.50015)x261.69762, shifted 83.30238
....\hbox(17.50014+12.50015)x178.39523, display
+.....\hbox(0.0+0.0)x0.0
.....\OML/cmm/m/it/10 P
.....\hbox(4.63193+1.3611)x14.39183, shifted 1.49998
......\OML/cmm/m/it/7 r
@@ -643,6 +644,7 @@ Completed box being shipped out [1]
...\glue(\lineskip) 1.0
...\hbox(26.50023+21.50023)x251.50302, shifted 93.49698
....\hbox(26.50023+21.50023)x158.00606, display
+.....\hbox(0.0+0.0)x0.0
.....\hbox(26.50023+21.50023)x153.56165
......\vbox(0.39998+47.60048)x8.75002, shifted -26.10025
.......\hbox(0.39998+17.60019)x8.75002
diff --git a/required/amsmath/testfiles/amsldoc-5.luatex.tlg b/required/amsmath/testfiles/amsldoc-5.luatex.tlg
index 801eb91d..59742763 100644
--- a/required/amsmath/testfiles/amsldoc-5.luatex.tlg
+++ b/required/amsmath/testfiles/amsldoc-5.luatex.tlg
@@ -115,6 +115,7 @@ Completed box being shipped out [1]
...\hbox(10.9+5.9)x345.0, direction TLT
....\kern117.94476 (font)
....\hbox(10.9+5.9)x109.11049, direction TLT
+.....\hbox(0.0+0.0)x0.0, direction TLT
.....\hbox(10.9+5.9)x109.11049, direction TLT
......\hbox(16.79999+0.0)x109.11049, shifted 5.9, direction TLT
.......\vbox(16.79999+0.0)x109.11049, direction TLT
@@ -204,6 +205,7 @@ Completed box being shipped out [1]
...\hbox(11.65207+7.45)x345.0, direction TLT
....\kern123.62674 (font)
....\hbox(11.65207+7.45)x97.74652, direction TLT
+.....\hbox(0.0+0.0)x0.0, direction TLT
.....\OML/cmm/m/it/10 A
.....\glue(\thickmuskip) 2.77771 plus 2.77771
.....\hbox(11.65207+0.0)x32.55415, direction TLT
@@ -374,6 +376,7 @@ Completed box being shipped out [1]
...\hbox(16.51328+7.88693)x345.0, direction TLT
....\kern54.58125 (font)
....\hbox(16.51328+7.88693)x235.83751, direction TLT
+.....\hbox(0.0+0.0)x0.0, direction TLT
.....\hbox(13.20952+6.85951)x7.92084, direction TLT
......\hbox(13.20952+6.85951)x7.92084, direction TLT
.......\hbox(0.0+0.0)x1.2, shifted -2.5, direction TLT
@@ -546,6 +549,7 @@ Completed box being shipped out [1]
...\hbox(14.5001+9.50012)x345.0, direction TLT
....\kern114.91832 (font)
....\hbox(14.5001+9.50012)x115.16338, direction TLT
+.....\hbox(0.0+0.0)x0.0, direction TLT
.....\OT1/cmr/m/n/10 2
.....\hbox(4.8611+0.0)x4.92017, shifted -4.12892, direction TLT
......\OML/cmm/m/it/7 k
@@ -670,6 +674,7 @@ Completed box being shipped out [1]
...\hbox(15.89993+38.89963)x345.0, direction TLT
....\kern126.53343 (font)
....\hbox(15.89993+38.89963)x91.93314, direction TLT
+.....\hbox(0.0+0.0)x0.0, direction TLT
.....\hbox(15.89993+38.89963)x93.13313, direction TLT
......\hbox(15.89993+38.89963)x93.13313, direction TLT
.......\hbox(15.89993+38.89963)x93.13313, direction TLT
@@ -1053,6 +1058,7 @@ Completed box being shipped out [1]
...\hbox(7.5+3.63893)x345.0, direction TLT
....\kern85.60207 (font)
....\hbox(6.94444+3.63893)x173.79588, direction TLT
+.....\hbox(0.0+0.0)x0.0, direction TLT
.....\OML/cmm/m/it/10 f
.....\hbox(5.25+1.83336)x31.62752, shifted 1.80557, direction TLT
......\OT1/cmr/m/n/7 [
diff --git a/required/amsmath/testfiles/amsldoc-5.tlg b/required/amsmath/testfiles/amsldoc-5.tlg
index b845093e..6cc54f4a 100644
--- a/required/amsmath/testfiles/amsldoc-5.tlg
+++ b/required/amsmath/testfiles/amsldoc-5.tlg
@@ -99,6 +99,7 @@ Completed box being shipped out [1]
...\glue(\baselineskip) 1.1
...\hbox(10.9+5.9)x227.05524, shifted 117.94476
....\hbox(10.9+5.9)x109.11049, display
+.....\hbox(0.0+0.0)x0.0
.....\hbox(10.9+5.9)x109.11049
......\hbox(16.79999+0.0)x109.11049, shifted 5.9
.......\vbox(16.79999+0.0)x109.11049
@@ -176,6 +177,7 @@ Completed box being shipped out [1]
...\glue(\baselineskip) 0.34793
...\hbox(11.65207+7.45)x221.37326, shifted 123.62674
....\hbox(11.65207+7.45)x97.74652, display
+.....\hbox(0.0+0.0)x0.0
.....\OML/cmm/m/it/10 A
.....\glue(\thickmuskip) 2.77771 plus 2.77771
.....\hbox(11.65207+0.0)x32.55415
@@ -331,6 +333,7 @@ Completed box being shipped out [1]
...\glue(\lineskip) 1.0
...\hbox(16.51328+7.88693)x290.41875, shifted 54.58125
....\hbox(16.51328+7.88693)x235.83751, display
+.....\hbox(0.0+0.0)x0.0
.....\hbox(13.20952+6.85951)x7.92084
......\hbox(13.20952+6.85951)x7.92084
.......\hbox(0.0+0.0)x1.2, shifted -2.5
@@ -495,6 +498,7 @@ Completed box being shipped out [1]
...\glue(\lineskip) 1.0
...\hbox(14.5001+9.50012)x230.08168, shifted 114.91832
....\hbox(14.5001+9.50012)x115.16338, display
+.....\hbox(0.0+0.0)x0.0
.....\OT1/cmr/m/n/10 2
.....\hbox(4.8611+0.0)x4.92017, shifted -4.12892
......\OML/cmm/m/it/7 k
@@ -571,6 +575,7 @@ Completed box being shipped out [1]
...\glue(\lineskip) 1.0
...\hbox(15.89993+38.89963)x218.46657, shifted 126.53343
....\hbox(15.89993+38.89963)x91.93314, display
+.....\hbox(0.0+0.0)x0.0
.....\hbox(15.89993+38.89963)x93.13313
......\hbox(15.89993+38.89963)x93.13313
.......\hbox(15.89993+38.89963)x93.13313
@@ -936,6 +941,7 @@ Completed box being shipped out [1]
...\glue(\baselineskip) 4.5
...\hbox(7.5+3.63893)x259.39793, shifted 85.60207
....\hbox(6.94444+3.63893)x173.79588, display
+.....\hbox(0.0+0.0)x0.0
.....\OML/cmm/m/it/10 f
.....\hbox(5.25+1.83336)x31.62752, shifted 1.80557
......\OT1/cmr/m/n/7 [
diff --git a/required/amsmath/testfiles/amsldoc-5.xetex.tlg b/required/amsmath/testfiles/amsldoc-5.xetex.tlg
index 9ea5f137..6500c654 100644
--- a/required/amsmath/testfiles/amsldoc-5.xetex.tlg
+++ b/required/amsmath/testfiles/amsldoc-5.xetex.tlg
@@ -99,6 +99,7 @@ Completed box being shipped out [1]
...\glue(\baselineskip) 1.1
...\hbox(10.9+5.9)x227.05524, shifted 117.94476
....\hbox(10.9+5.9)x109.11049, display
+.....\hbox(0.0+0.0)x0.0
.....\hbox(10.9+5.9)x109.11049
......\hbox(16.79999+0.0)x109.11049, shifted 5.9
.......\vbox(16.79999+0.0)x109.11049
@@ -176,6 +177,7 @@ Completed box being shipped out [1]
...\glue(\baselineskip) 0.34793
...\hbox(11.65207+7.45)x221.37326, shifted 123.62674
....\hbox(11.65207+7.45)x97.74652, display
+.....\hbox(0.0+0.0)x0.0
.....\OML/cmm/m/it/10 A
.....\glue(\thickmuskip) 2.77771 plus 2.77771
.....\hbox(11.65207+0.0)x32.55415
@@ -331,6 +333,7 @@ Completed box being shipped out [1]
...\glue(\lineskip) 1.0
...\hbox(16.51328+7.88693)x290.41875, shifted 54.58125
....\hbox(16.51328+7.88693)x235.83751, display
+.....\hbox(0.0+0.0)x0.0
.....\hbox(13.20952+6.85951)x7.92084
......\hbox(13.20952+6.85951)x7.92084
.......\hbox(0.0+0.0)x1.2, shifted -2.5
@@ -495,6 +498,7 @@ Completed box being shipped out [1]
...\glue(\lineskip) 1.0
...\hbox(14.5001+9.50012)x230.08168, shifted 114.91832
....\hbox(14.5001+9.50012)x115.16338, display
+.....\hbox(0.0+0.0)x0.0
.....\OT1/cmr/m/n/10 2
.....\hbox(4.8611+0.0)x4.92017, shifted -4.12892
......\OML/cmm/m/it/7 k
@@ -613,6 +617,7 @@ Completed box being shipped out [1]
...\glue(\lineskip) 1.0
...\hbox(15.89993+38.89963)x218.46657, shifted 126.53343
....\hbox(15.89993+38.89963)x91.93314, display
+.....\hbox(0.0+0.0)x0.0
.....\hbox(15.89993+38.89963)x93.13313
......\hbox(15.89993+38.89963)x93.13313
.......\hbox(15.89993+38.89963)x93.13313
@@ -978,6 +983,7 @@ Completed box being shipped out [1]
...\glue(\baselineskip) 4.5
...\hbox(7.5+3.63893)x259.39793, shifted 85.60207
....\hbox(6.94444+3.63893)x173.79588, display
+.....\hbox(0.0+0.0)x0.0
.....\OML/cmm/m/it/10 f
.....\hbox(5.25+1.83336)x31.62752, shifted 1.80557
......\OT1/cmr/m/n/7 [
More information about the latex3-commits
mailing list.