[latex3-commits] [latex3/latex2e] latex-lab/uf-review-05: correct sign of intertext (5b94a4d7)
github at latex-project.org
github at latex-project.org
Mon Nov 27 20:22:08 CET 2023
Repository : https://github.com/latex3/latex2e
On branch : latex-lab/uf-review-05
Link : https://github.com/latex3/latex2e/commit/5b94a4d73dfbef9f76c2fe3ba60d20e1d3338c7e
>---------------------------------------------------------------
commit 5b94a4d73dfbef9f76c2fe3ba60d20e1d3338c7e
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date: Mon Nov 27 20:22:08 2023 +0100
correct sign of intertext
>---------------------------------------------------------------
5b94a4d73dfbef9f76c2fe3ba60d20e1d3338c7e
required/latex-lab/latex-lab-amsmath.dtx | 6 +-
required/latex-lab/latex-lab-math.dtx | 2 +
.../testfiles-math/mtag-005-intertext.lvt | 13 ++
.../testfiles-math/mtag-005-intertext.tlg | 234 +++++++++++++++++++++
4 files changed, 254 insertions(+), 1 deletion(-)
diff --git a/required/latex-lab/latex-lab-amsmath.dtx b/required/latex-lab/latex-lab-amsmath.dtx
index b22472a4..d608b63e 100644
--- a/required/latex-lab/latex-lab-amsmath.dtx
+++ b/required/latex-lab/latex-lab-amsmath.dtx
@@ -90,7 +90,11 @@
\def\intertext##1{%
\ifvmode\else\\\@empty\fi
\noalign{%
- \penalty\postdisplaypenalty\vskip\belowdisplayskip
+% \end{macrocode}
+% we have to flip the sign and use a negative \cs{belowdisplayskip}
+% as we flipped the sign at the outside.
+% \begin{macrocode}
+ \penalty\postdisplaypenalty\vskip-\belowdisplayskip
\vbox{
% \end{macrocode}
% Stop tagging when measuring:
diff --git a/required/latex-lab/latex-lab-math.dtx b/required/latex-lab/latex-lab-math.dtx
index 77880a8d..55e72462 100644
--- a/required/latex-lab/latex-lab-math.dtx
+++ b/required/latex-lab/latex-lab-math.dtx
@@ -356,6 +356,8 @@
% plain}, e.g., \cs{displaylines} \cs{eqalign}(??).
% \item The breqn packages changes catcodes and that isn't yet covered
% by our mechanism.
+% \item \cs{intertext} is not correctly taken into account by the
+% code splitting multiline math into subformulas.
% \end{enumerate}
%
%
diff --git a/required/latex-lab/testfiles-math/mtag-005-intertext.lvt b/required/latex-lab/testfiles-math/mtag-005-intertext.lvt
new file mode 100644
index 00000000..9078adc7
--- /dev/null
+++ b/required/latex-lab/testfiles-math/mtag-005-intertext.lvt
@@ -0,0 +1,13 @@
+\DocumentMetadata{testphase={phase-III,math}}
+\input{regression-test}
+\documentclass{article}
+
+\usepackage{amsmath}
+\begin{document}
+\START \showoutput
+\begin{align}
+0=0
+\intertext{finally}
+1=1
+\end{align}
+\end{document}
diff --git a/required/latex-lab/testfiles-math/mtag-005-intertext.tlg b/required/latex-lab/testfiles-math/mtag-005-intertext.tlg
new file mode 100644
index 00000000..41f2e481
--- /dev/null
+++ b/required/latex-lab/testfiles-math/mtag-005-intertext.tlg
@@ -0,0 +1,234 @@
+This is a generated file for the l3build validation system.
+Don't change this file in any respect.
+====>first-result=macro:->0=0 \intertext {finally} 1=1
+====>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
+...\pdfrunninglinkoff
+...\pdfliteral page{/Artifact BMC}
+...\marks4{b-,8,-1,}
+...\marks4{b+,8,-1,}
+...\hbox(0.0+0.0)x345.0
+....\hbox(0.0+0.0)x345.0
+...\pdfliteral page{EMC}
+...\marks4{e-,8,1,}
+...\marks4{e+,8,1,}
+...\pdfrunninglinkon
+..\glue 25.0
+..\glue(\lineskip) 0.0
+..\vbox(550.0+0.0)x345.0, glue set 457.95108fil
+...\hbox(0.0+0.0)x0.0
+...\pdfinterwordspaceon
+...\write-{}
+...\write1{\new at label@record{mcid-1}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{1}{tagmcid}{\__property_code_tagmcid: }}}
+...\pdfliteral shipout page{/Formula <</MCID \flag_height:n {__tag/mcid}\flag_raise:n {__tag/mcid} >> BDC}
+...\marks4{b-,1,5,Formula,,,}
+...\marks4{b+,1,5,Formula,,,}
+...\glue(\topskip) 10.0
+...\hbox(0.0+0.0)x345.0, glue set 330.0fil
+....\hbox(0.0+0.0)x15.0
+....\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 -3.0
+...\glue 0.0
+...\glue(\baselineskip) 6.60004
+...\hbox(8.39996+3.60004)x345.0, display
+....\glue(\tabskip) 160.83337
+....\hbox(8.39996+3.60004)x23.33325
+.....\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
+.....\hbox(6.44444+0.0)x23.33325
+......\mathon
+......\hbox(6.44444+0.0)x23.33325
+.......\OT1/cmr/m/n/10 0
+.......\glue(\thickmuskip) 2.77771 plus 2.77771
+.......\OT1/cmr/m/n/10 =
+.......\glue(\thickmuskip) 2.77771 plus 2.77771
+.......\OT1/cmr/m/n/10 0
+......\mathoff
+....\glue(\tabskip) 0.0
+....\hbox(8.39996+3.60004)x0.0
+.....\hbox(0.0+0.0)x0.0
+......\mathon
+......\hbox(0.0+0.0)x0.0
+......\mathoff
+.....\glue 0.0 plus 1.0fil
+....\glue(\tabskip) 160.83337
+....\hbox(8.39996+3.60004)x0.0
+.....\kern -160.83337
+.....\kern 160.83337
+.....\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
+.......\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
+.......\pdfliteral page{EMC}
+.......\marks4{e-,1,5,}
+.......\marks4{e+,1,5,}
+.......\write1{\new at label@record{mcid-2}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{2}{tagmcid}{\__property_code_tagmcid: }}}
+.......\pdfliteral shipout page{/Lbl <</MCID \flag_height:n {__tag/mcid}\flag_raise:n {__tag/mcid} >> BDC}
+.......\marks4{b-,2,6,Lbl,,,}
+.......\marks4{b+,2,6,Lbl,,,}
+.......\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 )
+.......\pdfliteral page{EMC}
+.......\marks4{e-,2,6,}
+.......\marks4{e+,2,6,}
+.......\write1{\new at label@record{mcid-3}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{3}{tagmcid}{\__property_code_tagmcid: }}}
+.......\pdfliteral shipout page{/Formula <</MCID \flag_height:n {__tag/mcid}\flag_raise:n {__tag/mcid} >> BDC}
+.......\marks4{b-,3,5,Formula,,,}
+.......\marks4{b+,3,5,Formula,,,}
+....\glue(\tabskip) 0.0
+...\penalty 10000
+...\glue 0.0
+...\penalty 10000
+...\glue 10.0 plus 2.0 minus 5.0
+...\glue(\baselineskip) 4.45552
+...\vbox(6.94444+1.94444)x345.0
+....\pdfliteral page{EMC}
+....\marks4{e-,3,5,}
+....\marks4{e+,3,5,}
+....\glue(\parskip) 0.0 plus 1.0
+....\glue(\parskip) 0.0
+....\hbox(6.94444+1.94444)x345.0, glue set 318.05547fil
+.....\write1{\new at label@record{mcid-4}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{4}{tagmcid}{\__property_code_tagmcid: }}}
+.....\pdfliteral shipout page{/P <</MCID \flag_height:n {__tag/mcid}\flag_raise:n {__tag/mcid} >> BDC}
+.....\OT1/cmr/m/n/10 ^^L (ligature fi)
+.....\OT1/cmr/m/n/10 n
+.....\OT1/cmr/m/n/10 a
+.....\OT1/cmr/m/n/10 l
+.....\OT1/cmr/m/n/10 l
+.....\OT1/cmr/m/n/10 y
+.....\pdfliteral page{EMC}
+.....\penalty 10000
+.....\glue(\parfillskip) 0.0 plus 1.0fil
+.....\glue(\rightskip) 0.0
+....\marks4{b-,4,8,P,,,}
+....\marks4{b+,4,8,P,,,}
+....\marks4{e-,4,8,}
+....\marks4{e+,4,8,}
+....\write1{\new at label@record{mcid-5}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{5}{tagmcid}{\__property_code_tagmcid: }}}
+....\pdfliteral shipout page{/Formula <</MCID \flag_height:n {__tag/mcid}\flag_raise:n {__tag/mcid} >> BDC}
+....\marks4{b-,5,5,Formula,,,}
+....\marks4{b+,5,5,Formula,,,}
+...\penalty 10000
+...\glue 10.0 plus 2.0 minus 5.0
+...\glue(\baselineskip) 4.6556
+...\hbox(8.39996+3.60004)x345.0, display
+....\glue(\tabskip) 160.83337
+....\hbox(8.39996+3.60004)x23.33325
+.....\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
+.....\hbox(6.44444+0.0)x23.33325
+......\mathon
+......\hbox(6.44444+0.0)x23.33325
+.......\OT1/cmr/m/n/10 1
+.......\glue(\thickmuskip) 2.77771 plus 2.77771
+.......\OT1/cmr/m/n/10 =
+.......\glue(\thickmuskip) 2.77771 plus 2.77771
+.......\OT1/cmr/m/n/10 1
+......\mathoff
+....\glue(\tabskip) 0.0
+....\hbox(8.39996+3.60004)x0.0
+.....\hbox(0.0+0.0)x0.0
+......\mathon
+......\hbox(0.0+0.0)x0.0
+......\mathoff
+.....\glue 0.0 plus 1.0fil
+....\glue(\tabskip) 160.83337
+....\hbox(8.39996+3.60004)x0.0
+.....\kern -160.83337
+.....\kern 160.83337
+.....\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
+.......\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
+.......\pdfliteral page{EMC}
+.......\marks4{e-,5,5,}
+.......\marks4{e+,5,5,}
+.......\write1{\new at label@record{mcid-6}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{6}{tagmcid}{\__property_code_tagmcid: }}}
+.......\pdfliteral shipout page{/Lbl <</MCID \flag_height:n {__tag/mcid}\flag_raise:n {__tag/mcid} >> BDC}
+.......\marks4{b-,6,9,Lbl,,,}
+.......\marks4{b+,6,9,Lbl,,,}
+.......\hbox(7.5+2.5)x12.77782
+........\OT1/cmr/m/n/10 (
+........\OT1/cmr/m/n/10 2
+........\kern 0.0
+........\OT1/cmr/m/n/10 )
+.......\pdfliteral page{EMC}
+.......\marks4{e-,6,9,}
+.......\marks4{e+,6,9,}
+.......\write1{\new at label@record{mcid-7}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{7}{tagmcid}{\__property_code_tagmcid: }}}
+.......\pdfliteral shipout page{/Formula <</MCID \flag_height:n {__tag/mcid}\flag_raise:n {__tag/mcid} >> BDC}
+.......\marks4{b-,7,5,Formula,,,}
+.......\marks4{b+,7,5,Formula,,,}
+....\glue(\tabskip) 0.0
+...\penalty 10000
+...\glue 0.0
+...\penalty 10000
+...\glue(\belowdisplayskip) -10.0 plus -2.0 minus -5.0
+...\pdfliteral page{EMC}
+...\marks4{e-,7,5,}
+...\marks4{e+,7,5,}
+...\penalty 0
+...\glue 20.0 plus 4.0 minus 10.0
+...\glue -3.60004
+...\glue 0.0 plus 1.0fil
+...\glue 0.0 plus -1.0fil
+...\kern 0.0
+...\hbox(0.0+0.0)x0.0
+...\glue 0.0 plus 1.0fil
+...\glue 0.0
+...\glue 0.0 plus 0.0001fil
+..\pdfrunninglinkoff
+..\pdfliteral page{/Artifact BMC}
+..\marks4{b-,9,-1,}
+..\marks4{b+,9,-1,}
+..\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
+..\pdfliteral page{EMC}
+..\marks4{e-,9,1,}
+..\marks4{e+,9,1,}
+..\pdfrunninglinkon
+.\kern 0.0
+.\kern -633.0
+.\hbox(0.0+0.0)x0.0
+.\kern 633.0
+(mtag-005-intertext.aux)
More information about the latex3-commits
mailing list.