mh (21may14)

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

1 files changed, 73 insertions, 9 deletions

diff --git a/Master/texmf-dist/tex/latex/mh/mathtools.sty b/Master/texmf-dist/tex/latex/mh/mathtools.sty
index 8769cf3bf6d..de0577f4245 100644
--- a/Master/texmf-dist/tex/latex/mh/mathtools.sty
+++ b/Master/texmf-dist/tex/latex/mh/mathtools.sty
@@ -9,7 +9,7 @@
 %% This is a generated file.
 %% 
 %% Copyright (C) 2002-2011 by Morten Hoegholm
-%% Copyright (C) 2012      by Lars Madsen
+%% Copyright (C) 2012-     by Lars Madsen
 %% 
 %% 
 %% This work may be distributed and/or modified under the
@@ -502,7 +502,7 @@
   \crcr
   \global\MH_set_boolean_F:n {mult_firstline}
   \hbox to \l_MT_multwidth_dim{}\crcr
-  \noalign{\vskip-\baselineskip \vskip-\normallineskip}
+  \noalign{\vskip-\baselineskip \vskip-\jot \vskip-\normallineskip}
 }
 \def\MT_mult_mathcr_atat:w [#1]{%
   \if_num:w 0=`{\fi: \iffalse}\fi:
@@ -686,13 +686,7 @@
 \def\MHempty{}
 \def\DeclarePairedDelimiterX#1[#2]#3#4#5{%
   \@ifdefinable{#1}{
-    \ifnum#2>9\relax
-      \PackageError{mathtools}{No~ more~ than~ 9~ arguments}{}
-    \else
-      \ifnum#2<1\relax
-        \PackageError{mathtools}{Macro~ need~ 1~ or~ more~ arguments}{}
-      \fi
-    \fi
+    \MT_paired_delimx_arg_test:n{#2}
     \MT_delim_default_inner_wrappers:n{#1}
     \@xp\@xp\@xp
       \newcommand
@@ -746,6 +740,71 @@
     }
   }
 }
+\def\MT_paired_delimx_arg_test:n #1{
+  \ifnum#1>9\relax
+    \PackageError{mathtools}{No~ more~ than~ 9~ arguments}{}
+  \else
+    \ifnum#1<1\relax
+      \PackageError{mathtools}{Macro~ need~ 1~ or~ more~
+        arguments.\MessageBreak Please~ change~ [#1]~ to~ [1]~ ... [9]}{}
+    \fi
+  \fi
+ }
+
+\def\DeclarePairedDelimiterXPP#1[#2]#3#4#5#6#7{%
+  \@ifdefinable{#1}{
+    \MT_paired_delimx_arg_test:n{#2}
+    \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}
+            #3
+            \@nameuse{MT_delim_\MH_cs_to_str:N #1 _star_wrapper:nnn}
+              {\left#4}{#7}{\right#5}
+            #6
+          \endgroup
+        }
+    \@xp\@xp\@xp
+      \newcommand
+        \@xp\csname MT_delim_\MH_cs_to_str:N #1 _nostar:\endcsname
+        [1][\MHempty]
+      {
+        \begingroup
+        \def\delimsize{##1}
+        \@nameuse{MT_delim_\MH_cs_to_str:N #1 _nostar_inner:}
+      }
+    \@xp\@xp\@xp
+      \newcommand
+        \@xp\csname MT_delim_\MH_cs_to_str:N #1 _nostar_inner:\endcsname
+        [#2]
+        {
+          #3
+          \@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 #4
+          }
+          {#7}
+          {
+            \let\MHempty\@gobble
+            \@xp\@xp\@xp\csname\@xp\MH_cs_to_str:N \delimsize r\endcsname #5
+          }
+          #6
+          \endgroup
+        }
+    \DeclareRobustCommand{#1}{
+      \@ifstar
+        {\@nameuse{MT_delim_\MH_cs_to_str:N #1 _star:}}
+        {\@nameuse{MT_delim_\MH_cs_to_str:N #1 _nostar:}}
+    }
+  }
+}
+
+
 \def\MT_start_cases:nnnn #1#2#3#4{ % #1=sep,#2=lpreamble,#3=rpreamble,#4=delim
  \RIfM@\else
    \nonmatherr@{\begin{\@currenvir}}
@@ -1079,6 +1138,7 @@
   \def\etb@tempa##1|#1|##2\MT@END{\endgroup
     \ifx\@empty##2\@empty\notag\fi}%
   \expandafter\etb@tempa\expandafter|alignedat|aligned|split|#1|\MT@END}
+  %| emacs
 \newcommand\MTFlushSpaceAbove{
   \expandafter\MT_remove_tag_unless_inner:n\expandafter{\@currenvir}
   \\
@@ -1206,6 +1266,10 @@
   {above-short-intertext-sep}{\setlength \l_MT_above_shortintertext_sep{#1}}
 \define@key{\MT_options_name:}
   {below-short-intertext-sep}{\setlength \l_MT_below_shortintertext_sep{#1}}
+\define@key{\MT_options_name:}
+  {above-shortintertext-sep}{\setlength \l_MT_above_shortintertext_sep{#1}}
+\define@key{\MT_options_name:}
+  {below-shortintertext-sep}{\setlength \l_MT_below_shortintertext_sep{#1}}
 \setkeys{\MT_options_name:}{
   aboveshortintertextdim=3pt,
   belowshortintertextdim=3pt