From c51105ca12a978ce7a45352c412bf9c54a42f161 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 31 May 2019 21:45:57 +0000 Subject: multirow (31may19) git-svn-id: svn://tug.org/texlive/trunk@51278 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/multirow/README | 6 ++-- Master/texmf-dist/doc/latex/multirow/multirow.pdf | Bin 611790 -> 612701 bytes .../texmf-dist/source/latex/multirow/multirow.dtx | 33 +++++++++++++++++++-- Master/texmf-dist/tex/latex/multirow/bigdelim.sty | 2 +- Master/texmf-dist/tex/latex/multirow/bigstrut.sty | 2 +- Master/texmf-dist/tex/latex/multirow/multirow.sty | 18 +++++++++-- 6 files changed, 50 insertions(+), 11 deletions(-) diff --git a/Master/texmf-dist/doc/latex/multirow/README b/Master/texmf-dist/doc/latex/multirow/README index a58e4b61d05..293c2f0bbc4 100644 --- a/Master/texmf-dist/doc/latex/multirow/README +++ b/Master/texmf-dist/doc/latex/multirow/README @@ -1,6 +1,6 @@ -multirow.sty 2019/01/01 v2.4 -bigstruts.sty 2019/01/01 v2.4 -bigdelim.sty 2019/01/01 v2.4 +multirow.sty 2019/05/31 v2.5 +bigstruts.sty 2019/05/31 v2.5 +bigdelim.sty 2019/05/31 v2.5 Original Author: Jerry Leichter Current Author: Piet van Oostrum diff --git a/Master/texmf-dist/doc/latex/multirow/multirow.pdf b/Master/texmf-dist/doc/latex/multirow/multirow.pdf index 0317556b4a7..2c71f117a8d 100644 Binary files a/Master/texmf-dist/doc/latex/multirow/multirow.pdf and b/Master/texmf-dist/doc/latex/multirow/multirow.pdf differ diff --git a/Master/texmf-dist/source/latex/multirow/multirow.dtx b/Master/texmf-dist/source/latex/multirow/multirow.dtx index 1d1751daff1..a91cb832ec0 100644 --- a/Master/texmf-dist/source/latex/multirow/multirow.dtx +++ b/Master/texmf-dist/source/latex/multirow/multirow.dtx @@ -32,7 +32,7 @@ %\ProvidesPackage{multirow}% %\ProvidesPackage{bigstrut} %\ProvidesPackage{bigdelim} -% [2019/01/01 v2.4 +% [2019/05/31 v2.5 % Span multiple rows of a table]% % Provide larger struts in tabulars] % Create big delimiters in tabular or array] @@ -90,6 +90,7 @@ % \changes{v2.4}{2018/12/30}{Add \leavevmode in bigstrut.sty} % \changes{v2.4}{2019/01/01}{Make \meta{width} and \meta{vmove} in \cs{multirow} % \Package{calc} compatible} +% \changes{v2.5}{2019/05/31}{Solve a clash with the \Package{colortbl} package} % % \GetFileInfo{multirow.sty} % @@ -128,6 +129,14 @@ % \section{Changes in version 2} % \label{sec:changes-2} % +%\subsection*{version 2.5} +% +% \begin{itemize} +% \item Solve a clash with the \Package{colortbl} package, when multirow +% uses the \texttt{longtable} option. There was a clash with both +% packages redefining \cs{@cline}. +% \end{itemize} +% %\subsection*{version 2.4} % % \begin{itemize} @@ -1354,15 +1363,22 @@ % \end{macro} % % \changes{v1.9b}{2016/09/24}{Implement the \texttt{longtable} option.} +% \changes{v2.5}{2019/05/31}{Make the redefinition of \cs{@cline} +% compatible with the \Package{colortbl} package.} % \begin{macro}{\cline} % The package option \texttt{longtable} redefines the \cs{cline} macro to % work around a bug in \Package{longtable}. See section \ref{sec:use-with-longtable}\footnote{% % Thanks to David Carlisle. See % \url{http://tex.stackexchange.com/questions/52100/longtable-multirow-problem-with-cline-and-nopagebreak#answer-52101} }. +% First we check if the macro \cs{CT@arc} is defined. If so, this +% indocates that the \Package{colortbl} package is loaded. As +% \Package{colortbl} also redefines \cs{@cline}, we must take this into +% account with our own redefinition of \cs{@cline}. % \begin{macrocode} \DeclareOption{longtable}{% \AtBeginDocument{% -\def\@cline#1-#2\@nil{% +\@ifundefined{CT@arc} +{\def\@cline#1-#2\@nil{% \omit \@multicnt#1% \advance\@multispan\m@ne @@ -1372,7 +1388,18 @@ \advance\@multispan\@ne \leaders\hrule\@height\arrayrulewidth\hfill \cr - \noalign{\nobreak\vskip-\arrayrulewidth}} + \noalign{\nobreak\vskip-\arrayrulewidth}}} +{\def\@cline#1-#2\@nil{% + \omit + \@multicnt#1% + \advance\@multispan\m@ne + \ifnum\@multicnt=\@ne\@firstofone{&\omit}\fi + \@multicnt#2% + \advance\@multicnt-#1% + \advance\@multispan\@ne + {\CT@arc@\leaders\hrule\@height\arrayrulewidth\hfill}% + \cr + \noalign{\nobreak\vskip-\arrayrulewidth}}} }} % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/tex/latex/multirow/bigdelim.sty b/Master/texmf-dist/tex/latex/multirow/bigdelim.sty index 339052154ed..eabc25fd885 100644 --- a/Master/texmf-dist/tex/latex/multirow/bigdelim.sty +++ b/Master/texmf-dist/tex/latex/multirow/bigdelim.sty @@ -23,7 +23,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{bigdelim} - [2019/01/01 v2.4 + [2019/05/31 v2.5 Create big delimiters in tabular or array] \RequirePackage{multirow} \newcommand\ldelim[3]{\@ifnextchar[{\@ldelim{#1}{#2}{#3}}{\@ldelim{#1}{#2}{#3}[\null]}} diff --git a/Master/texmf-dist/tex/latex/multirow/bigstrut.sty b/Master/texmf-dist/tex/latex/multirow/bigstrut.sty index eaa934c36d1..843e27dc678 100644 --- a/Master/texmf-dist/tex/latex/multirow/bigstrut.sty +++ b/Master/texmf-dist/tex/latex/multirow/bigstrut.sty @@ -23,7 +23,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{bigstrut} - [2019/01/01 v2.4 + [2019/05/31 v2.5 Provide larger struts in tabulars] \@ifundefined{bigstrutjot}{\newdimen\bigstrutjot}{}\bigstrutjot=2pt \newcommand\bigstrut[1][x]{% diff --git a/Master/texmf-dist/tex/latex/multirow/multirow.sty b/Master/texmf-dist/tex/latex/multirow/multirow.sty index 88c8ce3daab..02f8db7bcc3 100644 --- a/Master/texmf-dist/tex/latex/multirow/multirow.sty +++ b/Master/texmf-dist/tex/latex/multirow/multirow.sty @@ -23,13 +23,14 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{multirow}% - [2019/01/01 v2.4 + [2019/05/31 v2.5 Span multiple rows of a table]% \newif\ifmultirowdebug \DeclareOption{debug}{\multirowdebugtrue} \DeclareOption{longtable}{% \AtBeginDocument{% -\def\@cline#1-#2\@nil{% +\@ifundefined{CT@arc} +{\def\@cline#1-#2\@nil{% \omit \@multicnt#1% \advance\@multispan\m@ne @@ -39,7 +40,18 @@ \advance\@multispan\@ne \leaders\hrule\@height\arrayrulewidth\hfill \cr - \noalign{\nobreak\vskip-\arrayrulewidth}} + \noalign{\nobreak\vskip-\arrayrulewidth}}} +{\def\@cline#1-#2\@nil{% + \omit + \@multicnt#1% + \advance\@multispan\m@ne + \ifnum\@multicnt=\@ne\@firstofone{&\omit}\fi + \@multicnt#2% + \advance\@multicnt-#1% + \advance\@multispan\@ne + {\CT@arc@\leaders\hrule\@height\arrayrulewidth\hfill}% + \cr + \noalign{\nobreak\vskip-\arrayrulewidth}}} }} \DeclareOption{supertabular}{% \AtBeginDocument{% -- cgit v1.2.3