diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/tools')
| -rw-r--r-- | Master/texmf-dist/source/latex/tools/array.dtx | 36 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/tools/multicol.dtx | 2 |
2 files changed, 21 insertions, 17 deletions
diff --git a/Master/texmf-dist/source/latex/tools/array.dtx b/Master/texmf-dist/source/latex/tools/array.dtx index 1502265d962..fcef9426c48 100644 --- a/Master/texmf-dist/source/latex/tools/array.dtx +++ b/Master/texmf-dist/source/latex/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@box} to +% \cs{ar@mcellbox} and \cs{align@mcell} to \cs{ar@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@row@strut=) and code that manages m-cells depending on -% their heights (=\align@mcell=). +% their heights (=\ar@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@row@strut\relax - \let\align@mcell\relax + \let\ar@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@box\vbox + \setbox\ar@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@column \@endpbox - \align@mcell + \ar@align@mcell %$ \do@row@strut \or % \end{macrocode} @@ -1622,17 +1626,17 @@ % % -% \begin{macro}{\mcell@box} +% \begin{macro}{\ar@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@box +\newbox\ar@mcellbox % \end{macrocode} % \end{macro} % % -% \begin{macro}{\align@mcell} +% \begin{macro}{\ar@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@mcell{% - \ifdim \ht\mcell@box > \ht\@arstrutbox +\def\ar@align@mcell{% + \ifdim \ht\ar@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@box + \dimen@\ht\ar@mcellbox \advance\dimen@-\ht\@arstrutbox \advance\dimen@\baselineskip - \lower.5\dimen@\box\mcell@box + \lower.5\dimen@\box\ar@mcellbox \endgroup \else % assume one line and align at baseline - \box\mcell@box + \box\ar@mcellbox \fi} % \end{macrocode} % \end{macro} @@ -1719,7 +1723,7 @@ % the definition of =\@arrayrule=. In the original a line without % width\footnote{So the space between \texttt{cc} and \texttt{c|c} % is equal.} is created by multiple insertions of -% =\hskip .5\arrayrulewidth=. +% =\hskip .5\arrayrulewidth=. % We only insert a vertical line into the % preamble. This is done to prevent problems with \TeX's main % memory when generating tables with many vertical lines in them @@ -2667,7 +2671,7 @@ \def\@mkpream#1{\gdef\@preamble{}\@lastchclass 4 \@firstamptrue \let\@sharp\relax \let\@startpbox\relax \let\@endpbox\relax \let\do@row@strut\relax - \let\align@mcell\relax + \let\ar@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/Master/texmf-dist/source/latex/tools/multicol.dtx b/Master/texmf-dist/source/latex/tools/multicol.dtx index f1d8b777d38..4da6dbd38d8 100644 --- a/Master/texmf-dist/source/latex/tools/multicol.dtx +++ b/Master/texmf-dist/source/latex/tools/multicol.dtx @@ -1680,7 +1680,7 @@ % environment was done by changing the output routine from % |\multi@column@out| to |\balance@column@out|. As it turned out % that this has a couple of issues when the last columns should not -% be balanced after aled (for example because they contained several +% be balanced after all (for example because they contained several % |\columnbreak| commands we now stay with one output routine for % the environment and only signal that we reached the end of the % environment by marking it with a special penalty that we can check |