From 9ad6bb7fd42db1225c0c59f5e2ddfca02b82765a Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sun, 4 Apr 2021 02:06:51 +0000 Subject: mathtools (4apr21) git-svn-id: svn://tug.org/texlive/trunk@58725 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/mathtools/empheq.pdf | Bin 311677 -> 311677 bytes .../texmf-dist/doc/latex/mathtools/mathtools.pdf | Bin 456864 -> 456864 bytes Master/texmf-dist/doc/latex/mathtools/mhsetup.pdf | Bin 236759 -> 236759 bytes .../texmf-dist/source/latex/mathtools/empheq.ins | 2 +- .../source/latex/mathtools/mathtools.dtx | 224 +++++++++++++++------ .../source/latex/mathtools/mathtools.ins | 19 +- .../texmf-dist/source/latex/mathtools/mhsetup.ins | 93 --------- .../texmf-dist/tex/latex/mathtools/mathtools.sty | 185 ++++++++++++----- 8 files changed, 312 insertions(+), 211 deletions(-) delete mode 100644 Master/texmf-dist/source/latex/mathtools/mhsetup.ins (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/mathtools/empheq.pdf b/Master/texmf-dist/doc/latex/mathtools/empheq.pdf index 5d28a71b098..237e509ed9e 100644 Binary files a/Master/texmf-dist/doc/latex/mathtools/empheq.pdf and b/Master/texmf-dist/doc/latex/mathtools/empheq.pdf differ diff --git a/Master/texmf-dist/doc/latex/mathtools/mathtools.pdf b/Master/texmf-dist/doc/latex/mathtools/mathtools.pdf index 0ca42bfa06d..b0e8d1e7ff8 100644 Binary files a/Master/texmf-dist/doc/latex/mathtools/mathtools.pdf and b/Master/texmf-dist/doc/latex/mathtools/mathtools.pdf differ diff --git a/Master/texmf-dist/doc/latex/mathtools/mhsetup.pdf b/Master/texmf-dist/doc/latex/mathtools/mhsetup.pdf index cdade1846ee..c1f853e0e25 100644 Binary files a/Master/texmf-dist/doc/latex/mathtools/mhsetup.pdf and b/Master/texmf-dist/doc/latex/mathtools/mhsetup.pdf differ diff --git a/Master/texmf-dist/source/latex/mathtools/empheq.ins b/Master/texmf-dist/source/latex/mathtools/empheq.ins index 265efeb2bbc..632545df724 100644 --- a/Master/texmf-dist/source/latex/mathtools/empheq.ins +++ b/Master/texmf-dist/source/latex/mathtools/empheq.ins @@ -33,7 +33,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: empheq 2020/03/24 v2.16 empheq} +\Msg{* Package: empheq 2017/03/31 v2.15 empheq} \Msg{************************************************************************} \keepsilent diff --git a/Master/texmf-dist/source/latex/mathtools/mathtools.dtx b/Master/texmf-dist/source/latex/mathtools/mathtools.dtx index 68672cfe350..4078ac8a4d3 100644 --- a/Master/texmf-dist/source/latex/mathtools/mathtools.dtx +++ b/Master/texmf-dist/source/latex/mathtools/mathtools.dtx @@ -69,7 +69,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: mathtools 2021/03/18 v1.25} +\Msg{* Package: mathtools 2021/03/28 v1.26} \Msg{************************************************************************} \keepsilent @@ -133,7 +133,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{mathtools.drv}% - [2021/03/18 v1.25 mathematical typesetting tools] + [2021/03/28 v1.28 mathematical typesetting tools] \documentclass{ltxdoc} \IfFileExists{fourier.sty}{\usepackage{fourier}}{} \addtolength\marginparwidth{-25pt} @@ -321,7 +321,7 @@ colorlinks, % % \GetFileInfo{mathtools.drv} % -% \CheckSum{3364} +% \CheckSum{3529} % % \title{The \pkg{mathtools} package\thanks{This file has version number % \fileversion, last revised \filedate.}} @@ -2982,7 +2982,7 @@ colorlinks, % \begin{macrocode} %<*package> \ProvidesPackage{mathtools}% - [2021/03/18 v1.25 mathematical typesetting tools] + [2021/03/28 v1.26 mathematical typesetting tools] % \end{macrocode} % \changes{v1.10}{2011/02/12}{Might as well make sure that we need the % latest version of \texttt{mhsetup}} @@ -4135,59 +4135,122 @@ colorlinks, % \changes{v1.22}{2019/07/22}{Also added crampedsubarray} % \changes{v1.22}{2019/07/22}{Also added fixes for smallmatrix and the % MT versions of these} -% \begin{macrocode} -\newcommand\MultlinedHook{ - \renewenvironment{subarray}[1]{% - \vcenter\bgroup - \Let@ \restore@math@cr \default@tag - \let\math@cr@@\AMS@math@cr@@ % <--- the fix - \baselineskip\fontdimen10 \scriptfont\tw@ - \advance\baselineskip\fontdimen12 \scriptfont\tw@ - \lineskip\thr@@\fontdimen8 \scriptfont\thr@@ - \lineskiplimit\lineskip - \ialign\bgroup\ifx c##1\hfil\fi - $\m@th\scriptstyle####$\hfil\crcr - }{% - \crcr\egroup\egroup - } - \renewenvironment{crampedsubarray}[1]{% - \vcenter\bgroup - \Let@ \restore@math@cr \default@tag - \let\math@cr@@\AMS@math@cr@@ % <--- the fix - \baselineskip\fontdimen10 \scriptfont\tw@ - \advance\baselineskip\fontdimen12 \scriptfont\tw@ - \lineskip\thr@@\fontdimen8 \scriptfont\thr@@ - \lineskiplimit\lineskip - \ialign\bgroup\ifx c##1\hfil\fi +% \changes{v1.26}{2021/03/27}{We need a lualatex branch of this as +% well. We need to find a better way to manage this. Patching?} +% \begin{macrocode} +\ifx\directlua\@undefined + % THIS IS NORMAL + \newcommand\MultlinedHook{ + \renewenvironment{subarray}[1]{% + \vcenter\bgroup + \Let@ \restore@math@cr \default@tag + \let\math@cr@@\AMS@math@cr@@ % <--- the fix + \baselineskip\fontdimen10 \scriptfont\tw@ + \advance\baselineskip\fontdimen12 \scriptfont\tw@ + \lineskip\thr@@\fontdimen8 \scriptfont\thr@@ + \lineskiplimit\lineskip + \ialign\bgroup\ifx c##1\hfil\fi + $\m@th\scriptstyle####$\hfil\crcr + }{% + \crcr\egroup\egroup + } + \renewenvironment{crampedsubarray}[1]{% + \vcenter\bgroup + \Let@ \restore@math@cr \default@tag + \let\math@cr@@\AMS@math@cr@@ % <--- the fix + \baselineskip\fontdimen10 \scriptfont\tw@ + \advance\baselineskip\fontdimen12 \scriptfont\tw@ + \lineskip\thr@@\fontdimen8 \scriptfont\thr@@ + \lineskiplimit\lineskip + \ialign\bgroup\ifx c##1\hfil\fi % \end{macrocode} % \changes{v1.25}{2021/03/18}{use \cs{MT_cramped_internal:Nn} instead, % see issue \#17} % Here we should use the proper cramped internal macro % \begin{macrocode} - %% $\m@th\scriptstyle\kern-\nulldelimiterspace\radical\z@{####}$ - \span\MT_cramped_internal:Nn \scriptstyle {####}% - \hfil\crcr - }{% - \crcr\egroup\egroup - } - % from mathtolls - \def\MT_smallmatrix_begin:N ##1{% - \Let@\restore@math@cr\default@tag - \let\math@cr@@\AMS@math@cr@@ % <--- the fix - \baselineskip6\ex@ \lineskip1.5\ex@ \lineskiplimit\lineskip - \csname MT_smallmatrix_##1_begin:\endcsname + \span\MT_cramped_internal:Nn \scriptstyle {####}% + \hfil\crcr + }{% + \crcr\egroup\egroup + } + % from mathtools + \def\MT_smallmatrix_begin:N ##1{% + \Let@\restore@math@cr\default@tag + \let\math@cr@@\AMS@math@cr@@ % <--- the fix + \baselineskip6\ex@ \lineskip1.5\ex@ \lineskiplimit\lineskip + \csname MT_smallmatrix_##1_begin:\endcsname + } + % from amsmath + \renewenvironment{smallmatrix}{\null\,\vcenter\bgroup + \Let@\restore@math@cr\default@tag + \let\math@cr@@\AMS@math@cr@@ % <--- the fix + \baselineskip6\ex@ \lineskip1.5\ex@ \lineskiplimit\lineskip + \ialign\bgroup\hfil$\m@th\scriptstyle####$\hfil&&\thickspace\hfil + $\m@th\scriptstyle####$\hfil\crcr + }{% + \crcr\egroup\egroup\,% + } } - % from amsmath - \renewenvironment{smallmatrix}{\null\,\vcenter\bgroup - \Let@\restore@math@cr\default@tag - \let\math@cr@@\AMS@math@cr@@ % <--- the fix - \baselineskip6\ex@ \lineskip1.5\ex@ \lineskiplimit\lineskip - \ialign\bgroup\hfil$\m@th\scriptstyle####$\hfil&&\thickspace\hfil - $\m@th\scriptstyle####$\hfil\crcr - }{% - \crcr\egroup\egroup\,% +\else +% \end{macrocode} +% The LuaLaTeX version, only difference is the definition of crampedsubarray +% \begin{macrocode} + % THIS IS LUALATEX + \newcommand\MultlinedHook{ + % from amsmath + \newenvironment{subarray}[1]{% + \vcenter\bgroup + \Let@ \restore@math@cr \default@tag + \let\math@cr@@\AMS@math@cr@@ % <--- the fix + \baselineskip \Umathstacknumup \scriptstyle + \advance\baselineskip \Umathstackdenomdown \scriptstyle + \lineskip \Umathstackvgap \scriptstyle + \lineskiplimit \lineskip + \ialign\bgroup\ifx c##1\hfil\fi + \Ustartmath + \m@th\scriptstyle#### + \Ustopmath + \hfil\crcr + }{% + \crcr\egroup\egroup + } + % from mathtools + \newenvironment{crampedsubarray}[1]{% + \vcenter\bgroup + \Let@ \restore@math@cr \default@tag + \let\math@cr@@\AMS@math@cr@@ % <--- the fix + \baselineskip \Umathstacknumup \scriptstyle + \advance\baselineskip \Umathstackdenomdown \scriptstyle + \lineskip \Umathstackvgap \scriptstyle + \lineskiplimit \lineskip + \ialign\bgroup\ifx c##1\hfil\fi + \Ustartmath + \crampedscriptstyle{####} + \Ustopmath + \hfil\crcr + }{% + \crcr\egroup\egroup + } + % from mathtools + \def\MT_smallmatrix_begin:N ##1{% + \Let@\restore@math@cr\default@tag + \let\math@cr@@\AMS@math@cr@@ % <--- the fix + \baselineskip6\ex@ \lineskip1.5\ex@ \lineskiplimit\lineskip + \csname MT_smallmatrix_##1_begin:\endcsname + } + % from amsmath + \renewenvironment{smallmatrix}{\null\,\vcenter\bgroup + \Let@\restore@math@cr\default@tag + \let\math@cr@@\AMS@math@cr@@ % <--- the fix + \baselineskip6\ex@ \lineskip1.5\ex@ \lineskiplimit\lineskip + \ialign\bgroup\hfil$\m@th\scriptstyle####$\hfil&&\thickspace\hfil + $\m@th\scriptstyle####$\hfil\crcr + }{% + \crcr\egroup\egroup\,% + } } -} +\fi + % \end{macrocode} % \end{macro} @@ -5960,6 +6023,25 @@ colorlinks, \ifvmode\leavevmode\fi {}\box\z@ } +% \end{macrocode} +% For LuaLaTeX we can use much less code as they have +% their own direct \cs{cramped...} macros. Directly listed +% from \verb|lualatex-math.sty| v1.9 2020/09/25 by Philipp Stephani. Quote: ``Here the +% additional set of braces is absolutely necessary, otherwise the changed +% mathematical style would be applied to the material after the +% \cs{mathchoice} construct. As the original (mathtools) command works in both text and +% math mode, we use \cs{ensuremath} here.'' +% \begin{macrocode} +\ifx\directlua\@undefined\else + \def\MT_cramped_internal:Nn #1#2{ + { + \ensuremath { + \use:c { cramped \cs_to_str:N #1 } #2 + } + } + } +\fi + % \end{macrocode} % \end{macro} % @@ -6019,12 +6101,18 @@ colorlinks, % \subsubsection{Cramped versions of subarray and \cs{substack}} % % -% \changes{v1.22}{2019/07/22}{Added cramped versions of subarray and \cs{substack}} -% This was suggested by Henri Menke in +% \changes{v1.22}{2019/07/22}{Added cramped versions of subarray and +% \cs{substack}} This was suggested by Henri Menke in % \url{https://github.com/latex3/latex2e/issues/149} and -% \url{https://chat.stackexchange.com/transcript/message/50943985#50943985}. As we are slowly moving away from the expl3 like syntax, we'll implement this with an adjusted copy of \env{subarray} from \pkg{amsmath}. +% \url{https://chat.stackexchange.com/transcript/message/50943985#50943985}. +% As we are slowly moving away from the expl3 like syntax, we'll +% implement this +% with an adjusted copy of \env{subarray} from \pkg{amsmath}. +% \changes{v1.26}{2021/03/27}{Fresh copy of subarray from \pkg{amsmath} +% including the lualatex branch} % \begin{environment}{crampedsubarray} % \begin{macrocode} +\ifx\directlua\@undefined \newenvironment{crampedsubarray}[1]{% \vcenter\bgroup \Let@ \restore@math@cr \default@tag @@ -6039,12 +6127,32 @@ colorlinks, % \changes{v1.25}{2021/03/18}{Added \cs{MT_cramped_internal:Nn}, see % issue \#17} % \begin{macrocode} - %%$\m@th\scriptstyle\kern-\nulldelimiterspace\radical\z@{##}$% <-- changed line - \span\MT_cramped_internal:Nn \scriptstyle {##}% - \hfil\crcr% + %%$\m@th\scriptstyle\kern-\nulldelimiterspace\radical\z@{##}$% <-- changed line + \span\MT_cramped_internal:Nn \scriptstyle {##}% + \hfil\crcr }{% -\crcr\egroup\egroup -} + \crcr\egroup\egroup +} +\else +\newenvironment{crampedsubarray}[1]{% + \vcenter\bgroup + \Let@ \restore@math@cr \default@tag + \baselineskip \Umathstacknumup \scriptstyle + \advance\baselineskip \Umathstackdenomdown \scriptstyle + \lineskip \Umathstackvgap \scriptstyle + \lineskiplimit \lineskip + \ialign\bgroup\ifx c#1\hfil\fi + \Ustartmath +% \end{macrocode} +% Here we simply use the build in cramped command from LuaLaTeX +% \begin{macrocode} + \crampedscriptstyle{##} + \Ustopmath + \hfil\crcr +}{% + \crcr\egroup\egroup +} +\fi % \end{macrocode} % \end{environment} % \begin{macro}{\crampedsubstack} diff --git a/Master/texmf-dist/source/latex/mathtools/mathtools.ins b/Master/texmf-dist/source/latex/mathtools/mathtools.ins index 82b7c16ff06..ab102f076bc 100644 --- a/Master/texmf-dist/source/latex/mathtools/mathtools.ins +++ b/Master/texmf-dist/source/latex/mathtools/mathtools.ins @@ -10,15 +10,16 @@ %% %% Copyright (C) 2002-2011 by Morten Hoegholm %% Copyright (C) 2012-2019 by Lars Madsen -%% Copyright (C) 2012-2020 by Lars Madsen, the LaTeX3 project +%% Copyright (C) 2020- by Lars Madsen, the LaTeX3 project +%% %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either -%% version 1.3 of this license or (at your option) any later +%% version 1.3c of this license or (at your option) any later %% version. The latest version of this license is in %% http://www.latex-project.org/lppl.txt -%% and version 1.3 or later is part of all distributions of -%% LaTeX version 2005/12/01 or later. +%% and version 1.3c or later is part of all distributions of +%% LaTeX version 2008/05/04 or later. %% %% This work has the LPPL maintenance status "maintained". %% @@ -32,7 +33,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: mathtools 2020/03/24 v1.24} +\Msg{* Package: mathtools 2021/03/18 v1.25} \Msg{************************************************************************} \keepsilent @@ -44,15 +45,15 @@ This is a generated file. Copyright (C) 2002-2011 by Morten Hoegholm Copyright (C) 2012-2019 by Lars Madsen -Copyright (C) 2020 by Lars Madsen, the LaTeX3 project +Copyright (C) 2020- by Lars Madsen, the LaTeX3 project This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either -version 1.3 of this license or (at your option) any later +version 1.3c of this license or (at your option) any later version. The latest version of this license is in http://www.latex-project.org/lppl.txt -and version 1.3 or later is part of all distributions of -LaTeX version 2005/12/01 or later. +and version 1.3c or later is part of all distributions of +LaTeX version 2008/05/04 or later. This work has the LPPL maintenance status "maintained". diff --git a/Master/texmf-dist/source/latex/mathtools/mhsetup.ins b/Master/texmf-dist/source/latex/mathtools/mhsetup.ins deleted file mode 100644 index edf6baa8244..00000000000 --- a/Master/texmf-dist/source/latex/mathtools/mhsetup.ins +++ /dev/null @@ -1,93 +0,0 @@ -%% -%% This is file `mhsetup.ins', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% mhsetup.dtx (with options: `install') -%% -%% This is a generated file. -%% -%% Copyright (C) 2002-2007,2010 by Morten Hoegholm -%% Copyright (C) 2017-2019 by Lars Madsen -%% Copyright (C) 2020- by Lars Madsen, The LaTeX3 team -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either -%% version 1.3 of this license or (at your option) any later -%% version. The latest version of this license is in -%% http://www.latex-project.org/lppl.txt -%% and version 1.3 or later is part of all distributions of -%% LaTeX version 2005/12/01 or later. -%% -%% This work has the LPPL maintenance status "maintained". -%% -%% This Current Maintainer of this work is Lars Madsen -%% , The LaTeX3 team https://github.com/latex3/mathtools -%% -%% This work consists of the main source file mhsetup.dtx -%% and the derived files -%% mhsetup.sty, mhsetup.pdf, mhsetup.ins, mhsetup.drv. -%% -\input docstrip.tex -\Msg{************************************************************************} -\Msg{* Installation} -\Msg{* Package: mhsetup 2017/03/31 v1.3 mhsetup} -\Msg{************************************************************************} - -\keepsilent -\askforoverwritefalse - -\preamble - -This is a generated file. - -Copyright (C) 2002-2007,2010 by Morten Hoegholm -Copyright (C) 2017-2019 by Lars Madsen -Copyright (C) 2020- by Lars Madsen, The LaTeX3 team - -This work may be distributed and/or modified under the -conditions of the LaTeX Project Public License, either -version 1.3 of this license or (at your option) any later -version. The latest version of this license is in - http://www.latex-project.org/lppl.txt -and version 1.3 or later is part of all distributions of -LaTeX version 2005/12/01 or later. - -This work has the LPPL maintenance status "maintained". - -This Current Maintainer of this work is Lars Madsen -, The LaTeX3 team https://github.com/latex3/mathtools - -This work consists of the main source file mhsetup.dtx -and the derived files - mhsetup.sty, mhsetup.pdf, mhsetup.ins, mhsetup.drv. - -\endpreamble - -\generate{% - \file{mhsetup.ins}{\from{mhsetup.dtx}{install}}% - \file{mhsetup.drv}{\from{mhsetup.dtx}{driver}}% - \usedir{tex/latex/mh}% - \file{mhsetup.sty}{\from{mhsetup.dtx}{package}}% -} - -\obeyspaces -\Msg{************************************************************************} -\Msg{*} -\Msg{* To finish the installation you have to move the following} -\Msg{* file into a directory searched by TeX:} -\Msg{*} -\Msg{* mhsetup.sty} -\Msg{*} -\Msg{* To produce the documentation run the file `mhsetup.drv'} -\Msg{* through LaTeX.} -\Msg{*} -\Msg{* Happy TeXing!} -\Msg{*} -\Msg{************************************************************************} - -\endbatchfile -\endinput -%% -%% End of file `mhsetup.ins'. diff --git a/Master/texmf-dist/tex/latex/mathtools/mathtools.sty b/Master/texmf-dist/tex/latex/mathtools/mathtools.sty index c3b38d51c6c..0b1a6c5c6ed 100644 --- a/Master/texmf-dist/tex/latex/mathtools/mathtools.sty +++ b/Master/texmf-dist/tex/latex/mathtools/mathtools.sty @@ -31,7 +31,7 @@ %% mathtools.sty, mathtools.pdf, mathtools.ins, mathtools.drv. %% \ProvidesPackage{mathtools}% - [2021/03/18 v1.25 mathematical typesetting tools] + [2021/03/28 v1.26 mathematical typesetting tools] \RequirePackage{keyval,calc} \RequirePackage{mhsetup}[2021/03/18] \MHInternalSyntaxOn @@ -611,53 +611,110 @@ } \MT_start_mult:N \MT_mult_default_pos: } -\newcommand\MultlinedHook{ - \renewenvironment{subarray}[1]{% - \vcenter\bgroup - \Let@ \restore@math@cr \default@tag - \let\math@cr@@\AMS@math@cr@@ % <--- the fix - \baselineskip\fontdimen10 \scriptfont\tw@ - \advance\baselineskip\fontdimen12 \scriptfont\tw@ - \lineskip\thr@@\fontdimen8 \scriptfont\thr@@ - \lineskiplimit\lineskip - \ialign\bgroup\ifx c##1\hfil\fi - $\m@th\scriptstyle####$\hfil\crcr - }{% - \crcr\egroup\egroup - } - \renewenvironment{crampedsubarray}[1]{% - \vcenter\bgroup - \Let@ \restore@math@cr \default@tag - \let\math@cr@@\AMS@math@cr@@ % <--- the fix - \baselineskip\fontdimen10 \scriptfont\tw@ - \advance\baselineskip\fontdimen12 \scriptfont\tw@ - \lineskip\thr@@\fontdimen8 \scriptfont\thr@@ - \lineskiplimit\lineskip - \ialign\bgroup\ifx c##1\hfil\fi - %% $\m@th\scriptstyle\kern-\nulldelimiterspace\radical\z@{####}$ - \span\MT_cramped_internal:Nn \scriptstyle {####}% - \hfil\crcr - }{% - \crcr\egroup\egroup - } - % from mathtolls - \def\MT_smallmatrix_begin:N ##1{% - \Let@\restore@math@cr\default@tag - \let\math@cr@@\AMS@math@cr@@ % <--- the fix - \baselineskip6\ex@ \lineskip1.5\ex@ \lineskiplimit\lineskip - \csname MT_smallmatrix_##1_begin:\endcsname +\ifx\directlua\@undefined + % THIS IS NORMAL + \newcommand\MultlinedHook{ + \renewenvironment{subarray}[1]{% + \vcenter\bgroup + \Let@ \restore@math@cr \default@tag + \let\math@cr@@\AMS@math@cr@@ % <--- the fix + \baselineskip\fontdimen10 \scriptfont\tw@ + \advance\baselineskip\fontdimen12 \scriptfont\tw@ + \lineskip\thr@@\fontdimen8 \scriptfont\thr@@ + \lineskiplimit\lineskip + \ialign\bgroup\ifx c##1\hfil\fi + $\m@th\scriptstyle####$\hfil\crcr + }{% + \crcr\egroup\egroup + } + \renewenvironment{crampedsubarray}[1]{% + \vcenter\bgroup + \Let@ \restore@math@cr \default@tag + \let\math@cr@@\AMS@math@cr@@ % <--- the fix + \baselineskip\fontdimen10 \scriptfont\tw@ + \advance\baselineskip\fontdimen12 \scriptfont\tw@ + \lineskip\thr@@\fontdimen8 \scriptfont\thr@@ + \lineskiplimit\lineskip + \ialign\bgroup\ifx c##1\hfil\fi + \span\MT_cramped_internal:Nn \scriptstyle {####}% + \hfil\crcr + }{% + \crcr\egroup\egroup + } + % from mathtools + \def\MT_smallmatrix_begin:N ##1{% + \Let@\restore@math@cr\default@tag + \let\math@cr@@\AMS@math@cr@@ % <--- the fix + \baselineskip6\ex@ \lineskip1.5\ex@ \lineskiplimit\lineskip + \csname MT_smallmatrix_##1_begin:\endcsname + } + % from amsmath + \renewenvironment{smallmatrix}{\null\,\vcenter\bgroup + \Let@\restore@math@cr\default@tag + \let\math@cr@@\AMS@math@cr@@ % <--- the fix + \baselineskip6\ex@ \lineskip1.5\ex@ \lineskiplimit\lineskip + \ialign\bgroup\hfil$\m@th\scriptstyle####$\hfil&&\thickspace\hfil + $\m@th\scriptstyle####$\hfil\crcr + }{% + \crcr\egroup\egroup\,% + } } - % from amsmath - \renewenvironment{smallmatrix}{\null\,\vcenter\bgroup - \Let@\restore@math@cr\default@tag - \let\math@cr@@\AMS@math@cr@@ % <--- the fix - \baselineskip6\ex@ \lineskip1.5\ex@ \lineskiplimit\lineskip - \ialign\bgroup\hfil$\m@th\scriptstyle####$\hfil&&\thickspace\hfil - $\m@th\scriptstyle####$\hfil\crcr - }{% - \crcr\egroup\egroup\,% +\else + % THIS IS LUALATEX + \newcommand\MultlinedHook{ + % from amsmath + \newenvironment{subarray}[1]{% + \vcenter\bgroup + \Let@ \restore@math@cr \default@tag + \let\math@cr@@\AMS@math@cr@@ % <--- the fix + \baselineskip \Umathstacknumup \scriptstyle + \advance\baselineskip \Umathstackdenomdown \scriptstyle + \lineskip \Umathstackvgap \scriptstyle + \lineskiplimit \lineskip + \ialign\bgroup\ifx c##1\hfil\fi + \Ustartmath + \m@th\scriptstyle#### + \Ustopmath + \hfil\crcr + }{% + \crcr\egroup\egroup + } + % from mathtools + \newenvironment{crampedsubarray}[1]{% + \vcenter\bgroup + \Let@ \restore@math@cr \default@tag + \let\math@cr@@\AMS@math@cr@@ % <--- the fix + \baselineskip \Umathstacknumup \scriptstyle + \advance\baselineskip \Umathstackdenomdown \scriptstyle + \lineskip \Umathstackvgap \scriptstyle + \lineskiplimit \lineskip + \ialign\bgroup\ifx c##1\hfil\fi + \Ustartmath + \crampedscriptstyle{####} + \Ustopmath + \hfil\crcr + }{% + \crcr\egroup\egroup + } + % from mathtools + \def\MT_smallmatrix_begin:N ##1{% + \Let@\restore@math@cr\default@tag + \let\math@cr@@\AMS@math@cr@@ % <--- the fix + \baselineskip6\ex@ \lineskip1.5\ex@ \lineskiplimit\lineskip + \csname MT_smallmatrix_##1_begin:\endcsname + } + % from amsmath + \renewenvironment{smallmatrix}{\null\,\vcenter\bgroup + \Let@\restore@math@cr\default@tag + \let\math@cr@@\AMS@math@cr@@ % <--- the fix + \baselineskip6\ex@ \lineskip1.5\ex@ \lineskiplimit\lineskip + \ialign\bgroup\hfil$\m@th\scriptstyle####$\hfil&&\thickspace\hfil + $\m@th\scriptstyle####$\hfil\crcr + }{% + \crcr\egroup\egroup\,% + } } -} +\fi \newenvironment{multlined}[1][] {\MH_group_align_safe_begin: @@ -1458,6 +1515,16 @@ \ifvmode\leavevmode\fi {}\box\z@ } +\ifx\directlua\@undefined\else + \def\MT_cramped_internal:Nn #1#2{ + { + \ensuremath { + \use:c { cramped \cs_to_str:N #1 } #2 + } + } + } +\fi + \providecommand*\crampedllap[1][\@empty]{ \relax\ifx\@empty#1\@empty \expandafter \mathpalette \expandafter \MT_cramped_llap_internal:Nn @@ -1488,6 +1555,7 @@ \def\MT_cramped_rlap_internal:Nn #1#2{ {}\rlap{\MT_cramped_internal:Nn #1{#2}} } +\ifx\directlua\@undefined \newenvironment{crampedsubarray}[1]{% \vcenter\bgroup \Let@ \restore@math@cr \default@tag @@ -1496,12 +1564,29 @@ \lineskip\thr@@\fontdimen8 \scriptfont\thr@@ \lineskiplimit\lineskip \ialign\bgroup\ifx c#1\hfil\fi - %%$\m@th\scriptstyle\kern-\nulldelimiterspace\radical\z@{##}$% <-- changed line - \span\MT_cramped_internal:Nn \scriptstyle {##}% - \hfil\crcr% + %%$\m@th\scriptstyle\kern-\nulldelimiterspace\radical\z@{##}$% <-- changed line + \span\MT_cramped_internal:Nn \scriptstyle {##}% + \hfil\crcr +}{% + \crcr\egroup\egroup +} +\else +\newenvironment{crampedsubarray}[1]{% + \vcenter\bgroup + \Let@ \restore@math@cr \default@tag + \baselineskip \Umathstacknumup \scriptstyle + \advance\baselineskip \Umathstackdenomdown \scriptstyle + \lineskip \Umathstackvgap \scriptstyle + \lineskiplimit \lineskip + \ialign\bgroup\ifx c#1\hfil\fi + \Ustartmath + \crampedscriptstyle{##} + \Ustopmath + \hfil\crcr }{% -\crcr\egroup\egroup + \crcr\egroup\egroup } +\fi \newcommand{\crampedsubstack}[1]{\crampedsubarray{c}#1\endcrampedsubarray} \newcommand{\MT_prescript_inner:}[4]{ \@mathmeasure\z@#4{\MT_prescript_sup:{#1}} -- cgit v1.2.3