summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-06-17 22:41:28 +0000
committerKarl Berry <karl@freefriends.org>2015-06-17 22:41:28 +0000
commitbf7b4205d879f5a67cacddab493583cb19169544 (patch)
tree62862be6696f57748685d8d0979eb4134d5200c5
parent7bf720bd2b14ba547dbc0bfc46d4ef9b461cdfb5 (diff)
mathtools (17jun15)
git-svn-id: svn://tug.org/texlive/trunk@37587 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/mathtools/empheq.pdfbin311047 -> 311053 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mathtools/mathtools.pdfbin433383 -> 433383 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mathtools/mhsetup.pdfbin233589 -> 233589 bytes
-rw-r--r--Master/texmf-dist/source/latex/mathtools/empheq.dtx2
-rw-r--r--Master/texmf-dist/source/latex/mathtools/mathtools.dtx53
-rw-r--r--Master/texmf-dist/tex/latex/mathtools/mathtools.sty26
6 files changed, 67 insertions, 14 deletions
diff --git a/Master/texmf-dist/doc/latex/mathtools/empheq.pdf b/Master/texmf-dist/doc/latex/mathtools/empheq.pdf
index 2916cbee48c..bd24956d3a8 100644
--- a/Master/texmf-dist/doc/latex/mathtools/empheq.pdf
+++ b/Master/texmf-dist/doc/latex/mathtools/empheq.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mathtools/mathtools.pdf b/Master/texmf-dist/doc/latex/mathtools/mathtools.pdf
index 81d7aa6ded4..25a1c404403 100644
--- a/Master/texmf-dist/doc/latex/mathtools/mathtools.pdf
+++ b/Master/texmf-dist/doc/latex/mathtools/mathtools.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mathtools/mhsetup.pdf b/Master/texmf-dist/doc/latex/mathtools/mhsetup.pdf
index 4c42a5c2b34..c4158e2527c 100644
--- a/Master/texmf-dist/doc/latex/mathtools/mhsetup.pdf
+++ b/Master/texmf-dist/doc/latex/mathtools/mhsetup.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/mathtools/empheq.dtx b/Master/texmf-dist/source/latex/mathtools/empheq.dtx
index 2eb924065c4..e2230abff6e 100644
--- a/Master/texmf-dist/source/latex/mathtools/empheq.dtx
+++ b/Master/texmf-dist/source/latex/mathtools/empheq.dtx
@@ -1616,7 +1616,7 @@ and the derived files
% Should you have any feature request, suggestions, or bug reports
% then feel free to contact Lars Madsen at
% \begin{quote}
-% \email{daleif@imf.au.dk}
+% \email{daleif@math.au.dk}
% \end{quote}
% Please put `empheq' in the subject line.
%
diff --git a/Master/texmf-dist/source/latex/mathtools/mathtools.dtx b/Master/texmf-dist/source/latex/mathtools/mathtools.dtx
index 0f1df41ded1..a958893c113 100644
--- a/Master/texmf-dist/source/latex/mathtools/mathtools.dtx
+++ b/Master/texmf-dist/source/latex/mathtools/mathtools.dtx
@@ -68,7 +68,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: mathtools 2015/05/11 v1.16}
+\Msg{* Package: mathtools 2015/06/17 v1.17}
\Msg{************************************************************************}
\keepsilent
@@ -131,7 +131,7 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{mathtools.drv}%
- [2015/05/11 v1.16 mathematical typesetting tools]
+ [2015/06/17 v1.17 mathematical typesetting tools]
\documentclass{ltxdoc}
\IfFileExists{fourier.sty}{\usepackage{fourier}}{}
\addtolength\marginparwidth{-25pt}
@@ -281,7 +281,7 @@ and the derived files
%
% \GetFileInfo{mathtools.drv}
%
-% \CheckSum{3111}
+% \CheckSum{3129}
%
% \title{The \pkg{mathtools} package\thanks{This file has version number
% \fileversion, last revised \filedate.}}
@@ -312,7 +312,7 @@ and the derived files
% \pkg{amsmath} does not fulfill all the needs of the mathematical
% part of the \LaTeX{} community, resulting in many authors writing
% small snippets of code for tweaking the mathematical layout. Some
-% of these snippets has also been posted to newsgroups and mailing
+% of these snippets have also been posted to newsgroups and mailing
% lists over the years, although more often than not without being
% released as stand-alone packages.
%
@@ -325,7 +325,7 @@ and the derived files
% you have any good macros or just macros that help you when writing
% mathematics, then don't hesitate to report them. It is
% easiest to just contact Lars Madsen at
-% \begin{quote}\email{daleif@imf.au.dk}\end{quote}
+% \begin{quote}\email{daleif@math.au.dk}\end{quote}
% This is of course also the address to use in case of bug reports.
% Please put `\texttt{mathtools}' in the subject line.
%
@@ -2656,7 +2656,7 @@ and the derived files
% \begin{macrocode}
%<*package>
\ProvidesPackage{mathtools}%
- [2015/05/11 v1.16 mathematical typesetting tools]
+ [2015/06/17 v1.17 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}}
@@ -4998,7 +4998,22 @@ and the derived files
\vskip\normallineskiplimit % CCS
\vskip\l_MT_above_intertext_sep
\vbox{\normalbaselines
- \ifdim\linewidth=\columnwidth
+% \end{macrocode}
+% \changes{v1.17}{2015/06/17}{Added extra `in list' check}
+% Johannes Böttcher has reported a problem in \cs{intertext} in
+% relation to usage within lists or constructs that locally changes
+% the margin (often implemented as a list). Markus Kohm suggested to
+% test not only \cs{linewidth} against \cs{columnwidth} but also if
+% \cs{@totalleftmargin} is not zero. The implementation used is due to
+% David Carlisle.
+% \begin{macrocode}
+ \ifdim
+ \ifdim\@totalleftmargin=\z@
+ \linewidth
+ \else
+ -\maxdimen
+ \fi
+ =\columnwidth
\else \parshape\@ne \@totalleftmargin \linewidth
\fi
\noindent##1\par}%
@@ -5044,7 +5059,17 @@ and the derived files
\noalign{%
\penalty\postdisplaypenalty\vskip\abovedisplayshortskip
\vbox{\normalbaselines
- \if_dim:w \linewidth=\columnwidth
+% \end{macrocode}
+% \changes{v1.17}{2015/06/17}{Added extra `in list' check}
+% Same comment as for \cs{intertext} above.
+% \begin{macrocode}
+ \if_dim:w
+ \if_dim:w \@totalleftmargin=\z@
+ \linewidth
+ \else:
+ -\maxdimen
+ \fi:
+ =\columnwidth
\else:
\parshape\@ne \@totalleftmargin \linewidth
\fi:
@@ -5099,7 +5124,17 @@ and the derived files
\vskip\normallineskiplimit
\vskip\l_MT_above_shortintertext_sep
\vbox{\normalbaselines
- \if_dim:w \linewidth=\columnwidth
+% \end{macrocode}
+% \changes{v1.17}{2015/06/17}{Added extra `in list' check}
+% Same comment as for \cs{intertext} above.
+% \begin{macrocode}
+ \if_dim:w
+ \if_dim:w \@totalleftmargin=\z@
+ \linewidth
+ \else:
+ -\maxdimen
+ \fi:
+ =\columnwidth
\else:
\parshape\@ne \@totalleftmargin \linewidth
\fi:
diff --git a/Master/texmf-dist/tex/latex/mathtools/mathtools.sty b/Master/texmf-dist/tex/latex/mathtools/mathtools.sty
index f4e05d0104e..027a0a2328c 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/05/11 v1.16 mathematical typesetting tools]
+ [2015/06/17 v1.17 mathematical typesetting tools]
\RequirePackage{keyval,calc}
\RequirePackage{mhsetup}[2010/01/21]
\MHInternalSyntaxOn
@@ -1221,7 +1221,13 @@
\vskip\normallineskiplimit % CCS
\vskip\l_MT_above_intertext_sep
\vbox{\normalbaselines
- \ifdim\linewidth=\columnwidth
+ \ifdim
+ \ifdim\@totalleftmargin=\z@
+ \linewidth
+ \else
+ -\maxdimen
+ \fi
+ =\columnwidth
\else \parshape\@ne \@totalleftmargin \linewidth
\fi
\noindent##1\par}%
@@ -1244,7 +1250,13 @@
\noalign{%
\penalty\postdisplaypenalty\vskip\abovedisplayshortskip
\vbox{\normalbaselines
- \if_dim:w \linewidth=\columnwidth
+ \if_dim:w
+ \if_dim:w \@totalleftmargin=\z@
+ \linewidth
+ \else:
+ -\maxdimen
+ \fi:
+ =\columnwidth
\else:
\parshape\@ne \@totalleftmargin \linewidth
\fi:
@@ -1282,7 +1294,13 @@
\vskip\normallineskiplimit
\vskip\l_MT_above_shortintertext_sep
\vbox{\normalbaselines
- \if_dim:w \linewidth=\columnwidth
+ \if_dim:w
+ \if_dim:w \@totalleftmargin=\z@
+ \linewidth
+ \else:
+ -\maxdimen
+ \fi:
+ =\columnwidth
\else:
\parshape\@ne \@totalleftmargin \linewidth
\fi: