mathtools (24mar20)

git-svn-id: svn://tug.org/texlive/trunk@54516 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 249 insertions, 178 deletions

diff --git a/Master/texmf-dist/tex/latex/mathtools/empheq.sty b/Master/texmf-dist/tex/latex/mathtools/empheq.sty
index 1c24bc158ab..380410b66f0 100644
--- a/Master/texmf-dist/tex/latex/mathtools/empheq.sty
+++ b/Master/texmf-dist/tex/latex/mathtools/empheq.sty
@@ -9,7 +9,8 @@
 %% This is a generated file.
 %% 
 %% Copyright (C) 2002-2007 by Morten Hoegholm
-%% Copyright (C) 2012-     by Lars Madsen
+%% Copyright (C) 2012-2019 by Lars Madsen
+%% Copyright (C) 2020-     by Lars Madsen, The LaTeX3 Project
 %% 
 %% 
 %% This work may be distributed and/or modified under the
@@ -23,7 +24,7 @@
 %% This work has the LPPL maintenance status "maintained".
 %% 
 %% This Current Maintainer of this work is
-%% Lars Madsen
+%% Lars Madsen, The LaTeX3 Project
 %% 
 %% This work consists of the main source file empheq.dtx
 %% and the derived files
@@ -75,6 +76,7 @@
 \newdimen\l_EQ_displaywidth_dim
 \def\EmphEqdisplaywidth{\l_EQ_displaywidth_dim}
 \newdimen\l_EQ_temp_linewidth_dim
+\newdimen\l_EQ_linewidth_dim
 \newdimen\EmphEqdelimitershortfall
 \newcount\EmphEqdelimiterfactor
 \EmphEqdelimiterfactor950
@@ -117,8 +119,8 @@
     \MH_else:
       \setkeys{\MT_options_name:}{multlined-pos=t}
     \MH_fi:
-      \g@addto@macro\EQ_complete_mathdisplay:{
-        \begin{MTmultlined}\relax}
+    \g@addto@macro\EQ_complete_mathdisplay:{
+      \begin{MTmultlined}\relax}
   }
   \g@addto@macro\EQ_complete_mathdisplay:\EQ_mathbody:
   \MH_if_boolean:nT {outer_mult}{
@@ -190,6 +192,19 @@
   \MH_let:NwN\SetTagPlusEndMark\EQ_tag_plus_endmark:
   \MH_let:NwN\SetOnlyEndMark\EQ_only_endmark:
   \l_EQ_temp_linewidth_dim\linewidth
+  \l_EQ_linewidth_dim\linewidth
+  \@tempdima\z@
+  \begingroup
+  \ifdefined\fullwidthdisplay\relax
+    \fullwidthdisplay
+    \global\@tempdima\displaywidth
+  \fi
+  \endgroup
+  \ifdim\@tempdima>\linewidth\relax
+    \l_EQ_temp_linewidth_dim\@tempdima
+    \l_EQ_linewidth_dim\@tempdima
+  \fi
+  \@tempdima\z@
   \g_EQ_toprow_height_dim\z@
   \g_EQ_bottomrow_depth_dim\z@
   \g_EQ_toptag_height_dim\z@
@@ -420,7 +435,9 @@
   \MH_if_num:w \maxfields@=\tw@
   \MH_else:
     \setlength{\l_EQ_temp_linewidth_dim}{%
-      \linewidth-\l_EQ_totalwidth_dim-\widthof{\EQ_outerbox:{}}}%
+      % \linewidth
+      \l_EQ_linewidth_dim
+      -\l_EQ_totalwidth_dim-\widthof{\EQ_outerbox:{}}}%
   \MH_fi:}
 \def\EQ_modify_linewidth_ii:{\EQ_modify_linewidth_i:}
 \def\EQ_find_displaywidth_i:{%
@@ -492,191 +509,209 @@
 \MH_let:NwN \MTmultlined \multlined
 \MH_let:NwN \endMTmultlined \endmultlined
 \MH_if_boolean:nTF {good_mult}{
-\MH_keyval_alias_with_addon:nnnn {EmphEqEnv}{multline}{gather}
-  {\MH_set_boolean_T:n {outer_mult}}
-\MH_keyval_alias_with_addon:nnnn {EmphEqEnv}{multline*}{gather*}
-  {\MH_set_boolean_T:n {outer_mult}}
-\def\EQ_modify_linewidth_iii_mult:{
-  \setlength{\l_EQ_temp_linewidth_dim}{%
-    \linewidth-\widthof{\EQ_outerbox:{}}}%
-  \MH_if_dim:w \g_EQ_widesttag_dim>\z@
-    \EQ_multline_modify_linewidth_tag:
-  \MH_else:
-    \EQ_multline_modify_linewidth_notag:
-  \MH_fi:
-  \MH_setlength:dn \l_MT_multwidth_dim{\l_EQ_temp_linewidth_dim}
-}
-\def\EQ_modify_linewidth_iv_mult:{\EQ_modify_linewidth_iii_mult:}
-\def\EQ_find_displaywidth_iii_mult:{%
-  \MH_setlength:dn \l_EQ_displaywidth_dim{\totwidth@}%
-  \MH_if_case:w \l_EQ_alignmentmode_int \MH_or: \MH_or: % #1 & #2:
-  \MH_or: % #3:
-    \MH_addtolength:dn \l_EQ_displaywidth_dim{-\@mathmargin}%
-  \MH_or: % #4:
-    \MH_addtolength:dn \l_EQ_displaywidth_dim{-\@mathmargin}%
-  \MH_fi:}
-\def\EQ_find_displaywidth_iv_mult:{\EQ_find_displaywidth_iii_mult:}
-\def\EQ_place_display_iii_mult:{
-  \MH_if_case:w \l_EQ_alignmentmode_int
-  \MH_or: % #1:
+  \MH_keyval_alias_with_addon:nnnn {EmphEqEnv}{multline}{gather}
+    {\MH_set_boolean_T:n {outer_mult}}
+  \MH_keyval_alias_with_addon:nnnn {EmphEqEnv}{multline*}{gather*}
+    {\MH_set_boolean_T:n {outer_mult}}
+  \def\EQ_modify_linewidth_iii_mult:{
+    \setlength{\l_EQ_temp_linewidth_dim}{%
+      % \linewidth
+      \l_EQ_linewidth_dim
+      -\widthof{\EQ_outerbox:{}}}%
     \MH_if_dim:w \g_EQ_widesttag_dim>\z@
-      \abovedisplayshortskip=\abovedisplayskip
-      \rlap{
-        \kern-.5\linewidth
-        \kern\multlinegap
-        \EQ_use_mathdisplay:
-      }
+      \EQ_multline_modify_linewidth_tag:
     \MH_else:
-      \EQ_use_mathdisplay:
+      \EQ_multline_modify_linewidth_notag:
     \MH_fi:
-  \MH_or: % #2:
-    \MH_if_dim:w \g_EQ_widesttag_dim>\z@
-      \llap{
-        \EQ_use_mathdisplay:
-        \kern-.5\linewidth
-        \kern\multlinegap
-      }%
-    \MH_else:
-      \EQ_use_mathdisplay:
+    \MH_setlength:dn \l_MT_multwidth_dim{\l_EQ_temp_linewidth_dim}
+    \MH_if_case:w \l_EQ_alignmentmode_int
+    \MH_or: \MH_or: % 1 and 2
+    \MH_or:
+      \MH_addtolength:dn
+        \l_EQ_temp_linewidth_dim{\@mathmargin}%
+    \MH_or:
+        \MH_addtolength:dn
+          \l_EQ_temp_linewidth_dim{\@mathmargin}%
     \MH_fi:
-  \MH_or: % #3:
-    \EQ_use_mathdisplay:
-  \MH_or: % #4:
-    \EQ_use_mathdisplay:
-  \MH_fi:
-}
-\def\EQ_place_display_iv_mult: {\EQ_place_display_iii_mult:}
-}{
-\def\EQ_generic_multline:nnnnn #1#2#3#4#5{%
-  \hskip1sp#2#3{{}#5}#4%
-  \MH_if:w *#1\relax\MH_else:\notag\MH_fi:}
-\def\multleft{\@ifstar{%
-  \MH_if_boolean:nTF {multlined}{
-    \def\EQ_next:{\EQ_multlined_left:n}
-  }{
-    \def\EQ_next:{
-      \EQ_generic_multline:nnnnn {*}{}{\mathrlap}{&&&&&}}
   }
-  \EQ_next:}{%
-  \MH_if_boolean:nTF {multlined}{
-    \def\EQ_next:{\EQ_multlined_left:n}%
-  }{
-    \def\EQ_next:{
-      \EQ_generic_multline:nnnnn {}{}{\mathrlap}{&&&&&}}
-  }
-  \EQ_next:}}%
-\def\multcenter{\@ifstar{%
-  \MH_if_boolean:nTF {multlined}{
-    \def\EQ_next:{\EQ_multlined_center:n}%
-  }{
-    \def\EQ_next:{
-      \EQ_generic_multline:nnnnn {*}{&&}{\mathclap}{&&&}}
-  }
-  \EQ_next:}{%
-  \MH_if_boolean:nTF {multlined}{
-    \def\EQ_next:{\EQ_multlined_center:n }%
-  }{
-    \def\EQ_next:{
-      \EQ_generic_multline:nnnnn {}{&&}{\mathclap}{&&&}}
-  }
-  \EQ_next:}}%
-\def\multright{\@ifstar{%
-  \MH_if_boolean:nTF {multlined}{
-    \def\EQ_next:{\EQ_multlined_right:n }%
-  }{
-    \def\EQ_next:{
-      \EQ_generic_multline:nnnnn {*}{&&&&&}{\mathllap}{}}
-  }
-  \EQ_next:}{%
-  \MH_if_boolean:nTF {multlined}{
-    \def\EQ_next:{\EQ_multlined_right:n }%
-  }{
-    \def\EQ_next:{
-      \EQ_generic_multline:nnnnn {}{&&&&&}{\mathllap}{}}
-  }
-  \EQ_next:}}
-\def\multfirst{%
-  \MH_if_boolean:nTF {multlined}{
-     \def\EQ_next:{\EQ_multlined_left:n }%
-  }{
+  \def\EQ_modify_linewidth_iv_mult:{\EQ_modify_linewidth_iii_mult:}
+  \def\EQ_find_displaywidth_iii_mult:{%
+    \MH_setlength:dn \l_EQ_displaywidth_dim{\totwidth@}%
+    \MH_if_case:w \l_EQ_alignmentmode_int \MH_or: \MH_or: % #1 & #2:
+    \MH_or: % #3:
+      \MH_addtolength:dn \l_EQ_displaywidth_dim{-\@mathmargin}%
+    \MH_or: % #4:
+      \MH_addtolength:dn \l_EQ_displaywidth_dim{-\@mathmargin}%
+    \MH_fi:}
+  \def\EQ_find_displaywidth_iv_mult:{\EQ_find_displaywidth_iii_mult:}
+  \def\EQ_place_display_iii_mult:{
     \MH_if_case:w \l_EQ_alignmentmode_int
     \MH_or: % #1:
-      \def\EQ_next:{\multleft}%
+      \MH_if_dim:w \g_EQ_widesttag_dim>\z@
+        \abovedisplayshortskip=\abovedisplayskip
+        \rlap{
+          % \kern-.5\linewidth
+          \kern-.5\l_EQ_linewidth_dim
+          \kern\multlinegap
+          \EQ_use_mathdisplay:
+        }
+      \MH_else:
+        \EQ_use_mathdisplay:
+      \MH_fi:
     \MH_or: % #2:
-      \def\EQ_next:{\multleft*}%
+      \MH_if_dim:w \g_EQ_widesttag_dim>\z@
+        \llap{
+          \EQ_use_mathdisplay:
+          % \kern-.5\linewidth
+          \kern-.5\l_EQ_linewidth_dim
+          \kern\multlinegap
+        }%
+      \MH_else:
+        \EQ_use_mathdisplay:
+      \MH_fi:
     \MH_or: % #3:
-      \def\EQ_next:{\multleft}%
+      \EQ_use_mathdisplay:
     \MH_or: % #4:
-      \def\EQ_next:{\multleft*}%
+      \EQ_use_mathdisplay:
     \MH_fi:
   }
-  \EQ_next:}
-\def\multmiddle{%
-  \def\EQ_next:{%
+  \def\EQ_place_display_iv_mult: {\EQ_place_display_iii_mult:}
+}{% on to the 'bad' version
+  \def\EQ_generic_multline:nnnnn #1#2#3#4#5{%
+    \hskip1sp#2#3{{}#5}#4%
+    \MH_if:w *#1\relax\MH_else:\notag\MH_fi:}
+  \def\multleft{\@ifstar{%
     \MH_if_boolean:nTF {multlined}{
-      \expandafter\EQ_multlined_center:n
+      \def\EQ_next:{\EQ_multlined_left:n}
     }{
-      \expandafter\multcenter
+      \def\EQ_next:{
+        \EQ_generic_multline:nnnnn {*}{}{\mathrlap}{&&&&&}}
     }
-  }%
-  \@ifstar{\EQ_next:}{\EQ_next:}}
-\def\multlast{%
-  \MH_if_boolean:nTF {multlined}{
-     \def\EQ_next:{\EQ_multlined_right:n }%
-  }{
-    \MH_if_case:w \l_EQ_alignmentmode_int
-    \MH_or: % #1:
-      \def\EQ_next:{\multright*}%
-    \MH_or: % #2:
-      \def\EQ_next:{\multright}%
-    \MH_or: % #3:
-      \def\EQ_next:{\multright*}%
-    \MH_or: % #4:
-      \def\EQ_next:{\multright}%
-    \MH_fi:
-  }
-  \EQ_next:}
-\MH_new_boolean:n {multlined}
-\newdimen\multlinedwidth
-\MH_setlength:dn \multlinedwidth{.7\linewidth}
-\renewenvironment{multlined}%
-  {\MH_nospace_ifnextchar:Nnn [  {\EQ_multlined_I:w}
-                                 {\EQ_multlined_I:w[c]}
+    \EQ_next:}{%
+    \MH_if_boolean:nTF {multlined}{
+      \def\EQ_next:{\EQ_multlined_left:n}%
+    }{
+      \def\EQ_next:{
+        \EQ_generic_multline:nnnnn {}{}{\mathrlap}{&&&&&}}
+    }
+    \EQ_next:}}%
+  \def\multcenter{\@ifstar{%
+    \MH_if_boolean:nTF {multlined}{
+      \def\EQ_next:{\EQ_multlined_center:n}%
+    }{
+      \def\EQ_next:{
+        \EQ_generic_multline:nnnnn {*}{&&}{\mathclap}{&&&}}
+    }
+    \EQ_next:}{%
+    \MH_if_boolean:nTF {multlined}{
+      \def\EQ_next:{\EQ_multlined_center:n }%
+    }{
+      \def\EQ_next:{
+        \EQ_generic_multline:nnnnn {}{&&}{\mathclap}{&&&}}
+    }
+    \EQ_next:}}%
+  \def\multright{\@ifstar{%
+    \MH_if_boolean:nTF {multlined}{
+      \def\EQ_next:{\EQ_multlined_right:n }%
+    }{
+      \def\EQ_next:{
+        \EQ_generic_multline:nnnnn {*}{&&&&&}{\mathllap}{}}
+    }
+    \EQ_next:}{%
+    \MH_if_boolean:nTF {multlined}{
+      \def\EQ_next:{\EQ_multlined_right:n }%
+    }{
+      \def\EQ_next:{
+        \EQ_generic_multline:nnnnn {}{&&&&&}{\mathllap}{}}
+    }
+    \EQ_next:}}
+  \def\multfirst{%
+    \MH_if_boolean:nTF {multlined}{
+       \def\EQ_next:{\EQ_multlined_left:n }%
+    }{
+      \MH_if_case:w \l_EQ_alignmentmode_int
+      \MH_or: % #1:
+        \def\EQ_next:{\multleft}%
+      \MH_or: % #2:
+        \def\EQ_next:{\multleft*}%
+      \MH_or: % #3:
+        \def\EQ_next:{\multleft}%
+      \MH_or: % #4:
+        \def\EQ_next:{\multleft*}%
+      \MH_fi:
+    }
+    \EQ_next:}
+  \def\multmiddle{%
+    \def\EQ_next:{%
+      \MH_if_boolean:nTF {multlined}{
+        \expandafter\EQ_multlined_center:n
+      }{
+        \expandafter\multcenter
+      }
+    }%
+    \@ifstar{\EQ_next:}{\EQ_next:}}
+  \def\multlast{%
+    \MH_if_boolean:nTF {multlined}{
+       \def\EQ_next:{\EQ_multlined_right:n }%
+    }{
+      \MH_if_case:w \l_EQ_alignmentmode_int
+      \MH_or: % #1:
+        \def\EQ_next:{\multright*}%
+      \MH_or: % #2:
+        \def\EQ_next:{\multright}%
+      \MH_or: % #3:
+        \def\EQ_next:{\multright*}%
+      \MH_or: % #4:
+        \def\EQ_next:{\multright}%
+      \MH_fi:
+    }
+    \EQ_next:}
+  \MH_new_boolean:n {multlined}
+  \newdimen\multlinedwidth
+  \MH_setlength:dn \multlinedwidth{
+    % .7\linewidth
+    0.7\l_EQ_linewidth_dim
   }
-  { \endaligned }
-\def\EQ_multlined_I:w[#1]{%
-  \MH_nospace_ifnextchar:Nnn[  {\EQ_multlined_II:w[#1]}
-                               {\EQ_multlined_II:w[#1][\multlinedwidth]}}
-\def\EQ_multlined_II:w[#1][#2]{%
-  \MH_set_boolean_T:n {multlined}
-  \MH_let:NwN \Let@\MT_saved_Let:
-  \MH_if:w t#1\relax \EQ_multlined_III:nn {#1}{#2}%
-  \MH_else:
-    \MH_if:w b#1\relax \EQ_multlined_III:nn {#1}{#2}%
+  \renewenvironment{multlined}%
+    {\MH_nospace_ifnextchar:Nnn [  {\EQ_multlined_I:w}
+                                   {\EQ_multlined_I:w[c]}
+    }
+    { \endaligned }
+  \def\EQ_multlined_I:w[#1]{%
+    \MH_nospace_ifnextchar:Nnn[  {\EQ_multlined_II:w[#1]}
+                                 {\EQ_multlined_II:w[#1][\multlinedwidth]}}
+  \def\EQ_multlined_II:w[#1][#2]{%
+    \MH_set_boolean_T:n {multlined}
+    \MH_let:NwN \Let@\MT_saved_Let:
+    \MH_if:w t#1\relax \EQ_multlined_III:nn {#1}{#2}%
     \MH_else:
-      \MH_if:w c#1\relax \EQ_multlined_III:nn {#1}{#2}%
+      \MH_if:w b#1\relax \EQ_multlined_III:nn {#1}{#2}%
       \MH_else:
-        \EQ_multlined_III:nn {#2}{#1}%
+        \MH_if:w c#1\relax \EQ_multlined_III:nn {#1}{#2}%
+        \MH_else:
+          \EQ_multlined_III:nn {#2}{#1}%
+        \MH_fi:
       \MH_fi:
     \MH_fi:
-  \MH_fi:
-  \mkern-\thinmuskip
-  \EQ_next:}
-\def\EQ_multlined_III:nn #1#2{%
-  \def\EQ_next:{\setlength\multlinedwidth{#2}%
-                          \start@aligned{#1}{\thr@@}}}
-\def\EQ_multlined_left:n #1{%
-  \mathrlap{#1}&\hskip.5\multlinedwidth&&\hskip.5\multlinedwidth&&}
-\def\EQ_multlined_center:n #1{%
-  &\hskip.5\multlinedwidth&&\mathclap{#1}\hskip.5\multlinedwidth&&}
-\def\EQ_multlined_right:n #1{%
-  &\hskip.5\multlinedwidth&&\hskip.5\multlinedwidth&&\mathllap{#1}}
+    \mkern-\thinmuskip
+    \EQ_next:}
+  \def\EQ_multlined_III:nn #1#2{%
+    \def\EQ_next:{\setlength\multlinedwidth{#2}%
+                            \start@aligned{#1}{\thr@@}}}
+  \def\EQ_multlined_left:n #1{%
+    \mathrlap{#1}&\hskip.5\multlinedwidth&&\hskip.5\multlinedwidth&&}
+  \def\EQ_multlined_center:n #1{%
+    &\hskip.5\multlinedwidth&&\mathclap{#1}\hskip.5\multlinedwidth&&}
+  \def\EQ_multlined_right:n #1{%
+    &\hskip.5\multlinedwidth&&\hskip.5\multlinedwidth&&\mathllap{#1}}
 }
 \EQ_new_equationtype:nnn {EmphEqEnv}{flalign}{5}
 \EQ_new_equationtype:nnn {EmphEqEnv}{flalign*}{6}
 \def\EQ_modify_linewidth_v:{%
   \setlength{\l_EQ_temp_linewidth_dim}{%
-    \linewidth-\l_EQ_totalwidth_dim-\widthof{\EQ_outerbox:{}}}%
+    % \linewidth
+    \l_EQ_linewidth_dim
+    -\l_EQ_totalwidth_dim-\widthof{\EQ_outerbox:{}}}%
   \MH_if_dim:w \g_EQ_widesttag_dim>\z@
     \MH_if_boolean:nTF {multline}{
       \EQ_multline_modify_linewidth_tag:
@@ -711,11 +746,15 @@
   \MH_or: % #1:
     \MH_if_dim:w \g_EQ_widesttag_dim>\z@
       \MH_if_boolean:nTF {multline}{
-        \rlap{\kern\multlinegap  \kern-.5\linewidth
+        \rlap{\kern\multlinegap
+          % \kern-.5\linewidth
+          \kern-.5\l_EQ_linewidth_dim
           \EQ_use_mathdisplay:
           \kern-\mintagsep  \kern\multlinetaggap}%
       }{
-        \rlap{\kern-.5\linewidth\EQ_use_mathdisplay:}%
+        \rlap{%\kern-.5\linewidth
+          \kern-.5\l_EQ_linewidth_dim
+          \EQ_use_mathdisplay:}%
       }
     \MH_else:
       \EQ_use_mathdisplay:
@@ -725,15 +764,22 @@
       \MH_if_boolean:nTF {multline}{
         \llap{\kern-\mintagsep \kern\multlinetaggap
           \EQ_use_mathdisplay:
-          \kern\multlinegap  \kern-.5\linewidth}%
+          \kern\multlinegap
+          % \kern-.5\linewidth
+          \kern-.5\l_EQ_linewidth_dim
+        }%
       }{
-        \llap{\EQ_use_mathdisplay:\kern-.5\linewidth}%
+        \llap{\EQ_use_mathdisplay:
+          % \kern-.5\linewidth
+          \kern-.5\l_EQ_linewidth_dim
+        }%
       }
     \MH_else:
       \EQ_use_mathdisplay:
     \MH_fi:
   \MH_or: % #3:
-    \MH_if_boolean:nF {multline}{ \kern-\multlinetaggap }
+    \MH_if_boolean:nTF {multline}{ \kern-\multlinetaggap }
+                                 { \kern-\@mathmargin    }
     \EQ_use_mathdisplay:
   \MH_or: % #4:
     \MH_if_dim:w \g_EQ_widesttag_dim>\z@
@@ -902,6 +948,10 @@
           \rule[-\dp\z@-\shadowsize]{\shadowsize}{\ht\z@+\dp\z@}}}}%
   }{}%
 }
+\g@addto@macro\EQ_typeset_display_hook:{
+  % \columnwidth\linewidth
+  \def\fullwidthdisplay{}
+}
 \def\EQ_overload_ams_begin:n #1{%
   \MH_let:cc {AmS#1}{#1}%
   \MH_let:cc {AmS#1*}{#1*}
diff --git a/Master/texmf-dist/tex/latex/mathtools/mathtools.sty b/Master/texmf-dist/tex/latex/mathtools/mathtools.sty
index 3c0c57b48b5..484ed17a818 100644
--- a/Master/texmf-dist/tex/latex/mathtools/mathtools.sty
+++ b/Master/texmf-dist/tex/latex/mathtools/mathtools.sty
@@ -9,7 +9,8 @@
 %% This is a generated file.
 %% 
 %% Copyright (C) 2002-2011 by Morten Hoegholm
-%% Copyright (C) 2012-     by Lars Madsen
+%% Copyright (C) 2012-2019 by Lars Madsen
+%% Copyright (C) 2020      by Lars Madsen, the LaTeX3 project
 %% 
 %% 
 %% This work may be distributed and/or modified under the
@@ -23,14 +24,14 @@
 %% This work has the LPPL maintenance status "maintained".
 %% 
 %% This Current Maintainer of this work is
-%% Lars Madsen
+%% Lars Madsen and the LaTeX3 project
 %% 
 %% This work consists of the main source file mathtools.dtx
 %% and the derived files
 %%    mathtools.sty, mathtools.pdf, mathtools.ins, mathtools.drv.
 %% 
 \ProvidesPackage{mathtools}%
-  [2020/01/17 v1.23 mathematical typesetting tools]
+  [2020/03/24 v1.24 mathematical typesetting tools]
 \RequirePackage{keyval,calc}
 \RequirePackage{mhsetup}[2017/03/31]
 \MHInternalSyntaxOn
@@ -320,11 +321,11 @@
 \def\MT_leftrightarrow_fill:{%
   \arrowfill@\leftarrow\relbar\rightarrow}
 \providecommand*\xLeftarrow[2][]{%
-  \ext@arrow 0055{\Leftarrowfill@}{#1}{#2}}
+  \ext@arrow 0055{\Leftarrowfill@}{\ #1}{\ #2}}
 \providecommand*\xRightarrow[2][]{%
-  \ext@arrow 0055{\Rightarrowfill@}{#1}{#2}}
+  \ext@arrow 0055{\Rightarrowfill@}{#1\ }{#2\ }}
 \providecommand*\xLeftrightarrow[2][]{%
-  \ext@arrow 0055{\Leftrightarrowfill@}{#1}{#2}}
+  \ext@arrow 0055{\Leftrightarrowfill@}{\ #1\ }{\ #2\ }}
 \def\MT_rightharpoondown_fill:{%
   \arrowfill@\relbar\relbar\rightharpoondown}
 \def\MT_rightharpoonup_fill:{%
@@ -1702,6 +1703,24 @@
 \MaybeMHPrecedingSpacesOff
 \renewcommand\aligned@a[1][c]{\start@aligned{#1}\m@ne}
 \MHPrecedingSpacesOn
+\newbox\xmathstrut@box
+\newdimen\xmathstrut@dim
+\def\xmathstrut{\@dblarg\xmathstrut@}
+\def\xmathstrut@[#1]#2{%
+  \def\xmathstrut@dp{#1}%
+  \vphantom{\mathpalette\xmathstrut@do{#2}}%
+}
+\def\xmathstrut@do#1#2{%
+  \setbox\xmathstrut@box\hbox{$#1($}%)%emacs
+   \xmathstrut@dim\dimexpr\ht\xmathstrut@box+\dp\xmathstrut@box\relax
+   \ht\xmathstrut@box\dimexpr\ht\xmathstrut@box
+           +#2\xmathstrut@dim
+           \relax
+   \dp\xmathstrut@box\dimexpr\dp\xmathstrut@box
+         +\xmathstrut@dp\xmathstrut@dim
+         \relax
+   \box\xmathstrut@box}
+
 \endinput
 %%
 %% End of file `mathtools.sty'.
diff --git a/Master/texmf-dist/tex/latex/mathtools/mhsetup.sty b/Master/texmf-dist/tex/latex/mathtools/mhsetup.sty
index cf84c8ff77c..cba3e5836b0 100644
--- a/Master/texmf-dist/tex/latex/mathtools/mhsetup.sty
+++ b/Master/texmf-dist/tex/latex/mathtools/mhsetup.sty
@@ -9,7 +9,8 @@
 %% This is a generated file.
 %% 
 %% Copyright (C) 2002-2007,2010 by Morten Hoegholm
-%% Copyright (C) 2017           by Lars Madsen
+%% 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
@@ -21,7 +22,8 @@
 %% 
 %% This work has the LPPL maintenance status "maintained".
 %% 
-%% This Current Maintainer of this work is Lars Madsen <daleif@math.au.dk>
+%% This Current Maintainer of this work is Lars Madsen
+%% <daleif@math.au.dk>, The LaTeX3 team https://github.com/latex3/mathtools
 %% 
 %% This work consists of the main source file mhsetup.dtx
 %% and the derived files