CTAN sync 202103190300

1 files changed, 17 insertions, 12 deletions

diff --git a/macros/latex/contrib/mathtools/mhsetup.dtx b/macros/latex/contrib/mathtools/mhsetup.dtx
index b44eea12cb..bf89bc9c88 100644
--- a/macros/latex/contrib/mathtools/mhsetup.dtx
+++ b/macros/latex/contrib/mathtools/mhsetup.dtx
@@ -6,11 +6,11 @@
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
-% version 1.3 of this license or (at your option) any later
+% version 1.3c of this license or (at your option) any later
 % version. The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3 or later is part of all distributions of
-% LaTeX version 2005/12/01 or later.
+% and version 1.3c or later is part of all distributions of
+% LaTeX version 2008/05/04 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
@@ -70,7 +70,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: mhsetup 2017/03/31 v1.3 mhsetup}
+\Msg{* Package: mhsetup 2021/03/18 v1.4 mhsetup}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -86,11 +86,11 @@ Copyright (C) 2020-          by Lars Madsen, The LaTeX3 team
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
-version 1.3 of this license or (at your option) any later
+version 1.3c of this license or (at your option) any later
 version. The latest version of this license is in
    http://www.latex-project.org/lppl.txt
-and version 1.3 or later is part of all distributions of
-LaTeX version 2005/12/01 or later.
+and version 1.3c or later is part of all distributions of
+LaTeX version 2008/05/04 or later.
 
 This work has the LPPL maintenance status "maintained".
 
@@ -133,7 +133,7 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{mhsetup.drv}%
-  [2017/03/31 v1.3 programming setup (MH)]
+  [2021/03/18 v1.4 programming setup (MH)]
 \documentclass{ltxdoc}
 \usepackage{mhsetup}
 
@@ -162,7 +162,7 @@ and the derived files
 %</driver>
 %  \fi
 %
-%  \CheckSum{298}
+%  \CheckSum{301}
 %
 %  \GetFileInfo{mhsetup.drv}
 %
@@ -302,7 +302,7 @@ and the derived files
 %    \begin{macrocode}
 %<*package>
 \ProvidesPackage{mhsetup}%
-  [2017/03/31 v1.3 programming setup (MH)]
+  [2021/03/18 v1.4 programming setup (MH)]
 %    \end{macrocode}
 %  \subsection{The new internal syntax}
 %  \begin{macro}{\MHInternalSyntaxOn}
@@ -576,11 +576,16 @@ and the derived files
 %  \begin{macro}{\MH_nospace_protected_testopt:n}
 %  Scanning for the next character but disallow spaces.
 % \changes{v1.3}{2017/03/31}{Added MH\_ prefix to several \cs{if...} macros}
+% \changes{v1.4}{2021/01/14}{Added
+% \cs{MH\_group\_align\_safe\_begin/end:} as suggested by
+% Phelype Oleinik  in issue \#15. This enables
+% \cs{MH\_nospace\_ifnextchar:Nnn} to work correctly inside nested alignments}
 %    \begin{macrocode}
 \long\def\MH_nospace_ifnextchar:Nnn #1#2#3{
+  \MH_group_align_safe_begin: % added 2021/01/14
   \MH_let:NwN\reserved@d=~#1
-  \def\reserved@a{#2}
-  \def\reserved@b{#3}
+  \def\reserved@a{\MH_group_align_safe_end: #2} % changed 2021/01/14
+  \def\reserved@b{\MH_group_align_safe_end: #3} % changed 2021/01/14
   \futurelet\@let@token\MH_nospace_nextchar:
 }
 \def\MH_nospace_nextchar:{