diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/tools/array.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/tools/array.sty | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/latex/tools/array.sty b/Master/texmf-dist/tex/latex/tools/array.sty index 7cdb801c170..1777fddbfec 100644 --- a/Master/texmf-dist/tex/latex/tools/array.sty +++ b/Master/texmf-dist/tex/latex/tools/array.sty @@ -39,7 +39,7 @@ %% Copyright (C) 1989-1998 Frank Mittelbach, all rights reserved. \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{array} - [2017/11/07 v2.4f Tabular extension package (FMi)] + [2018/04/07 v2.4g Tabular extension package (FMi)] %% \def\@addtopreamble#1{\xdef\@preamble{\@preamble #1}} @@ -92,7 +92,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 \@xexpast #1*0x\@@ \count@\m@ne \let\the@toks\relax @@ -133,25 +133,25 @@ \d@llarend \do@row@strut \hfil \or \hskip1sp\d@llarbegin \insert@column \d@llarend \do@row@strut \hfil \or \hfil\hskip1sp\d@llarbegin \insert@column \d@llarend \do@row@strut \or - \setbox\mcell@box\vbox + \setbox\ar@mcellbox\vbox \@startpbox{\@nextchar}\insert@column \@endpbox - \align@mcell + \ar@align@mcell \do@row@strut \or \vtop \@startpbox{\@nextchar}\insert@column \@endpbox\do@row@strut \or \vbox \@startpbox{\@nextchar}\insert@column \@endpbox\do@row@strut \fi}\prepnext@tok} -\newbox\mcell@box -\def\align@mcell{% - \ifdim \ht\mcell@box > \ht\@arstrutbox +\newbox\ar@mcellbox +\def\ar@align@mcell{% + \ifdim \ht\ar@mcellbox > \ht\@arstrutbox \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} \def\@classix{\ifnum \@lastchclass = \thr@@ @@ -308,7 +308,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 \@temptokena{#1}\@tempswatrue \@whilesw\if@tempswa\fi{\@tempswafalse\the\NC@list}% \count@\m@ne |