texlive[51278] Master/texmf-dist: multirow (31may19)

commits+karl at tug.org commits+karl at tug.org
Fri May 31 23:45:57 CEST 2019


Revision: 51278
          http://tug.org/svn/texlive?view=revision&revision=51278
Author:   karl
Date:     2019-05-31 23:45:57 +0200 (Fri, 31 May 2019)
Log Message:
-----------
multirow (31may19)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/multirow/README
    trunk/Master/texmf-dist/doc/latex/multirow/multirow.pdf
    trunk/Master/texmf-dist/source/latex/multirow/multirow.dtx
    trunk/Master/texmf-dist/tex/latex/multirow/bigdelim.sty
    trunk/Master/texmf-dist/tex/latex/multirow/bigstrut.sty
    trunk/Master/texmf-dist/tex/latex/multirow/multirow.sty

Modified: trunk/Master/texmf-dist/doc/latex/multirow/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/multirow/README	2019-05-31 21:45:42 UTC (rev 51277)
+++ trunk/Master/texmf-dist/doc/latex/multirow/README	2019-05-31 21:45:57 UTC (rev 51278)
@@ -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 <piet at vanoostrum.org>

Modified: trunk/Master/texmf-dist/doc/latex/multirow/multirow.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/source/latex/multirow/multirow.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/multirow/multirow.dtx	2019-05-31 21:45:42 UTC (rev 51277)
+++ trunk/Master/texmf-dist/source/latex/multirow/multirow.dtx	2019-05-31 21:45:57 UTC (rev 51278)
@@ -32,7 +32,7 @@
 %<multirow>\ProvidesPackage{multirow}%
 %<bigstrut>\ProvidesPackage{bigstrut}
 %<bigdelim>\ProvidesPackage{bigdelim}
-%<multirow|bigstrut|bigdelim>           [2019/01/01 v2.4
+%<multirow|bigstrut|bigdelim>           [2019/05/31 v2.5
 %<multirow>                  Span multiple rows of a table]%
 %<bigstrut>                  Provide larger struts in tabulars]
 %<bigdelim>                  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 at 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 at arc}
+{\def\@cline#1-#2\@nil{%
   \omit
   \@multicnt#1%
   \advance\@multispan\m at 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 at ne
+  \ifnum\@multicnt=\@ne\@firstofone{&\omit}\fi
+  \@multicnt#2%
+  \advance\@multicnt-#1%
+  \advance\@multispan\@ne
+  {\CT at arc@\leaders\hrule\@height\arrayrulewidth\hfill}%
+  \cr
+  \noalign{\nobreak\vskip-\arrayrulewidth}}}
 }}
 %    \end{macrocode}
 % \end{macro}

Modified: trunk/Master/texmf-dist/tex/latex/multirow/bigdelim.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/multirow/bigdelim.sty	2019-05-31 21:45:42 UTC (rev 51277)
+++ trunk/Master/texmf-dist/tex/latex/multirow/bigdelim.sty	2019-05-31 21:45:57 UTC (rev 51278)
@@ -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]}}

Modified: trunk/Master/texmf-dist/tex/latex/multirow/bigstrut.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/multirow/bigstrut.sty	2019-05-31 21:45:42 UTC (rev 51277)
+++ trunk/Master/texmf-dist/tex/latex/multirow/bigstrut.sty	2019-05-31 21:45:57 UTC (rev 51278)
@@ -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]{%

Modified: trunk/Master/texmf-dist/tex/latex/multirow/multirow.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/multirow/multirow.sty	2019-05-31 21:45:42 UTC (rev 51277)
+++ trunk/Master/texmf-dist/tex/latex/multirow/multirow.sty	2019-05-31 21:45:57 UTC (rev 51278)
@@ -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 at arc}
+{\def\@cline#1-#2\@nil{%
   \omit
   \@multicnt#1%
   \advance\@multispan\m at 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 at ne
+  \ifnum\@multicnt=\@ne\@firstofone{&\omit}\fi
+  \@multicnt#2%
+  \advance\@multicnt-#1%
+  \advance\@multispan\@ne
+  {\CT at arc@\leaders\hrule\@height\arrayrulewidth\hfill}%
+  \cr
+  \noalign{\nobreak\vskip-\arrayrulewidth}}}
 }}
 \DeclareOption{supertabular}{%
 \AtBeginDocument{%



More information about the tex-live-commits mailing list