mh (10may12)

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

10 files changed, 197 insertions, 61 deletions

diff --git a/Master/texmf-dist/tex/latex/mh/breqn.sty b/Master/texmf-dist/tex/latex/mh/breqn.sty
index 7bbb64d3d0a..464b862b398 100644
--- a/Master/texmf-dist/tex/latex/mh/breqn.sty
+++ b/Master/texmf-dist/tex/latex/mh/breqn.sty
@@ -9,7 +9,7 @@
 %% This is a generated file.
 %% 
 %% Copyright (C) 1997-2003 by Michael J. Downes
-%% Copyright (C) 2007-2008 by Morten Hoegholm <mh.ctan@gmail.com>
+%% Copyright (C) 2007-2008 by Morten Hoegholm
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -21,7 +21,7 @@
 %% 
 %% This work has the LPPL maintenance status "maintained".
 %% 
-%% This Current Maintainer of this work is Morten Hoegholm,
+%% This Current Maintainers of this work is
 %% Lars Madsen, Will Robertson and Joseph Wright.
 %% 
 %% This work consists of the main source file breqn.dtx
@@ -30,7 +30,8 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}[2009/08/05]
-\ProvidesExplPackage{breqn}{2009/08/07}{0.98a}{Breaking equations}
+\ProvidesExplPackage{breqn}{2012/05/10}{0.98b}{Breaking equations}
+\ExplSyntaxOff
 \edef\breqnpopcats{%
   \catcode\number`\"=\number\catcode`\"
   \relax}
@@ -157,6 +158,7 @@
     \splitfirstmark{\string\splitfirstmark:}%
     \splitbotmark{\string\splitbotmark:}%
     #1{\string#1}%
+    \@nil % for the \@car
   \edef\@tempa{\expandafter\strip@prefix\meaning\@tempb}%
   \edef\@tempb{\meaning#1}%
   \ifx\@tempa\@tempb \global\let#2#1%
@@ -1237,9 +1239,10 @@
     \fi
   \fi
 }
-\def\true@false@true{\fi\fi\iftrue\iffalse\iftrue}
+\def\true@true@true   {\fi\fi\iftrue \iftrue \iftrue }
+\def\true@false@true  {\fi\fi\iftrue \iffalse\iftrue }
+\def\false@true@false {\fi\fi\iffalse\iftrue \iffalse}
 \def\false@false@false{\fi\fi\iffalse\iffalse\iffalse}
-\def\false@true@false{\fi\fi\iffalse\iftrue\iffalse}
 \def\eq@density@factor{.475}
 \def\eq@dense@enough@a{%
   \@True \fi
diff --git a/Master/texmf-dist/tex/latex/mh/cmbase.sym b/Master/texmf-dist/tex/latex/mh/cmbase.sym
index 8d9193ede88..14904e3b029 100644
--- a/Master/texmf-dist/tex/latex/mh/cmbase.sym
+++ b/Master/texmf-dist/tex/latex/mh/cmbase.sym
@@ -9,7 +9,7 @@
 %% This is a generated file.
 %% 
 %% Copyright (C) 1997-2003 by Michael J. Downes
-%% Copyright (C) 2007-2010 by Morten Hoegholm <mh.ctan@gmail.com>
+%% Copyright (C) 2007-2010 by Morten Hoegholm
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -21,7 +21,7 @@
 %% 
 %% This work has the LPPL maintenance status "maintained".
 %% 
-%% This Current Maintainer of this work is Morten Hoegholm,
+%% This Current Maintainer of this work is
 %% Lars Madsen, Will Robertson and Joseph Wright.
 %% 
 %% This work consists of the main source file flexisym.dtx
diff --git a/Master/texmf-dist/tex/latex/mh/empheq.sty b/Master/texmf-dist/tex/latex/mh/empheq.sty
index f2d447b513b..a80ea8e19ee 100644
--- a/Master/texmf-dist/tex/latex/mh/empheq.sty
+++ b/Master/texmf-dist/tex/latex/mh/empheq.sty
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2002-2007 by Morten Hoegholm <mh.ctan@gmail.com>
+%% Copyright (C) 2002-2007 by Morten Hoegholm
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -20,7 +20,8 @@
 %% 
 %% This work has the LPPL maintenance status "maintained".
 %% 
-%% This Current Maintainer of this work is Morten Hoegholm.
+%% This Current Maintainer of this work is
+%% Lars Madsen, Will Robertson and Joseph Wright.
 %% 
 %% This work consists of the main source file empheq.dtx
 %% and the derived files
diff --git a/Master/texmf-dist/tex/latex/mh/flexisym.sty b/Master/texmf-dist/tex/latex/mh/flexisym.sty
index b952243ec8a..642bda9dfeb 100644
--- a/Master/texmf-dist/tex/latex/mh/flexisym.sty
+++ b/Master/texmf-dist/tex/latex/mh/flexisym.sty
@@ -9,7 +9,7 @@
 %% This is a generated file.
 %% 
 %% Copyright (C) 1997-2003 by Michael J. Downes
-%% Copyright (C) 2007-2010 by Morten Hoegholm <mh.ctan@gmail.com>
+%% Copyright (C) 2007-2010 by Morten Hoegholm
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -21,7 +21,7 @@
 %% 
 %% This work has the LPPL maintenance status "maintained".
 %% 
-%% This Current Maintainer of this work is Morten Hoegholm,
+%% This Current Maintainer of this work is
 %% Lars Madsen, Will Robertson and Joseph Wright.
 %% 
 %% This work consists of the main source file flexisym.dtx
diff --git a/Master/texmf-dist/tex/latex/mh/mathpazo.sym b/Master/texmf-dist/tex/latex/mh/mathpazo.sym
index a0477158ce9..ffbdd9b72d7 100644
--- a/Master/texmf-dist/tex/latex/mh/mathpazo.sym
+++ b/Master/texmf-dist/tex/latex/mh/mathpazo.sym
@@ -9,7 +9,7 @@
 %% This is a generated file.
 %% 
 %% Copyright (C) 1997-2003 by Michael J. Downes
-%% Copyright (C) 2007-2010 by Morten Hoegholm <mh.ctan@gmail.com>
+%% Copyright (C) 2007-2010 by Morten Hoegholm
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -21,7 +21,7 @@
 %% 
 %% This work has the LPPL maintenance status "maintained".
 %% 
-%% This Current Maintainer of this work is Morten Hoegholm,
+%% This Current Maintainer of this work is
 %% Lars Madsen, Will Robertson and Joseph Wright.
 %% 
 %% This work consists of the main source file flexisym.dtx
diff --git a/Master/texmf-dist/tex/latex/mh/mathptmx.sym b/Master/texmf-dist/tex/latex/mh/mathptmx.sym
index 08435922fdc..34166a5868e 100644
--- a/Master/texmf-dist/tex/latex/mh/mathptmx.sym
+++ b/Master/texmf-dist/tex/latex/mh/mathptmx.sym
@@ -9,7 +9,7 @@
 %% This is a generated file.
 %% 
 %% Copyright (C) 1997-2003 by Michael J. Downes
-%% Copyright (C) 2007-2010 by Morten Hoegholm <mh.ctan@gmail.com>
+%% Copyright (C) 2007-2010 by Morten Hoegholm
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -21,7 +21,7 @@
 %% 
 %% This work has the LPPL maintenance status "maintained".
 %% 
-%% This Current Maintainer of this work is Morten Hoegholm,
+%% This Current Maintainer of this work is
 %% Lars Madsen, Will Robertson and Joseph Wright.
 %% 
 %% This work consists of the main source file flexisym.dtx
diff --git a/Master/texmf-dist/tex/latex/mh/mathstyle.sty b/Master/texmf-dist/tex/latex/mh/mathstyle.sty
index 5cf9a005be5..75d9a5eb6a3 100644
--- a/Master/texmf-dist/tex/latex/mh/mathstyle.sty
+++ b/Master/texmf-dist/tex/latex/mh/mathstyle.sty
@@ -9,7 +9,7 @@
 %% This is a generated file.
 %% 
 %% Copyright (C) 1997-2003 by Michael J. Downes
-%% Copyright (C) 2007-2008 by Morten Hoegholm <mh.ctan@gmail.com>
+%% Copyright (C) 2007-2011 by Morten Hoegholm et al
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -21,14 +21,16 @@
 %% 
 %% This work has the LPPL maintenance status "maintained".
 %% 
-%% This Current Maintainer of this work is Morten Hoegholm,
+%% This Current Maintainer of this work is
 %% Lars Madsen, Will Robertson and Joseph Wright.
 %% 
 %% This work consists of the main source file mathstyle.dtx
 %% and the derived files
 %%    mathstyle.sty, mathstyle.pdf, mathstyle.ins, mathstyle.drv.
 %% 
-\ProvidesPackage{mathstyle}[2010/11/17 v0.89]
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{mathstyle}
+  [2011/08/03 v0.90 Tracking mathstyle implicitly]
 \providecommand\@saveprimitive[2]{%
   \begingroup
   \edef\@tempa{\string#1}\edef\@tempb{\meaning#1}%
@@ -51,6 +53,7 @@
     \splitfirstmark{\string\splitfirstmark:}%
     \splitbotmark{\string\splitbotmark:}%
     #1{\string#1}%
+    \@nil % for the \@car
   \edef\@tempa{\expandafter\strip@prefix\meaning\@tempb}%
   \edef\@tempb{\meaning#1}%
   \ifx\@tempa\@tempb \global\let#2#1%
@@ -62,7 +65,8 @@
   \fi
   \endgroup
 }
-\chardef\mathstyle=\z@
+\everydisplay=\expandafter{\the\everydisplay\chardef\mathstyle\z@}
+\chardef\mathstyle\@ne
 \@saveprimitive\displaystyle\@@displaystyle
 \@saveprimitive\textstyle\@@textstyle
 \@saveprimitive\scriptstyle\@@scriptstyle
@@ -115,7 +119,7 @@
 \providecommand\@thirdoffour[4]{#3}
 \providecommand\@fourthoffour[4]{#4}
 \DeclareRobustCommand\genfrac[6]{%
-  {\fracstyle #1%
+  {#1\fracstyle
     {\begingroup #5\endgroup
       \csname @@\ifx\maxdimen#4\maxdimen over\else above\fi
         \if @#2@\else withdelims\fi\endcsname #2#3#4\relax
diff --git a/Master/texmf-dist/tex/latex/mh/mathtools.sty b/Master/texmf-dist/tex/latex/mh/mathtools.sty
index 58eb40197aa..22afd81b053 100644
--- a/Master/texmf-dist/tex/latex/mh/mathtools.sty
+++ b/Master/texmf-dist/tex/latex/mh/mathtools.sty
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2002-2011 by Morten Hoegholm <mh.ctan@gmail.com>
+%% Copyright (C) 2002-2011 by Morten Hoegholm
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -20,7 +20,7 @@
 %% 
 %% This work has the LPPL maintenance status "maintained".
 %% 
-%% This Current Maintainer of this work is Morten Hoegholm,
+%% This Current Maintainer of this work is
 %% Lars Madsen, Will Robertson and Joseph Wright.
 %% 
 %% This work consists of the main source file mathtools.dtx
@@ -28,7 +28,7 @@
 %%    mathtools.sty, mathtools.pdf, mathtools.ins, mathtools.drv.
 %% 
 \ProvidesPackage{mathtools}%
-  [2011/04/06 v1.11 mathematical typesetting tools]
+  [2012/04/24 v1.12 mathematical typesetting tools]
 \RequirePackage{keyval,calc}
 \RequirePackage{mhsetup}[2010/01/21]
 \MHInternalSyntaxOn
@@ -131,14 +131,19 @@
     \MH_if_boolean:nTF {manual_tag}
       { \MH_if_boolean:nTF {show_manual_tags}
           { \MT_prev_tagform:n {#1} }
-          { \@ifundefined{MT_r_\df@label}
-              {  }
+          { \@safe@activestrue
+            \@ifundefined{MT_r_\df@label}
+              { \global\MH_set_boolean_F:n {manual_tag} }
               { \MT_prev_tagform:n {#1} }
+              \@safe@activesfalse
           }
       }
-      { \@ifundefined{MT_r_\df@label}
+      {
+        \@safe@activestrue
+        \@ifundefined{MT_r_\df@label}
           { }
           { \refstepcounter{equation}\MT_prev_tagform:n {#1} }
+        \@safe@activesfalse
       }
   \fi:
   \global\MH_set_boolean_T:n {raw_maketag}
@@ -151,9 +156,11 @@
       {
         \MH_if_boolean:nTF {show_manual_tags}
           { \MT_maketag:n {#1} }
-          { \@ifundefined{MT_r_\df@label}
+          { \@safe@activestrue
+            \@ifundefined{MT_r_\df@label}
               { }
               { \MT_maketag:n {#1}     }
+            \@safe@activesfalse
           }
       }
       { \MT_maketag:n {#1} }
@@ -229,10 +236,21 @@
 \MHInternalSyntaxOff
 \newcommand\noeqref[1]{\@bsphack
   \@for\@tempa:=#1\do{%
+    \@safe@activestrue%
     \edef\@tempa{\expandafter\@firstofone\@tempa}%
+    \@ifundefined{r@\@tempa}{%
+      \protect\G@refundefinedtrue%
+      \@latex@warning{Reference `\@tempa' on page \thepage \space
+        undefined (\string\noeqref)}%
+    }{}%
     \if@filesw\protected@write\@auxout{}%
-    {\string\MT@newlabel{\@tempa}}\fi}
+    {\string\MT@newlabel{\@tempa}}\fi%
+  \@safe@activesfalse}
   \@esphack}
+
+\providecommand\@safe@activestrue{}%
+\providecommand\@safe@activesfalse{}%
+
 \MHInternalSyntaxOn
 \providecommand*\xleftrightarrow[2][]{%
   \ext@arrow 3095\MT_leftrightarrow_fill:{#1}{#2}}
@@ -561,17 +579,40 @@
   multlined-pos=c,
 }
 \def\MT_gobblelabel:w #1{}
+\newcommand\MT_delim_default_inner_wrappers:n [1]{
+   \@namedef{MT_delim_\MH_cs_to_str:N #1 _star_wrapper:nnn}##1##2##3{
+      \mathopen{}\mathclose\bgroup ##1 ##2 \aftergroup\egroup ##3
+    }
+    \@namedef{MT_delim_\MH_cs_to_str:N #1 _nostar_wrapper:nnn}##1##2##3{
+      \mathopen{##1}##2\mathclose{##3}
+    }
+  }
+
+\newcommand\reDeclarePairedDelimiterInnerWrapper[3]{
+  \@namedef{MT_delim_\MH_cs_to_str:N #1 _ #2 _wrapper:nnn}##1##2##3{
+    #3
+  }
+}
+
 \newcommand*\DeclarePairedDelimiter[3]{%
   \@ifdefinable{#1}{
+    \MT_delim_default_inner_wrappers:n{#1}
     \@namedef{MT_delim_\MH_cs_to_str:N #1 _star:}##1
-        {\mathopen{}\mathclose\bgroup\left#2 ##1 \aftergroup\egroup\right #3}%
+      %{\mathopen{}\mathclose\bgroup\left#2 ##1 \aftergroup\egroup\right #3}%
+      { \@nameuse{MT_delim_\MH_cs_to_str:N #1 _star_wrapper:nnn}%
+           {\left#2}{##1}{\right#3} }%
     \@xp\@xp\@xp
       \newcommand
         \@xp\csname MT_delim_\MH_cs_to_str:N #1 _nostar:\endcsname
         [2][\\@gobble]
         {
-          \mathopen{\@nameuse {\MH_cs_to_str:N ##1 l} #2} ##2
-          \mathclose{\@nameuse {\MH_cs_to_str:N ##1 r} #3}}
+          %\mathopen{\@nameuse {\MH_cs_to_str:N ##1 l} #2} ##2
+          %\mathclose{\@nameuse {\MH_cs_to_str:N ##1 r} #3}}
+          \@nameuse{MT_delim_\MH_cs_to_str:N #1 _nostar_wrapper:nnn}%
+             {\@nameuse {\MH_cs_to_str:N ##1 l} #2}
+             {##2}
+             {\@nameuse {\MH_cs_to_str:N ##1 r} #3}
+        }
     \DeclareRobustCommand{#1}{
       \@ifstar
         {\@nameuse{MT_delim_\MH_cs_to_str:N #1 _star:}}
@@ -589,14 +630,17 @@
         \PackageError{mathtools}{Macro~ need~ 1~ or~ more~ arguments}{}
       \fi
     \fi
+    \MT_delim_default_inner_wrappers:n{#1}
     \@xp\@xp\@xp
       \newcommand
         \@xp\csname MT_delim_\MH_cs_to_str:N #1 _star:\endcsname
         [#2]
         {
           \begingroup
-          \def\delimsize{\middle}
-            \mathopen{}\mathclose\bgroup\left#3 #5 \aftergroup\egroup\right#4
+            \def\delimsize{\middle}
+            %\mathopen{}\mathclose\bgroup\left#3 #5 \aftergroup\egroup\right#4
+            \@nameuse{MT_delim_\MH_cs_to_str:N #1 _star_wrapper:nnn}
+              {\left#3}{#5}{\right#4}
           \endgroup
         }
     \@xp\@xp\@xp
@@ -613,13 +657,23 @@
         \@xp\csname MT_delim_\MH_cs_to_str:N #1 _nostar_inner:\endcsname
         [#2]
         {
-          \mathopen{%
+          %\mathopen{%
+          %  \let\MHempty\@gobble
+          %  \@xp\@xp\@xp\csname\@xp\MH_cs_to_str:N \delimsize l\endcsname #3}
+          %#5
+          %\mathclose{%
+          %  \let\MHempty\@gobble
+          %  \@xp\@xp\@xp\csname\@xp\MH_cs_to_str:N \delimsize r\endcsname #4}
+          \@nameuse{MT_delim_\MH_cs_to_str:N #1 _nostar_wrapper:nnn}
+          {
             \let\MHempty\@gobble
-            \@xp\@xp\@xp\csname\@xp\MH_cs_to_str:N \delimsize l\endcsname #3}
-          #5
-          \mathclose{%
+            \@xp\@xp\@xp\csname\@xp\MH_cs_to_str:N \delimsize l\endcsname #3
+          }
+          {#5}
+          {
             \let\MHempty\@gobble
-            \@xp\@xp\@xp\csname\@xp\MH_cs_to_str:N \delimsize r\endcsname #4}
+            \@xp\@xp\@xp\csname\@xp\MH_cs_to_str:N \delimsize r\endcsname #4
+          }
           \endgroup
         }
     \DeclareRobustCommand{#1}{
@@ -899,21 +953,17 @@
     \mathop{#4}\limits#5{#6}
   \fi:
 }
-\newcommand\MoveEqLeft[1][2]{%
-  \global\@tempdima=#1em%
-  \kern\@tempdima%
-  &
-  \kern-\@tempdima}
-\newcommand\Aboxed[1]{\@Aboxed#1\ENDDNE}
-\def\@Aboxed#1&#2\ENDDNE{%
-  \settowidth\@tempdima{$\displaystyle#1$}%
-  \addtolength\@tempdima{\fboxsep}%
-  \addtolength\@tempdima{\fboxrule}%
-  \global\@tempdima=\@tempdima
-  \kern\@tempdima
-  &
-  \kern-\@tempdima
-  \boxed{#1#2}
+\newcommand\SwapAboveDisplaySkip{%
+  \noalign{\vskip-\abovedisplayskip\vskip\abovedisplayshortskip}
+}
+
+\newcommand\MoveEqLeft[1][2]{\kern #1em  &   \kern -#1em}
+\newcommand\Aboxed[1]{\let\bgroup{\romannumeral-`}\@Aboxed#1&&\ENDDNE}
+\def\@Aboxed#1&#2&#3\ENDDNE{%
+  \ifnum0=`{}\fi \setbox \z@
+    \hbox{$\displaystyle#1{}\m@th$\kern\fboxsep \kern\fboxrule }%
+    \edef\@tempa {\kern  \wd\z@ &\kern -\the\wd\z@ \fboxsep
+        \the\fboxsep \fboxrule \the\fboxrule }\@tempa \boxed {#1#2}%
 }
 \MHInternalSyntaxOff
 \def\ArrowBetweenLines{\relax
@@ -1024,7 +1074,41 @@
 \AtBeginDocument{
   \providecommand\bigtimes{\MH_csym_bigtimes:}
 }
-\def\shortintertext#1{%
+\MH_let:NwN \MT_orig_intertext: \intertext@
+\newdimen\l_MT_above_intertext_dim
+\newdimen\l_MT_below_intertext_dim
+\define@key{\MT_options_name:}
+  {aboveintertextdim}{\setlength\l_MT_above_interetext_dim{#1}}
+\define@key{\MT_options_name:}
+  {belowintertextdim}{\setlength\l_MT_below_intertext_dim{#1}}
+\def\MT_intertext: {%
+  \def\intertext##1{%
+    \ifvmode\else\\\@empty\fi
+    \noalign{%
+      \penalty\postdisplaypenalty\vskip\belowdisplayskip
+      \vskip-\lineskiplimit      % CCS
+      \vskip\normallineskiplimit % CCS
+      \vskip\l_MT_above_intertext_dim
+       \vbox{\normalbaselines
+        \ifdim\linewidth=\columnwidth
+        \else \parshape\@ne \@totalleftmargin \linewidth
+        \fi
+        \noindent##1\par}%
+      \penalty\predisplaypenalty\vskip\abovedisplayskip%
+      \vskip-\lineskiplimit      % CCS
+      \vskip\normallineskiplimit % CCS
+      \vskip\l_MT_above_intertext_dim
+   }%
+}}
+\def\MT_orig_intertext_true:  { \MH_let:NwN \intertext@ \MT_orig_intertext: }
+\def\MT_orig_intertext_false: { \MH_let:NwN \intertext@ \MT_intertext: }
+\define@key{\MT_options_name:}{original-intertext}[true]{
+  \@nameuse{MT_orig_intertext_#1:}
+}
+\setkeys{\MT_options_name:}{
+  original-intertext=false
+}
+\def\MT_orig_shortintertext:n #1{%
   \ifvmode\else\\\@empty\fi
   \noalign{%
     \penalty\postdisplaypenalty\vskip\abovedisplayshortskip
@@ -1037,6 +1121,43 @@
     \penalty\predisplaypenalty\vskip\abovedisplayshortskip%
   }%
 }
+\newdimen\l_MT_above_shortintertext_dim
+\newdimen\l_MT_below_shortintertext_dim
+\define@key{\MT_options_name:}
+  {aboveshortintertextdim}{\setlength \l_MT_above_shortintertext_dim{#1}}
+\define@key{\MT_options_name:}
+  {belowshortintertextdim}{\setlength \l_MT_below_shortintertext_dim{#1}}
+\setkeys{\MT_options_name:}{
+  aboveshortintertextdim=3pt,
+  belowshortintertextdim=3pt
+}
+\def\MT_shortintertext:n #1{%
+  \ifvmode\else\\\@empty\fi
+  \noalign{%
+    \penalty\postdisplaypenalty\vskip\abovedisplayshortskip
+    \vskip-\lineskiplimit
+    \vskip\normallineskiplimit
+    \vskip\l_MT_above_shortintertext_dim
+    \vbox{\normalbaselines
+      \if_dim:w \linewidth=\columnwidth
+      \else:
+        \parshape\@ne \@totalleftmargin \linewidth
+      \fi:
+      \noindent#1\par}%
+    \penalty\predisplaypenalty\vskip\abovedisplayshortskip%
+    \vskip-\lineskiplimit
+    \vskip\normallineskiplimit
+    \vskip\l_MT_below_shortintertext_dim
+  }%
+}
+\def\MT_orig_shortintertext_true:  { \MH_let:NwN \shortintertext \MT_orig_shortintertext:n }
+\def\MT_orig_shortintertext_false: { \MH_let:NwN \shortintertext \MT_shortintertext:n }
+\define@key{\MT_options_name:}{original-shortintertext}[true]{
+  \@nameuse{MT_orig_shortintertext_#1:}
+}
+\setkeys{\MT_options_name:}{
+  original-shortintertext=false
+}
 \providecommand*\clap[1]{\hb@xt@\z@{\hss#1\hss}}
 \providecommand*\mathllap[1][\@empty]{
   \ifx\@empty#1\@empty
@@ -1136,9 +1257,9 @@
 \def\MT_cramped_rlap_internal:Nn #1#2{
   {}\rlap{\MT_cramped_internal:Nn #1{#2}}
 }
-\DeclareRobustCommand{\prescript}[3]{
-  \@mathmeasure\z@\scriptstyle{\MT_prescript_sup:{#1}}
-  \@mathmeasure\tw@\scriptstyle{\MT_prescript_sub:{#2}}
+\newcommand{\MT_prescript_inner:}[4]{
+  \@mathmeasure\z@#4{\MT_prescript_sup:{#1}}
+  \@mathmeasure\tw@#4{\MT_prescript_sub:{#2}}
   \if_dim:w \wd\tw@>\wd\z@
     \setbox\z@\hbox to\wd\tw@{\hfil\unhbox\z@}
   \else:
@@ -1148,6 +1269,13 @@
   \mathopen{\vphantom{\MT_prescript_arg:{#3}}}^{\box\z@}\sb{\box\tw@}
   \MT_prescript_arg:{#3}
 }
+\DeclareRobustCommand{\prescript}[3]{
+  \mathchoice
+    {\MT_prescript_inner:{#1}{#2}{#3}{\scriptstyle}}
+    {\MT_prescript_inner:{#1}{#2}{#3}{\scriptstyle}}
+    {\MT_prescript_inner:{#1}{#2}{#3}{\scriptscriptstyle}}
+    {\MT_prescript_inner:{#1}{#2}{#3}{\scriptscriptstyle}}
+}
 \define@key{\MT_options_name:}
   {prescript-sup-format}{\def\MT_prescript_sup:{#1}}
 \define@key{\MT_options_name:}
diff --git a/Master/texmf-dist/tex/latex/mh/mhsetup.sty b/Master/texmf-dist/tex/latex/mh/mhsetup.sty
index 9e5c2a182cc..b78969e5746 100644
--- a/Master/texmf-dist/tex/latex/mh/mhsetup.sty
+++ b/Master/texmf-dist/tex/latex/mh/mhsetup.sty
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2002-2007,2010 by Morten Hoegholm <mh.ctan@gmail.com>
+%% Copyright (C) 2002-2007,2010 by Morten Hoegholm
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -20,7 +20,7 @@
 %% 
 %% This work has the LPPL maintenance status "maintained".
 %% 
-%% This Current Maintainer of this work is Morten Hoegholm,
+%% This Current Maintainer of this work is
 %% Lars Madsen, Will Robertson and Joseph Wright.
 %% 
 %% This work consists of the main source file mhsetup.dtx
diff --git a/Master/texmf-dist/tex/latex/mh/msabm.sym b/Master/texmf-dist/tex/latex/mh/msabm.sym
index 7203e1d0cde..5a01ad56b60 100644
--- a/Master/texmf-dist/tex/latex/mh/msabm.sym
+++ b/Master/texmf-dist/tex/latex/mh/msabm.sym
@@ -9,7 +9,7 @@
 %% This is a generated file.
 %% 
 %% Copyright (C) 1997-2003 by Michael J. Downes
-%% Copyright (C) 2007-2010 by Morten Hoegholm <mh.ctan@gmail.com>
+%% Copyright (C) 2007-2010 by Morten Hoegholm
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -21,7 +21,7 @@
 %% 
 %% This work has the LPPL maintenance status "maintained".
 %% 
-%% This Current Maintainer of this work is Morten Hoegholm,
+%% This Current Maintainer of this work is
 %% Lars Madsen, Will Robertson and Joseph Wright.
 %% 
 %% This work consists of the main source file flexisym.dtx