From 745892fbddea56040139108277e728b53fd8fc11 Mon Sep 17 00:00:00 2001
From: Norbert Preining <norbert@preining.info>
Date: Thu, 28 May 2020 03:03:21 +0000
Subject: CTAN sync 202005280303

---
 macros/latex-dev/required/tools/array.dtx | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

(limited to 'macros/latex-dev/required/tools/array.dtx')

diff --git a/macros/latex-dev/required/tools/array.dtx b/macros/latex-dev/required/tools/array.dtx
index aca43a53c6..a84d4faf51 100644
--- a/macros/latex-dev/required/tools/array.dtx
+++ b/macros/latex-dev/required/tools/array.dtx
@@ -29,10 +29,11 @@
 %<+package>\providecommand\DeclareCurrentRelease[2]{}
 %<+package>
 %<+package>\DeclareRelease{}{2016-10-06}{array-2016-10-06.sty}
-%<+package>\DeclareCurrentRelease{}{2019-10-01}
+%<+package>\DeclareRelease{v2.4}{2020-02-10}{array-2020-02-10.sty}
+%<+package>\DeclareCurrentRelease{}{2020-10-01}
 %<+package>
 %<+package>\ProvidesPackage{array}
-%<+package>         [2020/02/10 v2.4m Tabular extension package (FMi)]
+%<+package>         [2020/10/01 v2.5b Tabular extension package (FMi)]
 %
 % \fi
 %
@@ -2206,8 +2207,13 @@
 \let\do@row@strut\relax
 %    \end{macrocode}
 %
+%    \cs{@yargarraycr} is the same as in the \LaTeX{} kernel
+%    (depending on the date of the kernel with one of the two
+%    definitions below). We therefore do not define it again.
+% \changes{v2.5b}{200/04/22}{Don't define \cs{@yargarraycr} unnecessarily}
 %    \begin{macrocode}
-\def\@yargarraycr#1{\cr\noalign{\vskip #1}}
+%\def\@yargarraycr#1{\cr\noalign{\@vspace@calcify{#1}}} % 2020-10-01
+%\def\@yargarraycr#1{\cr\noalign{\vskip #1}}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -3034,14 +3040,18 @@
 %    alignment which is either "l", "c", or "r" and the second is the
 %    nominal width of the column.
 % \changes{v2.4f}{2017/11/07}{Column type added}
+% \changes{v2.5a}{2020/04/06}{Use \cs{d@llarbegin} and \cs{d@llarend} so
+%    that cell is typeset in math mode inside \texttt{array} (gh/297)}
 %    \begin{macrocode}
 \newcolumntype{w}[2]{%
 %    \end{macrocode}
 %    Before the cell content we start an "lrbox"-environment to
 %    collect the cell material into the previously allocated box
-%    "\ar@cellbox".
+%    "\ar@cellbox". We add \cs{d@llarbegin} (and later \cs{d@llarend})
+%    so that the content is typeset in math mode if we are in an
+%    \texttt{array} environment.
 %    \begin{macrocode}
-  >{\begin{lrbox}\ar@cellbox}%
+  >{\begin{lrbox}\ar@cellbox\d@llarbegin}%
 %    \end{macrocode}
 %    Then comes a specifier for the cell content.  We use "c", but
 %    that doesn't matter as in the end we will always put a box of a
@@ -3059,9 +3069,9 @@
 %    alignment within that width. We unbox the collected material so
 %    that any stretchable glue inside can interact with the alignment.
 % \changes{v2.4m}{2020/02/10}{Unbox collected material so that
-%  %    stretchable glue inside can act (gh/270)}
+%                             stretchable glue inside can act (gh/270)}
 %    \begin{macrocode}
-  <{\end{lrbox}%
+  <{\d@llarend \end{lrbox}%
     \makebox[#2][#1]{\unhbox\ar@cellbox}}}
 %    \end{macrocode}
 %  \end{macro}
@@ -3072,11 +3082,13 @@
 %    The \texttt{W} is similar but in this case we want a warning if
 %    the cell content is too wide.
 % \changes{v2.4f}{2017/11/07}{Column type added}
+% \changes{v2.5a}{2020/04/06}{Use \cs{d@llarbegin} and \cs{d@llarend} so
+%    that cell is typeset in mathmode inside \texttt{array} (gh/297)}
 %    \begin{macrocode}
 \newcolumntype{W}[2]
-  {>{\begin{lrbox}\ar@cellbox}%
+  {>{\begin{lrbox}\ar@cellbox\d@llarbegin}%
    c%
-   <{\end{lrbox}%
+   <{\d@llarend\end{lrbox}%
    \let\hss\hfil
    \makebox[#2][#1]{\unhbox\ar@cellbox}}}
 %    \end{macrocode}
-- 
cgit v1.2.3

