finish moving multline

This commit is contained in:
Ulrike Fischer 2025-02-07 16:30:15 +01:00
parent 29212f284c
commit 11ed5ffcbe

View File

@ -302,72 +302,64 @@
{ \luamml_ignore: } { \luamml_ignore: }
{ \__luamml_amsmath_original_mmeasure:n {#1} } { \__luamml_amsmath_original_mmeasure:n {#1} }
} }
} % end package test
% Luckily, {multline} uses \endmultline@math in exactly % Luckily, {multline} uses \endmultline@math in exactly
% the spot where we have to set the flag. % the spot where we have to set the flag.
% Less luckily, \endmultline@math sometimes get overwritten for the last line. % Less luckily, \endmultline@math sometimes get overwritten for the last line.
% But that isn't a problem since we want special behavior there anyway. % But that isn't a problem since we want special behavior there anyway.
\cs_set:Npn \endmultline@math { \PackageInfo{luamml}{patching~\string\endmultline@math}
\UseTaggingSocket{math/luamml/save/nNn}{{} \displaystyle {mtd}} \cs_set:Npn \endmultline@math {
$
\UseTaggingSocket{math/luamml/mtable/finalizecol}{last}
}
\cs_set:Npn \rendmultline@ {
\iftag@
\UseTaggingSocket{math/luamml/save/nNn}{{} \displaystyle {mtd}} \UseTaggingSocket{math/luamml/save/nNn}{{} \displaystyle {mtd}}
$ $
\UseTaggingSocket{math/luamml/mtable/finalizecol}{last} \UseTaggingSocket{math/luamml/mtable/finalizecol}{last}
\let \endmultline@math \relax }
\ifshifttag@ \PackageInfo{luamml}{patching~\string\rendmultline@}
\hskip \multlinegap \cs_set:Npn \rendmultline@ {
\llap { \iftag@
\vtop { \UseTaggingSocket{math/luamml/save/nNn}{{} \displaystyle {mtd}}
\raise@tag $
\normalbaselines \UseTaggingSocket{math/luamml/mtable/finalizecol}{last}
\setbox \@ne \null \let \endmultline@math \relax
\dp \@ne \lineht@ \ifshifttag@
\box \@ne \hskip \multlinegap
\hbox { \llap {
\strut@ \vtop {
\make@display@tag \raise@tag
\normalbaselines
\setbox \@ne \null
\dp \@ne \lineht@
\box \@ne
\hbox {
\strut@
\make@display@tag
}
}
} }
} \else
} \hskip \multlinetaggap
\else \make@display@tag
\hskip \multlinetaggap \fi
\make@display@tag \UseTaggingSocket{math/luamml/mtable/tag/set}
\fi \else
\UseTaggingSocket{math/luamml/mtable/tag/set} \hskip \multlinegap
\else \fi
\hskip \multlinegap \hfilneg
\fi \math@cr
\hfilneg \UseExpandableTaggingSocket {math/luamml/mtable/finalize} {multline}
\math@cr \egroup
\UseExpandableTaggingSocket {math/luamml/mtable/finalize} {multline} $$
\egroup }
$$ \PackageInfo{luamml}{patching~\string\lendmultline@}
} \cs_set:Npn \lendmultline@ {
\hfilneg
\cs_set:Npn \lendmultline@ { \hskip\multlinegap
\hfilneg \math@cr
\hskip\multlinegap \UseExpandableTaggingSocket {math/luamml/mtable/finalize} {multline}
\math@cr %\__luamml_amsmath_finalize_table:n {multline}
\UseExpandableTaggingSocket {math/luamml/mtable/finalize} {multline} \egroup
%\__luamml_amsmath_finalize_table:n {multline} $$
\egroup }
$$
} \PackageInfo{luamml}{patching~smallmatrix}
% Finally some slightly different stuff.
% While {matrix} is covered by {array}, we still have {smallmatrix}:
\IfPackageAtLeastTF{latex-lab-testphase-math}{2025-01-24}
{}
{ \PackageInfo{luamml}{patching~smallmatrix}
\renewenvironment {smallmatrix} { \renewenvironment {smallmatrix} {
\UseTaggingSocket{ math/luamml/annotate/false } {} { \null\, } \UseTaggingSocket{ math/luamml/annotate/false } {} { \null\, }
\vcenter \bgroup \vcenter \bgroup
@ -409,7 +401,7 @@
\UseTaggingSocket{math/luamml/mtable/innertable/finalize} \UseTaggingSocket{math/luamml/mtable/innertable/finalize}
\UseTaggingSocket{math/luamml/annotate/false} {}{ \, } \UseTaggingSocket{math/luamml/annotate/false} {}{ \, }
} }
} } %end package test
% {cases} is defined by the kernel, but we patch the overwritten version by amsmath. % {cases} is defined by the kernel, but we patch the overwritten version by amsmath.
\cs_set:Npn \env@cases { \cs_set:Npn \env@cases {