summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/mathtools
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-11-12 22:18:09 +0000
committerKarl Berry <karl@freefriends.org>2015-11-12 22:18:09 +0000
commit9a9418d608589b351db0477922967f0a8d37f9ae (patch)
treef46e4eae81a35cfab9ed3fa7a6bc530d92fd7602 /Master/texmf-dist/tex/latex/mathtools
parentac460c934fae4a9f0fb4fcdd0d49cfce7f71c5a0 (diff)
mathtools (12nov15)
git-svn-id: svn://tug.org/texlive/trunk@38833 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/mathtools')
-rw-r--r--Master/texmf-dist/tex/latex/mathtools/mathtools.sty82
1 files changed, 51 insertions, 31 deletions
diff --git a/Master/texmf-dist/tex/latex/mathtools/mathtools.sty b/Master/texmf-dist/tex/latex/mathtools/mathtools.sty
index 027a0a2328c..136fdb6e495 100644
--- a/Master/texmf-dist/tex/latex/mathtools/mathtools.sty
+++ b/Master/texmf-dist/tex/latex/mathtools/mathtools.sty
@@ -30,7 +30,7 @@
%% mathtools.sty, mathtools.pdf, mathtools.ins, mathtools.drv.
%%
\ProvidesPackage{mathtools}%
- [2015/06/17 v1.17 mathematical typesetting tools]
+ [2015/11/12 v1.18 mathematical typesetting tools]
\RequirePackage{keyval,calc}
\RequirePackage{mhsetup}[2010/01/21]
\MHInternalSyntaxOn
@@ -460,19 +460,19 @@
}
}
\AtBeginDocument{
- \providecommand*\dblcolon{\mathrel{\vcentcolon\mkern-.9mu\vcentcolon}}
- \providecommand*\coloneqq{\mathrel{\vcentcolon\mkern-1.2mu=}}
- \providecommand*\Coloneqq{\mathrel{\dblcolon\mkern-1.2mu=}}
- \providecommand*\coloneq{\mathrel{\vcentcolon\mkern-1.2mu\mathrel{-}}}
- \providecommand*\Coloneq{\mathrel{\dblcolon\mkern-1.2mu\mathrel{-}}}
- \providecommand*\eqqcolon{\mathrel{=\mkern-1.2mu\vcentcolon}}
- \providecommand*\Eqqcolon{\mathrel{=\mkern-1.2mu\dblcolon}}
- \providecommand*\eqcolon{\mathrel{\mathrel{-}\mkern-1.2mu\vcentcolon}}
- \providecommand*\Eqcolon{\mathrel{\mathrel{-}\mkern-1.2mu\dblcolon}}
- \providecommand*\colonapprox{\mathrel{\vcentcolon\mkern-1.2mu\approx}}
- \providecommand*\Colonapprox{\mathrel{\dblcolon\mkern-1.2mu\approx}}
- \providecommand*\colonsim{\mathrel{\vcentcolon\mkern-1.2mu\sim}}
- \providecommand*\Colonsim{\mathrel{\dblcolon\mkern-1.2mu\sim}}
+ \providecommand*\dblcolon{\vcentcolon\mathrel{\mkern-.9mu}\vcentcolon}
+ \providecommand*\coloneqq{\vcentcolon\mathrel{\mkern-1.2mu}=}
+ \providecommand*\Coloneqq{\dblcolon\mathrel{\mkern-1.2mu}=}
+ \providecommand*\coloneq{\vcentcolon\mathrel{\mkern-1.2mu}\mathrel{-}}
+ \providecommand*\Coloneq{\dblcolon\mathrel{\mkern-1.2mu}\mathrel{-}}
+ \providecommand*\eqqcolon{=\mathrel{\mkern-1.2mu}\vcentcolon}
+ \providecommand*\Eqqcolon{=\mathrel{\mkern-1.2mu}\dblcolon}
+ \providecommand*\eqcolon{\mathrel{-}\mathrel{\mkern-1.2mu}\vcentcolon}
+ \providecommand*\Eqcolon{\mathrel{-}\mathrel{\mkern-1.2mu}\dblcolon}
+ \providecommand*\colonapprox{\vcentcolon\mathrel{\mkern-1.2mu}\approx}
+ \providecommand*\Colonapprox{\dblcolon\mathrel{\mkern-1.2mu}\approx}
+ \providecommand*\colonsim{\vcentcolon\mathrel{\mkern-1.2mu}\sim}
+ \providecommand*\Colonsim{\dblcolon\mathrel{\mkern-1.2mu}\sim}
}
\let \AMS@math@cr@@ \math@cr@@
\MH_new_boolean:n {mult_firstline}
@@ -579,6 +579,7 @@
}
\newcommand\MT_measure_mult:n [1]{
\begingroup
+ \measuring@true
\g_MT_multlinerow_int\@ne
\MH_let:NwN \label\MT_gobblelabel:w
\MH_let:NwN \tag\gobble@tag
@@ -609,8 +610,25 @@
}
\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@@
+ \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
+ }
+}
+
\newenvironment{multlined}[1][]
{\MH_group_align_safe_begin:
+ \MultlinedHook
\MT_test_for_tcb_other:nnnnn {#1}
{\def\MT_mult_default_pos:{#1}}
{\def\MT_mult_default_pos:{#1}}
@@ -1448,23 +1466,25 @@
prescript-sub-format={},
prescript-arg-format={},
}
-\def\@DeclareMathSizes #1#2#3#4#5{%
- \@defaultunits\dimen@ #2pt\relax\@nnil
- \if:w $#3$%
- \MH_let:cN {S@\strip@pt\dimen@}\math@fontsfalse
- \else:
- \@defaultunits\dimen@ii #3pt\relax\@nnil
- \@defaultunits\@tempdima #4pt\relax\@nnil
- \@defaultunits\@tempdimb #5pt\relax\@nnil
- \toks@{#1}%
- \expandafter\xdef\csname S@\strip@pt\dimen@\endcsname{%
- \gdef\noexpand\tf@size{\strip@pt\dimen@ii}%
- \gdef\noexpand\sf@size{\strip@pt\@tempdima}%
- \gdef\noexpand\ssf@size{\strip@pt\@tempdimb}%
- \the\toks@
- }%
- \fi:
-}
+\ifx\e@alloc\@undefined% kernel thus older than 2015
+ \def\@DeclareMathSizes #1#2#3#4#5{%
+ \@defaultunits\dimen@ #2pt\relax\@nnil
+ \if:w $#3$%
+ \MH_let:cN {S@\strip@pt\dimen@}\math@fontsfalse
+ \else:
+ \@defaultunits\dimen@ii #3pt\relax\@nnil
+ \@defaultunits\@tempdima #4pt\relax\@nnil
+ \@defaultunits\@tempdimb #5pt\relax\@nnil
+ \toks@{#1}%
+ \expandafter\xdef\csname S@\strip@pt\dimen@\endcsname{%
+ \gdef\noexpand\tf@size{\strip@pt\dimen@ii}%
+ \gdef\noexpand\sf@size{\strip@pt\@tempdima}%
+ \gdef\noexpand\ssf@size{\strip@pt\@tempdimb}%
+ \the\toks@
+ }%
+ \fi:
+ }
+\fi
\def\MT_mathic_true: {
\MH_if_boolean:nF {math_italic_corr}{
\MH_set_boolean_T:n {math_italic_corr}