6 files changed, 28 insertions, 14 deletions
diff --git a/Master/texmf-dist/doc/latex/mathtools/README b/Master/texmf-dist/doc/latex/mathtools/README
index d324364db96..0832e24eaf3 100644
--- a/Master/texmf-dist/doc/latex/mathtools/README
+++ b/Master/texmf-dist/doc/latex/mathtools/README
@@ -73,10 +73,10 @@ BUG REPORTS
 The bundle is maintained by:
 
   Morten H\o gholm  
-  Lars Madsen <daleif@imf.au.dk>
+  Lars Madsen <daleif@math.au.dk>
   
 
-Please report bugs to daleif@imf.au.dk
+Please report bugs to daleif@math.au.dk
 
 ===========
-This README file was last revised 2014/08/05.
+This README file was last revised 2015/05/11.
diff --git a/Master/texmf-dist/doc/latex/mathtools/empheq.pdf b/Master/texmf-dist/doc/latex/mathtools/empheq.pdf
index 02ed22eb144..2916cbee48c 100644
--- a/Master/texmf-dist/doc/latex/mathtools/empheq.pdf
+++ b/Master/texmf-dist/doc/latex/mathtools/empheq.pdf
diff --git a/Master/texmf-dist/doc/latex/mathtools/mathtools.pdf b/Master/texmf-dist/doc/latex/mathtools/mathtools.pdf
index c26d6b477b5..81d7aa6ded4 100644
--- a/Master/texmf-dist/doc/latex/mathtools/mathtools.pdf
+++ b/Master/texmf-dist/doc/latex/mathtools/mathtools.pdf
diff --git a/Master/texmf-dist/doc/latex/mathtools/mhsetup.pdf b/Master/texmf-dist/doc/latex/mathtools/mhsetup.pdf
index 3ee5eb99359..4c42a5c2b34 100644
--- a/Master/texmf-dist/doc/latex/mathtools/mhsetup.pdf
+++ b/Master/texmf-dist/doc/latex/mathtools/mhsetup.pdf
diff --git a/Master/texmf-dist/source/latex/mathtools/mathtools.dtx b/Master/texmf-dist/source/latex/mathtools/mathtools.dtx
index c9a1c8d2c12..0f1df41ded1 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 2014/08/04 v1.15}
+\Msg{* Package: mathtools 2015/05/11 v1.16}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -131,7 +131,7 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{mathtools.drv}%
-  [2014/08/04 v1.15 mathematical typesetting tools]
+  [2015/05/11 v1.16 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{3107}
+%  \CheckSum{3111}
 %
 %  \title{The \pkg{mathtools} package\thanks{This file has version number
 %  \fileversion, last revised \filedate.}}
@@ -1915,20 +1915,25 @@ and the derived files
 % has to do with complicated set definitions, where the condition
 % spans several lines. In this case \cs{Set} cannot be used. Thus it
 % is nice to be able to refer to the specific set building symbol we
-% have decided to use in this document.}
+% have decided to use in this document. Also remember to add
+% \cs{allowbreak} \emph{before} the proceeding inserted space. Then
+% that space will disappear when a line break occurs.}
 % \begin{verbatim}
 %   % just to make sure it exists
 %   \providecommand\given{} 
 %   % can be useful to refer to this outside \Set
-%   \newcommand\SetSymbol[1][]{\nonscript\:#1\vert\nonscript\:
-%      \mathopen{}\allowbreak}
+%   \newcommand\SetSymbol[1][]{%
+%      \nonscript\:#1\vert
+%      \allowbreak
+%      \nonscript\:
+%      \mathopen{}}
 %   \DeclarePairedDelimiterX\Set[1]\{\}{%
 %      \renewcommand\given{\SetSymbol[\delimsize]}
 %      #1
 %   }
 % \end{verbatim}
 %   \providecommand\given{} 
-%   \newcommand\SetSymbol[1][]{\nonscript\:#1\vert\nonscript\:\mathopen{}\allowbreak}
+%   \newcommand\SetSymbol[1][]{\nonscript\:#1\vert\allowbreak\nonscript\:\mathopen{}}
 %   \DeclarePairedDelimiterX\Set[1]\{\}{%
 %      \renewcommand\given{\SetSymbol[\delimsize]}
 %      #1
@@ -2651,7 +2656,7 @@ and the derived files
 %    \begin{macrocode}
 %<*package>
 \ProvidesPackage{mathtools}%
-  [2014/07/16 v1.15 mathematical typesetting tools]
+  [2015/05/11 v1.16 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}}
@@ -3017,7 +3022,16 @@ and the derived files
 \def\MT_extended_eqref:n #1{
   \protected@write\@auxout{}
     {\string\MT@newlabel{#1}}
-  \textup{\MT_prev_tagform:n {\ref{#1}}}
+%    \end{macrocode}
+% \changes{v1.16}{2015/05/11}{Fix bug in \cs{eqref} in \cs{text} vs. \textsf{showonlyrefs}}
+% The manner in which \key{showonlyrefs} is implemented causes
+% problems when \cs{eqref} is used within \cs{text}. The problem is
+% that \cs{MT_prev_tagform:n} is used both in \cs{eqref} and within,
+% say, \env{align}. Thus a test within \cs{MT_prev_tagform:n} fails
+% for \cs{eqref}. We fix this by making sure we end up in the proper
+% branch of the test, when \cs{MT_prev_tagform:n} is used to typeset \cs{eqref}.
+%    \begin{macrocode}
+  \textup{\let\df@label\@empty\MT_prev_tagform:n {\ref{#1}}}
 }
 \EQ_MakeRobust\MT_extended_eqref:n
 %    \end{macrocode}
diff --git a/Master/texmf-dist/tex/latex/mathtools/mathtools.sty b/Master/texmf-dist/tex/latex/mathtools/mathtools.sty
index 00dd0395921..f4e05d0104e 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}%
-  [2014/07/16 v1.15 mathematical typesetting tools]
+  [2015/05/11 v1.16 mathematical typesetting tools]
 \RequirePackage{keyval,calc}
 \RequirePackage{mhsetup}[2010/01/21]
 \MHInternalSyntaxOn
@@ -232,7 +232,7 @@
 \def\MT_extended_eqref:n #1{
   \protected@write\@auxout{}
     {\string\MT@newlabel{#1}}
-  \textup{\MT_prev_tagform:n {\ref{#1}}}
+  \textup{\let\df@label\@empty\MT_prev_tagform:n {\ref{#1}}}
 }
 \EQ_MakeRobust\MT_extended_eqref:n
 \newcommand*\refeq[1]{