[latex3-commits] [git/LaTeX3-latex3-latex2e] master: * array.dtx: Renamed internal \mcell at box to \ar at mcellbox and \align at mcell to \ar at align@mcell to avoid conflict with makecell package (51e2811)

[Frank Mittelbach]

Repository : https://github.com/latex3/latex2e
On branch  : master
Link       : https://github.com/latex3/latex2e/commit/51e2811e77562c757ffcfd28b07412d065febd71

>---------------------------------------------------------------

commit 51e2811e77562c757ffcfd28b07412d065febd71
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Sat Apr 7 13:33:20 2018 +0200

    	* array.dtx: Renamed internal \mcell at box to
    	\ar at mcellbox and \align at mcell to \ar at align@mcell
            to avoid conflict with makecell package


>---------------------------------------------------------------

51e2811e77562c757ffcfd28b07412d065febd71
 required/tools/array.dtx   |   34 +++++++++++++++++++---------------
 required/tools/changes.txt |    6 ++++++
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/required/tools/array.dtx b/required/tools/array.dtx
index 1502265..f20d41f 100644
--- a/required/tools/array.dtx
+++ b/required/tools/array.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright 1993-2017
+% Copyright 1993-2018
 %
 % The LaTeX3 Project and any individual authors listed elsewhere
 % in this file.
@@ -26,13 +26,17 @@
 %% Copyright (C) 1989-1998 Frank Mittelbach, all rights reserved.
 %<+package>\NeedsTeXFormat{LaTeX2e}[1995/06/01]
 %<+package>\ProvidesPackage{array}
-%<+package>         [2017/11/07 v2.4f Tabular extension package (FMi)]
+%<+package>         [2018/04/07 v2.4g Tabular extension package (FMi)]
 %
 % \fi
 %
 %%
 %
 %
+% \changes{v2.4g}{2018/04/07}{Renamed internal \cs{mcell at box} to
+%       \cs{ar at mcellbox} and \cs{align at mcell} to \cs{ar at align@mcell}
+%        to avoid conflict with makecell package}
+%
 % \changes{v2.4c}{2008/09/09}{(WR) Typo fix in documentation}
 %
 % \changes{v2.3c}{1995/11/02}{(DPC) minor doc changes}
@@ -1304,12 +1308,12 @@
 %    Two more are needed to deal with the code that handles struts
 %    for extra space after a row from =\\[<space>]=
 %    (=\do at row@strut=) and code that manages m-cells depending on
-%   their heights (=\align at mcell=).
+%   their heights (=\ar at align@mcell=).
 % \changes{v2.4e}{2016/10/07}{Fixing SX68732}
 % \changes{v2.4f}{2017/11/04}{Managing m-cells without \cs{vcenter}}
 %    \begin{macrocode}
    \let\do at row@strut\relax
-   \let\align at mcell\relax 
+   \let\ar at align@mcell\relax 
 %    \end{macrocode}
 %    Now we remove possible  $*$-forms in the user preamble with the
 %    command =\@xexpast=.  As we already know, this command saves
@@ -1584,7 +1588,7 @@
 % \changes{v2.4f}{2017/11/04}{Managing m-cells without \cs{vcenter}}
 %    \begin{macrocode}
 %   $\vcenter
-    \setbox\mcell at box\vbox 
+    \setbox\ar at mcellbox\vbox 
 %    \end{macrocode}
 %    The part of the templates which is the same in all three cases
 %    (\texttt{p}, \texttt{m} and \texttt{b})
@@ -1599,7 +1603,7 @@
 % \changes{v2.4f}{2017/11/04}{Managing m-cells without \cs{vcenter}}
 %    \begin{macrocode}
        \@startpbox{\@nextchar}\insert at column \@endpbox 
-    \align at mcell 
+    \ar at align@mcell 
 %$
     \do at row@strut \or
 %    \end{macrocode}
@@ -1622,17 +1626,17 @@
 %
 
 %
-% \begin{macro}{\mcell at box}
+% \begin{macro}{\ar at mcellbox}
 %    When dealing with m-cells we need a box to measure the cell
 %    height.
 % \changes{v2.4f}{2017/11/04}{Managing m-cells without \cs{vcenter}}
 %    \begin{macrocode}
-\newbox\mcell at box
+\newbox\ar at mcellbox
 %    \end{macrocode}
 % \end{macro}
 %
 %
-% \begin{macro}{\align at mcell}
+% \begin{macro}{\ar at align@mcell}
 %    M-cells are supposed to be vertically centered within the table
 %    row. In the original implementation that was done using
 %    =\vcenter= but the issue with that approach is that it centers
@@ -1650,8 +1654,8 @@
 %    line p-cell.
 % \changes{v2.4f}{2017/11/04}{Managing m-cells without \cs{vcenter}}
 %    \begin{macrocode}
-\def\align at mcell{%
-  \ifdim \ht\mcell at box > \ht\@arstrutbox
+\def\ar at align@mcell{%
+  \ifdim \ht\ar at mcellbox > \ht\@arstrutbox
 %    \end{macrocode}
 %    Otherwise we realign vertically by lowering the box. The question
 %    is how much do we need to move down? If there is any
@@ -1667,13 +1671,13 @@
 %    what we add and then lower the cell by half of the resulting value.
 %    \begin{macrocode}
     \begingroup
-     \dimen@\ht\mcell at box
+     \dimen@\ht\ar at mcellbox
      \advance\dimen at -\ht\@arstrutbox
      \advance\dimen@\baselineskip
-     \lower.5\dimen@\box\mcell at box
+     \lower.5\dimen@\box\ar at mcellbox
     \endgroup
   \else % assume one line and align at baseline
-    \box\mcell at box
+    \box\ar at mcellbox
   \fi}
 %    \end{macrocode}
 % \end{macro}
@@ -2667,7 +2671,7 @@
 \def\@mkpream#1{\gdef\@preamble{}\@lastchclass 4 \@firstamptrue
    \let\@sharp\relax \let\@startpbox\relax \let\@endpbox\relax
    \let\do at row@strut\relax
-   \let\align at mcell\relax 
+   \let\ar at align@mcell\relax 
 %    \end{macrocode}
 %    Now we remove possible  $*$-forms and user-defined column
 %    specifiers in the user preamble by repeatedly executing the list
diff --git a/required/tools/changes.txt b/required/tools/changes.txt
index da1193c..58324da 100644
--- a/required/tools/changes.txt
+++ b/required/tools/changes.txt
@@ -5,6 +5,12 @@ completeness or accuracy and it contains some references to files that
 are not part of the distribution.
 =======================================================================
 
+2018-04-07  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
+
+	* array.dtx: Renamed internal \mcell at box to
+	\ar at mcellbox and \align at mcell to \ar at align@mcell
+        to avoid conflict with makecell package
+
 2018-01-28  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
 
 	* multicol.dtx:  use a single output routine that does both