[latex3-commits] [latex3/latex2e] latex-lab/uf-review-05: correct intertext also in mathtools (f407b4bf)
github at latex-project.org
github at latex-project.org
Mon Nov 27 22:01:44 CET 2023
Repository : https://github.com/latex3/latex2e
On branch : latex-lab/uf-review-05
Link : https://github.com/latex3/latex2e/commit/f407b4bf0402bc77de514f98afbbf5c689f4aab1
>---------------------------------------------------------------
commit f407b4bf0402bc77de514f98afbbf5c689f4aab1
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date: Mon Nov 27 22:01:44 2023 +0100
correct intertext also in mathtools
>---------------------------------------------------------------
f407b4bf0402bc77de514f98afbbf5c689f4aab1
required/latex-lab/latex-lab-amsmath.dtx | 1 -
required/latex-lab/latex-lab-mathtools.dtx | 9 +++++++--
.../latex-lab/testfiles-math/mathcapture-012.tlg | 22 ++++++----------------
required/latex-lab/testfiles-math/mtag-tlc3.tlg | 10 +++++-----
4 files changed, 18 insertions(+), 24 deletions(-)
diff --git a/required/latex-lab/latex-lab-amsmath.dtx b/required/latex-lab/latex-lab-amsmath.dtx
index d608b63e..66491a4b 100644
--- a/required/latex-lab/latex-lab-amsmath.dtx
+++ b/required/latex-lab/latex-lab-amsmath.dtx
@@ -114,7 +114,6 @@
\tagpdfsetup{paratag=P}%
% \end{macrocode}
% TODO why \tagpdfparaOn needed?
-% TODO spacing is wrong (but probably due to something else)
% \begin{macrocode}
\tagpdfparaOn
\noindent\ignorespaces##1\par
diff --git a/required/latex-lab/latex-lab-mathtools.dtx b/required/latex-lab/latex-lab-mathtools.dtx
index c3f43243..95a8e090 100644
--- a/required/latex-lab/latex-lab-mathtools.dtx
+++ b/required/latex-lab/latex-lab-mathtools.dtx
@@ -109,7 +109,7 @@
\def\intertext##1{%
\ifvmode\else\\\@empty\fi
\noalign{%
- \penalty\postdisplaypenalty\vskip\belowdisplayskip
+ \penalty\postdisplaypenalty\vskip-\belowdisplayskip
\vskip-\lineskiplimit % CCS
\vskip\normallineskiplimit % CCS
\vskip\l_MT_above_intertext_sep
@@ -170,6 +170,7 @@
\MH_fi:
\tag_mc_end_push:
\tagpdfsetup{paratag=Span}
+ \tagpdfparaOn
\noindent\ignorespaces#1\par
\tag_mc_begin_pop:n{}}
\penalty\predisplaypenalty\vskip\abovedisplayshortskip%
@@ -197,7 +198,11 @@
\parshape\@ne \@totalleftmargin \linewidth
\MH_fi:
\tag_mc_end_push:
- \tagpdfsetup{paratag=Span}
+ \tagpdfsetup{paratag=P}
+% \end{macrocode}
+% Why is it needed to enable paratagging??
+% \begin{macrocode}
+ \tagpdfparaOn
\noindent\ignorespaces#1\par
\tag_mc_begin_pop:n{}}%
\penalty\predisplaypenalty\vskip\abovedisplayshortskip%
diff --git a/required/latex-lab/testfiles-math/mathcapture-012.tlg b/required/latex-lab/testfiles-math/mathcapture-012.tlg
index 0150d399..8afb89ad 100644
--- a/required/latex-lab/testfiles-math/mathcapture-012.tlg
+++ b/required/latex-lab/testfiles-math/mathcapture-012.tlg
@@ -79,26 +79,16 @@ Math env gather*
====>first-result=macro:->\ket {\psi }\bra {\phi } : \ket {\xi } \mapsto \ket {\psi } \braket {\psi |\xi }
====>first-tmpmathcontent=macro:-> \Braket { \phi | \frac {\partial ^2}{\partial t^2} | \psi } \\ \shortintertext {Also:} \Set { x\in \Re ^2 | 0 < |x| < 5 }
====>formula has subparts
-! Package amsmath Error: Invalid use of \shortintertext.
-See the amsmath package documentation for explanation.
-Type H <return> for immediate help.
- ...
-l. ...\end{gather*}
-Your command was ignored.
-Type I <command> <return> to replace it with another command,
-or <return> to continue without it.
+==> @endpe=false on input line ...
+==> increment P on input line ...
+==> increment /P on input line ...
====>result=macro:-> \Braket { \phi | \frac {\partial ^2}{\partial t^2} | \psi }
====>tmpmathcontent=macro:-> \shortintertext {Also:} \Set { x\in \Re ^2 | 0 < |x| < 5 }
====>result=macro:-> \shortintertext {Also:} \Set { x\in \Re ^2 | 0 < |x| < 5 }
====>tmpmathcontent=macro:->
-! Package amsmath Error: Invalid use of \shortintertext.
-See the amsmath package documentation for explanation.
-Type H <return> for immediate help.
- ...
-l. ...\end{gather*}
-Your command was ignored.
-Type I <command> <return> to replace it with another command,
-or <return> to continue without it.
+==> @endpe=false on input line ...
+==> increment P on input line ...
+==> increment /P on input line ...
==> flattened=false on input line ...
==> Structure-end text-unit after displayblock on input line ...
==> problem with shortintertext (also needs redefinition)
diff --git a/required/latex-lab/testfiles-math/mtag-tlc3.tlg b/required/latex-lab/testfiles-math/mtag-tlc3.tlg
index 56e44571..b903d934 100644
--- a/required/latex-lab/testfiles-math/mtag-tlc3.tlg
+++ b/required/latex-lab/testfiles-math/mtag-tlc3.tlg
@@ -525,12 +525,12 @@ Overfull \hbox (9.05542pt too wide) detected at line 434
.....\mathoff
....\glue(\tabskip) 0.0
.\pdfliteral page{EMC}
-.\marks4{e-,295,325,}
-.\marks4{e+,295,325,}
-.\write1{\new at label@record{mcid-296}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{296}{tagmcid}{\__property_code_tagmcid: }}}
+.\marks4{e-,294,321,}
+.\marks4{e+,294,321,}
+.\write1{\new at label@record{mcid-295}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{295}{tagmcid}{\__property_code_tagmcid: }}}
.\pdfliteral shipout page{/Formula <</MCID \flag_height:n {__tag/mcid}\flag_raise:n {__tag/mcid} >> BDC}
-.\marks4{b-,296,326,Formula,,,}
-.\marks4{b+,296,326,Formula,,,}
+.\marks4{b-,295,322,Formula,,,}
+.\marks4{b+,295,322,Formula,,,}
.\mathoff
.\glue 0.0 plus 1.0fil
) [7] [8] [9] [10] [11] [12] [13] [14] [15] [16] [17]
More information about the latex3-commits
mailing list.