summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/tools/array.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-10-02 21:49:18 +0000
committerKarl Berry <karl@freefriends.org>2020-10-02 21:49:18 +0000
commit5255c37137345163348d22ab46af2304cf9f55a6 (patch)
tree88246497477ddcc26834e5708566ad4c1c862a19 /Master/texmf-dist/tex/latex/tools/array.sty
parent1922ba4684a59cde742dcef9ed152381d2d7b110 (diff)
latex2e (2oct20)
git-svn-id: svn://tug.org/texlive/trunk@56514 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/tools/array.sty')
-rw-r--r--Master/texmf-dist/tex/latex/tools/array.sty24
1 files changed, 13 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/latex/tools/array.sty b/Master/texmf-dist/tex/latex/tools/array.sty
index 7afaa6dbadf..28162839cb1 100644
--- a/Master/texmf-dist/tex/latex/tools/array.sty
+++ b/Master/texmf-dist/tex/latex/tools/array.sty
@@ -42,10 +42,11 @@
\providecommand\DeclareCurrentRelease[2]{}
\DeclareRelease{}{2016-10-06}{array-2016-10-06.sty}
-\DeclareCurrentRelease{}{2019-10-01}
+\DeclareRelease{v2.4}{2020-02-10}{array-2020-02-10.sty}
+\DeclareCurrentRelease{}{2020-10-01}
\ProvidesPackage{array}
- [2019/08/31 v2.4l Tabular extension package (FMi)]
+ [2020/10/01 v2.5c Tabular extension package (FMi)]
%%
\def\@addtopreamble#1{\xdef\@preamble{\@preamble #1}}
@@ -197,7 +198,6 @@
\ifnum\@multicnt >\z@ \do@row@strut \fi
\cr}
\let\do@row@strut\relax
-\def\@yargarraycr#1{\cr\noalign{\vskip #1}}
\long\def\multicolumn#1#2#3{%
\multispan{#1}\begingroup
\def\@addamp{\if@firstamp \@firstampfalse \else
@@ -330,20 +330,22 @@
\setlength{\extratabsurround}{2pt}
\newlength{\backup@length}
\newcommand{\firsthline}{%
- \multicolumn1c{%
+ \multicolumn1{@{}c@{}}{%
\global\backup@length\ht\@arstrutbox
\global\advance\backup@length\dp\@arstrutbox
\global\advance\backup@length\arrayrulewidth
\raise\extratabsurround\copy\@arstrutbox
+ \kern-1sp%
}\\[-\backup@length]\hline
}
-\newcommand{\lasthline}{\hline\multicolumn1c{%
+\newcommand{\lasthline}{\hline\multicolumn1{@{}c@{}}{%
\global\backup@length2\ht\@arstrutbox
\global\advance\backup@length2\dp\@arstrutbox
\global\advance\backup@length\arrayrulewidth
}\\[-\backup@length]%
- \multicolumn1c{%
+ \multicolumn1{@{}c@{}}{%
\lower\extratabsurround\copy\@arstrutbox
+ \kern-1sp%
}%
}
\CheckCommand*\@xhline{\ifx\reserved@a\hline
@@ -358,15 +360,15 @@
\newsavebox\ar@cellbox
\newcolumntype{w}[2]{%
- >{\begin{lrbox}\ar@cellbox}%
+ >{\begin{lrbox}\ar@cellbox\d@llarbegin}%
c%
- <{\end{lrbox}%
- \makebox[#2][#1]{\usebox\ar@cellbox}}}
+ <{\d@llarend \end{lrbox}%
+ \makebox[#2][#1]{\unhbox\ar@cellbox}}}
\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}}}
\endinput