[latex3-commits] [latex3/latex2e] develop: skip should be multiplied. add test file (6f19122f)
github at latex-project.org
github at latex-project.org
Tue Sep 12 15:34:57 CEST 2023
Repository : https://github.com/latex3/latex2e
On branch : develop
Link : https://github.com/latex3/latex2e/commit/6f19122f522dffb9fd3e3f4514e8c6e717e1bd28
>---------------------------------------------------------------
commit 6f19122f522dffb9fd3e3f4514e8c6e717e1bd28
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date: Mon Sep 11 16:16:15 2023 +0200
skip should be multiplied. add test file
>---------------------------------------------------------------
6f19122f522dffb9fd3e3f4514e8c6e717e1bd28
required/latex-lab/latex-lab-math.dtx | 2 +-
.../latex-lab/testfiles-math/mathcapture-016.lvt | 11 ++
.../latex-lab/testfiles-math/mathcapture-016.tlg | 193 +++++++++++++++++++++
required/latex-lab/testfiles-math/mtag-tlc3.tlg | 14 +-
4 files changed, 212 insertions(+), 8 deletions(-)
diff --git a/required/latex-lab/latex-lab-math.dtx b/required/latex-lab/latex-lab-math.dtx
index 7897cf2d..8bd26847 100644
--- a/required/latex-lab/latex-lab-math.dtx
+++ b/required/latex-lab/latex-lab-math.dtx
@@ -379,7 +379,7 @@
% This reinserts the below display skips. It must be doubled to
% get the right amount:
% \begin{macrocode}
- \skip_vertical:n { -2\l_@@_tmpa_skip }
+ \skip_vertical:n { -\l_@@_tmpa_skip * 2 }
%
\@doendpe % this has no \end{...} to take care of it
}
diff --git a/required/latex-lab/testfiles-math/mathcapture-016.lvt b/required/latex-lab/testfiles-math/mathcapture-016.lvt
new file mode 100644
index 00000000..681d89f4
--- /dev/null
+++ b/required/latex-lab/testfiles-math/mathcapture-016.lvt
@@ -0,0 +1,11 @@
+% tests belowdisplayskip, tagging-project issue #11
+\DocumentMetadata{testphase={math}}
+\input{regression-test}
+\documentclass{article}
+
+\begin{document}
+\START\showoutput
+Eaque laboriosam necessitatibus itaque suscipit modi.
+\[a+b=c.\]
+Non reprehenderit tempora corporis perspiciatis cum quod aut.
+\end{document}
\ No newline at end of file
diff --git a/required/latex-lab/testfiles-math/mathcapture-016.tlg b/required/latex-lab/testfiles-math/mathcapture-016.tlg
new file mode 100644
index 00000000..223d3d72
--- /dev/null
+++ b/required/latex-lab/testfiles-math/mathcapture-016.tlg
@@ -0,0 +1,193 @@
+This is a generated file for the l3build validation system.
+Don't change this file in any respect.
+====>first-result=macro:->a+b=c.
+====>first-tmpmathcontent=macro:->
+====>formula has no subparts
+Completed box being shipped out [1]
+\vbox(633.0+0.0)x407.0
+.\hbox(0.0+0.0)x0.0
+..\kern -72.26999
+..\vbox(0.0+0.0)x0.0, glue set 72.26999fil
+...\kern -72.26999
+...\hbox(0.0+0.0)x0.0
+....\glue 0.0 plus 1.0fil minus 1.0fil
+...\glue 0.0 plus 1.0fil minus 1.0fil
+.\glue 16.0
+.\vbox(617.0+0.0)x345.0, shifted 62.0
+..\vbox(12.0+0.0)x345.0, glue set 12.0fil
+...\glue 0.0 plus 1.0fil
+...\hbox(0.0+0.0)x345.0
+....\hbox(0.0+0.0)x345.0
+..\glue 25.0
+..\glue(\lineskip) 0.0
+..\vbox(550.0+0.0)x345.0, glue set 495.94702fil
+...\write-{}
+...\glue(\topskip) 3.05556
+...\hbox(6.94444+1.94444)x345.0, glue set 89.49954fil
+....\hbox(0.0+0.0)x15.0
+....\OT1/cmr/m/n/10 E
+....\OT1/cmr/m/n/10 a
+....\OT1/cmr/m/n/10 q
+....\OT1/cmr/m/n/10 u
+....\OT1/cmr/m/n/10 e
+....\glue 3.33333 plus 1.66666 minus 1.11111
+....\OT1/cmr/m/n/10 l
+....\OT1/cmr/m/n/10 a
+....\OT1/cmr/m/n/10 b
+....\kern0.27779
+....\OT1/cmr/m/n/10 o
+....\OT1/cmr/m/n/10 r
+....\OT1/cmr/m/n/10 i
+....\OT1/cmr/m/n/10 o
+....\OT1/cmr/m/n/10 s
+....\OT1/cmr/m/n/10 a
+....\OT1/cmr/m/n/10 m
+....\glue 3.33333 plus 1.66666 minus 1.11111
+....\OT1/cmr/m/n/10 n
+....\OT1/cmr/m/n/10 e
+....\OT1/cmr/m/n/10 c
+....\OT1/cmr/m/n/10 e
+....\OT1/cmr/m/n/10 s
+....\OT1/cmr/m/n/10 s
+....\OT1/cmr/m/n/10 i
+....\OT1/cmr/m/n/10 t
+....\OT1/cmr/m/n/10 a
+....\OT1/cmr/m/n/10 t
+....\OT1/cmr/m/n/10 i
+....\OT1/cmr/m/n/10 b
+....\OT1/cmr/m/n/10 u
+....\OT1/cmr/m/n/10 s
+....\glue 3.33333 plus 1.66666 minus 1.11111
+....\OT1/cmr/m/n/10 i
+....\OT1/cmr/m/n/10 t
+....\OT1/cmr/m/n/10 a
+....\OT1/cmr/m/n/10 q
+....\OT1/cmr/m/n/10 u
+....\OT1/cmr/m/n/10 e
+....\glue 3.33333 plus 1.66666 minus 1.11111
+....\OT1/cmr/m/n/10 s
+....\OT1/cmr/m/n/10 u
+....\OT1/cmr/m/n/10 s
+....\OT1/cmr/m/n/10 c
+....\OT1/cmr/m/n/10 i
+....\OT1/cmr/m/n/10 p
+....\OT1/cmr/m/n/10 i
+....\OT1/cmr/m/n/10 t
+....\glue 3.33333 plus 1.66666 minus 1.11111
+....\OT1/cmr/m/n/10 m
+....\OT1/cmr/m/n/10 o
+....\kern0.27779
+....\OT1/cmr/m/n/10 d
+....\OT1/cmr/m/n/10 i
+....\OT1/cmr/m/n/10 .
+....\glue 4.44444 plus 4.99997 minus 0.37036
+....\special{}
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\penalty 10000
+...\glue(\abovedisplayskip) 10.0 plus 2.0 minus 5.0
+...\glue(\baselineskip) 3.11111
+...\hbox(6.94444+0.83333)x42.23825, shifted 151.38087, display
+....\OML/cmm/m/it/10 a
+....\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
+....\OT1/cmr/m/n/10 +
+....\glue(\medmuskip) 2.22217 plus 1.11108 minus 2.22217
+....\OML/cmm/m/it/10 b
+....\glue(\thickmuskip) 2.77771 plus 2.77771
+....\OT1/cmr/m/n/10 =
+....\glue(\thickmuskip) 2.77771 plus 2.77771
+....\OML/cmm/m/it/10 c
+....\OML/cmm/m/it/10 :
+...\penalty 10000
+...\glue(\belowdisplayskip) -10.0 plus -2.0 minus -5.0
+...\special{}
+...\penalty 0
+...\glue 20.0 plus 4.0 minus 10.0
+...\glue(\parskip) 0.0 plus 1.0
+...\glue(\parskip) 0.0
+...\glue(\baselineskip) 4.22223
+...\hbox(6.94444+1.94444)x345.0, glue set 67.41614fil
+....\OT1/cmr/m/n/10 N
+....\OT1/cmr/m/n/10 o
+....\OT1/cmr/m/n/10 n
+....\glue 3.33333 plus 1.66666 minus 1.11111
+....\OT1/cmr/m/n/10 r
+....\OT1/cmr/m/n/10 e
+....\OT1/cmr/m/n/10 p
+....\OT1/cmr/m/n/10 r
+....\OT1/cmr/m/n/10 e
+....\OT1/cmr/m/n/10 h
+....\OT1/cmr/m/n/10 e
+....\OT1/cmr/m/n/10 n
+....\OT1/cmr/m/n/10 d
+....\OT1/cmr/m/n/10 e
+....\OT1/cmr/m/n/10 r
+....\OT1/cmr/m/n/10 i
+....\OT1/cmr/m/n/10 t
+....\glue 3.33333 plus 1.66666 minus 1.11111
+....\OT1/cmr/m/n/10 t
+....\OT1/cmr/m/n/10 e
+....\OT1/cmr/m/n/10 m
+....\OT1/cmr/m/n/10 p
+....\kern0.27779
+....\OT1/cmr/m/n/10 o
+....\OT1/cmr/m/n/10 r
+....\OT1/cmr/m/n/10 a
+....\glue 3.33333 plus 1.66666 minus 1.11111
+....\OT1/cmr/m/n/10 c
+....\OT1/cmr/m/n/10 o
+....\OT1/cmr/m/n/10 r
+....\OT1/cmr/m/n/10 p
+....\kern0.27779
+....\OT1/cmr/m/n/10 o
+....\OT1/cmr/m/n/10 r
+....\OT1/cmr/m/n/10 i
+....\OT1/cmr/m/n/10 s
+....\glue 3.33333 plus 1.66666 minus 1.11111
+....\OT1/cmr/m/n/10 p
+....\kern0.27779
+....\OT1/cmr/m/n/10 e
+....\OT1/cmr/m/n/10 r
+....\OT1/cmr/m/n/10 s
+....\OT1/cmr/m/n/10 p
+....\OT1/cmr/m/n/10 i
+....\OT1/cmr/m/n/10 c
+....\OT1/cmr/m/n/10 i
+....\OT1/cmr/m/n/10 a
+....\OT1/cmr/m/n/10 t
+....\OT1/cmr/m/n/10 i
+....\OT1/cmr/m/n/10 s
+....\glue 3.33333 plus 1.66666 minus 1.11111
+....\OT1/cmr/m/n/10 c
+....\OT1/cmr/m/n/10 u
+....\OT1/cmr/m/n/10 m
+....\glue 3.33333 plus 1.66666 minus 1.11111
+....\OT1/cmr/m/n/10 q
+....\OT1/cmr/m/n/10 u
+....\OT1/cmr/m/n/10 o
+....\kern0.27779
+....\OT1/cmr/m/n/10 d
+....\glue 3.33333 plus 1.66666 minus 1.11111
+....\OT1/cmr/m/n/10 a
+....\OT1/cmr/m/n/10 u
+....\OT1/cmr/m/n/10 t
+....\OT1/cmr/m/n/10 .
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\glue -1.94444
+...\glue 0.0 plus 1.0fil
+...\glue 0.0
+...\glue 0.0 plus 0.0001fil
+..\glue(\baselineskip) 23.55556
+..\hbox(6.44444+0.0)x345.0
+...\hbox(6.44444+0.0)x345.0, glue set 170.0fil
+....\glue 0.0 plus 1.0fil
+....\OT1/cmr/m/n/10 1
+....\glue 0.0 plus 1.0fil
+.\kern 0.0
+.\kern -633.0
+.\hbox(0.0+0.0)x0.0
+.\kern 633.0
+(mathcapture-016.aux)
diff --git a/required/latex-lab/testfiles-math/mtag-tlc3.tlg b/required/latex-lab/testfiles-math/mtag-tlc3.tlg
index 3da990b6..a68e8d12 100644
--- a/required/latex-lab/testfiles-math/mtag-tlc3.tlg
+++ b/required/latex-lab/testfiles-math/mtag-tlc3.tlg
@@ -41,14 +41,14 @@ Math env align
====>tmpmathcontent=macro:-> &= a^3 + 3a^2b + 3ab^2 + b^3
====>result=macro:-> &= a^3 + 3a^2b + 3ab^2 + b^3
====>tmpmathcontent=macro:->
-[1
-]
-----------------------------------
Math env align
x^2 + y^2 & = 1 \\ x & = \sqrt {1-y^2}
====>first-result=macro:->x^2 + y^2 & = 1
====>first-tmpmathcontent=macro:-> x & = \sqrt {1-y^2}
====>formula has subparts
+[1
+]
====>result=macro:-> x & = \sqrt {1-y^2}
====>tmpmathcontent=macro:->
-----------------------------------
@@ -99,13 +99,13 @@ Math env equation*
====>first-result=macro:->\begin {rcases} \bm {B}' &=-c\nabla \times \bm {E} \\ \bm {E}' &=c\nabla \times \bm {B} - 4\pi \bm {J}\, \end {rcases} \quad \text {Maxwell's equations}
====>first-tmpmathcontent=macro:->
====>formula has no subparts
-[2]
-----------------------------------
Math env equation
\begin {aligned} V_j &= v_j & X_i &= x_i - q_i x_j & &= u_j + \sum _{i\ne j} q_i \\ V_i &= v_i - q_i v_j & X_j &= x_j & U_i &= u_i \end {aligned}
====>first-result=macro:->\begin {aligned} V_j &= v_j & X_i &= x_i - q_i x_j & &= u_j + \sum _{i\ne j} q_i \\ V_i &= v_i - q_i v_j & X_j &= x_j & U_i &= u_i \end {aligned}
====>first-tmpmathcontent=macro:->
====>formula has no subparts
+[2]
-----------------------------------
Math env align
A_1 &= N_0 (\lambda ; \Omega ') - \phi ( \lambda ; \Omega ') \\ A_2 &= \phi (\lambda ; \Omega ') \phi (\lambda ; \Omega ) \\ \intertext {and finally} A_3 &= \mathcal {N} (\lambda ; \omega )
@@ -159,11 +159,11 @@ f &= g \label {eq:2A} \\ f' &= g' \label {eq:2B} \\ \mathcal {L}f &= \mathcal {L
====>first-result=macro:->f &= g \label {eq:2A}
====>first-tmpmathcontent=macro:-> f' &= g' \label {eq:2B} \\ \mathcal {L}f &= \mathcal {L}g + K \label {eq:2C}
====>formula has subparts
-[3]
====>result=macro:-> f' &= g' \label {eq:2B}
====>tmpmathcontent=macro:-> \mathcal {L}f &= \mathcal {L}g + K \label {eq:2C}
====>result=macro:-> \mathcal {L}f &= \mathcal {L}g + K \label {eq:2C}
====>tmpmathcontent=macro:->
+[3]
-----------------------------------
Math env align
A_1 &= N_0 (\lambda ; \Omega ') - \phi ( \lambda ; \Omega ') \\ A_2 &= \phi (\lambda ; \Omega ') \, \phi (\lambda ; \Omega ) \tag *{ALSO (\theequation )} \\ A_3 &= \mathcal {N} (\lambda ; \omega )
@@ -222,13 +222,13 @@ Math env multline
====>formula has subparts
====>result=macro:-> = \sum _{t \notin \mathbf {T}} \int _t^a \biggl \lbrace g(y)^2 \int _t^a f(x)^2 \,dx \biggr \rbrace \,dy
====>tmpmathcontent=macro:->
-[4]
-----------------------------------
Math env gather*
\begin {matrix} 0 & 1 \\ 1 & 0 \end {matrix} \quad \begin {pmatrix} 0 & -i \\ i & 0 \end {pmatrix} \\[10pt] \begin {bmatrix} 0 & -1 \\ 1 & 0 \end {bmatrix} \quad \begin {Bmatrix} 1 & 0 \\ 0 & -1 \end {Bmatrix} \\[10pt] \begin {vmatrix} a & b \\ c & d \end {vmatrix} \quad \begin {Vmatrix} i & 0 \\ 0 & -i \end {Vmatrix}
====>first-result=macro:->\begin {matrix} 0 & 1 \\ 1 & 0 \end {matrix} \quad \begin {pmatrix} 0 & -i \\ i & 0 \end {pmatrix}
====>first-tmpmathcontent=macro:->[10pt] \begin {bmatrix} 0 & -1 \\ 1 & 0 \end {bmatrix} \quad \begin {Bmatrix} 1 & 0 \\ 0 & -1 \end {Bmatrix} \\[10pt] \begin {vmatrix} a & b \\ c & d \end {vmatrix} \quad \begin {Vmatrix} i & 0 \\ 0 & -i \end {Vmatrix}
====>formula has subparts
+[4]
====>result=macro:->[10pt] \begin {bmatrix} 0 & -1 \\ 1 & 0 \end {bmatrix} \quad \begin {Bmatrix} 1 & 0 \\ 0 & -1 \end {Bmatrix}
====>tmpmathcontent=macro:->[10pt] \begin {vmatrix} a & b \\ c & d \end {vmatrix} \quad \begin {Vmatrix} i & 0 \\ 0 & -i \end {Vmatrix}
====>result=macro:->[10pt] \begin {vmatrix} a & b \\ c & d \end {vmatrix} \quad \begin {Vmatrix} i & 0 \\ 0 & -i \end {Vmatrix}
@@ -275,13 +275,13 @@ A \xLeftarrow {\ x} B \xRightarrow [y\ ]{} C \xLeftrightarrow [y]{\ x\ } D \\ A
====>first-result=macro:->A \xLeftarrow {\ x} B \xRightarrow [y\ ]{} C \xLeftrightarrow [y]{\ x\ } D
====>first-tmpmathcontent=macro:-> A \xhookleftarrow {x} B \xhookrightarrow [bbb]{a} C \\ \xleftharpoondown {} \xleftharpoonup {} \xleftrightharpoons {xxx} \xrightleftharpoons [yy]{} \xrightharpoondown {} \xrightharpoonup {} \\ \xmapsto {x>0} A \xleftrightarrow [\text {letters}]{} Z
====>formula has subparts
-[5]
====>result=macro:-> A \xhookleftarrow {x} B \xhookrightarrow [bbb]{a} C
====>tmpmathcontent=macro:-> \xleftharpoondown {} \xleftharpoonup {} \xleftrightharpoons {xxx} \xrightleftharpoons [yy]{} \xrightharpoondown {} \xrightharpoonup {} \\ \xmapsto {x>0} A \xleftrightarrow [\text {letters}]{} Z
====>result=macro:-> \xleftharpoondown {} \xleftharpoonup {} \xleftrightharpoons {xxx} \xrightleftharpoons [yy]{} \xrightharpoondown {} \xrightharpoonup {}
====>tmpmathcontent=macro:-> \xmapsto {x>0} A \xleftrightarrow [\text {letters}]{} Z
====>result=macro:-> \xmapsto {x>0} A \xleftrightarrow [\text {letters}]{} Z
====>tmpmathcontent=macro:->
+[5]
-----------------------------------
Math env gather*
\ropen {a,d}=\closed {a,b} + \lopen {b,c} + \dotsb \\[3pt] \open {\frac {a}{b}} \approx \open *{\frac {a}{b}} \neq \closed [\Bigg ]{x}
@@ -334,11 +334,11 @@ Math env gather
====>first-result=macro:->\aSb {x} \neq \aSb *{x} \neq \aSb [\hat ]{x} \neq \bSa {X}
====>first-tmpmathcontent=macro:-> \bS {\delta } \neq \bS *{\delta } \neq \bS [\hat ]{\delta } \\ \bCSb {a} \cdot \bS {c} = \bS {a} \times \bS {c}
====>formula has subparts
-[6]
====>result=macro:-> \bS {\delta } \neq \bS *{\delta } \neq \bS [\hat ]{\delta }
====>tmpmathcontent=macro:-> \bCSb {a} \cdot \bS {c} = \bS {a} \times \bS {c}
====>result=macro:-> \bCSb {a} \cdot \bS {c} = \bS {a} \times \bS {c}
====>tmpmathcontent=macro:->
+[6]
-----------------------------------
Math env equation*
\overset {*}{X} > \underset {*}{X} \overunderset {\mathsf {def}}{\mathsf {loc.}}{\iff } \sideset {}{'}\sum _{a,b \in \mathbf {R^*}} \overset {a}{\underset {b}{X}} = X
More information about the latex3-commits
mailing list.