texlive[72833] Master/texmf-dist: multirow (12nov24)
commits+karl at tug.org
commits+karl at tug.org
Tue Nov 12 22:26:05 CET 2024
Revision: 72833
https://tug.org/svn/texlive?view=revision&revision=72833
Author: karl
Date: 2024-11-12 22:26:05 +0100 (Tue, 12 Nov 2024)
Log Message:
-----------
multirow (12nov24)
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 2024-11-12 21:25:57 UTC (rev 72832)
+++ trunk/Master/texmf-dist/doc/latex/multirow/README 2024-11-12 21:26:05 UTC (rev 72833)
@@ -1,6 +1,6 @@
-multirow.sty v2.8 2021/03/15
-bigstruts.sty v2.8 2021/03/15
-bigdelim.sty v2.8 2021/03/15
+multirow.sty v2.9 2024/11/12
+bigstruts.sty v2.9 2024/11/12
+bigdelim.sty v2.9 2024/11/12
Original Author: Jerry Leichter
Current Author: Pieter van Oostrum <pieter at vanoostrum.org>
@@ -30,7 +30,7 @@
rows empty, or the stuff created by \multirow will over-write it.
With a positive value of nrows the spanned colomns are this row and
(nrows-1) rows below it. With a negative value of nrows they are
- this row and (1-nrows) above it.
+ this row and (-nrows-1) above it.
bigstruts is mainly used if you've used bigstrut.sty. In that case it
is the total number of uses of \bigstrut within the rows being
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 2024-11-12 21:25:57 UTC (rev 72832)
+++ trunk/Master/texmf-dist/source/latex/multirow/multirow.dtx 2024-11-12 21:26:05 UTC (rev 72833)
@@ -1,7 +1,7 @@
% \iffalse meta-comment
%
% Parts of this file, Copyright (C) 1994 by Jerry Leichter
-% Copyright (C) 2016-2021 by Pieter van Oostrum <pieter at vanoostrum.org>
+% Copyright (C) 2016-2024 by Pieter van Oostrum <pieter at vanoostrum.org>
% -------------------------------------------------------
%
% This file may be distributed and/or modified under the
@@ -24,7 +24,7 @@
%
%<multirow|bigstrut>%% Copyright (C) 1994 by Jerry Leichter
%<bigdelim>%% Copyright (C) 1994 by \O ystein Bache
-%% Copyright (C) 2016-2021 by Pieter van Oostrum <pieter at vanoostrum.org>
+%% Copyright (C) 2016-2024 by Pieter van Oostrum <pieter at vanoostrum.org>
%%
%
% \begin{macrocode}
@@ -32,7 +32,7 @@
%<multirow>\ProvidesPackage{multirow}%
%<bigstrut>\ProvidesPackage{bigstrut}
%<bigdelim>\ProvidesPackage{bigdelim}
-%<multirow|bigstrut|bigdelim> [2021/03/15 v2.8
+%<multirow|bigstrut|bigdelim> [2024/11/12 v2.9
%<multirow> Span multiple rows of a table]%
%<bigstrut> Provide larger struts in tabulars]
%<bigdelim> Create big delimiters in tabular or array]
@@ -130,6 +130,15 @@
% \section{Changes in version 2}
% \label{sec:changes-2}
%
+%\subsection*{version 2.9}
+%
+% \begin{itemize}
+% \item Documentation correction: the description of the meaning of a
+% negative value of \meta{nrows} was wrong.
+% \item Make \texttt{multirow.sty} compatible with
+% \texttt{supertabular} version 4.2a or later.
+% \end{itemize}
+%
%\subsection*{version 2.8}
%
%\begin{itemize}
@@ -230,7 +239,7 @@
% will over-write it. With a positive value of \meta{nrows} the
% spanned columns are this row and (\meta{nrows}-1) rows below
% it. With a negative value of \meta{nrows} they are this row and
-% (1-\meta{nrows}) above it. Fractional values are permitted for
+% (-\meta{nrows}-1) above it. Fractional values are permitted for
% \meta{nrows}; this allows for some fine-tuning.
%
% \item[\meta{bigstruts}] is mainly used if you've used the
@@ -1543,8 +1552,6 @@
% \env{supertabular}.
% The redefinition is delayed until the \verb+\begin{document}+.
%
-% \changes{v2.6}{2020/12/26}{Adapt the definition to be compatible with
-% modern versions of \texttt{supertabular}}
% \texttt{Supertabular} version 4.1f and later need a call to
% \cs{ST at save@lineno} to function properly, but earlier versions cannot
% use this as it doesn't exist in these versions. So the definitions of
@@ -1552,12 +1559,13 @@
% \cs{ST at save@lineno} is defined. There are also some other differences,
% so some intermediate versions of \texttt{supertabular} might need more
% subtle adaptations, but for now we leave it at that.
-%
% \begin{macrocode}
\DeclareOption{supertabular}{%
\AtBeginDocument{%
% \end{macrocode}
% \begin{macro}{\ST at tabularcr}
+% \changes{v2.6}{2020/12/26}{Adapt the definition to be compatible with
+% modern versions of \texttt{supertabular}}
% This macro is the definition of \verb+\\+ inside a
% \env{supertabular}. We check for a \verb+*+, and if it is
% present we call our own version, otherwise the
@@ -1572,8 +1580,10 @@
% \end{macro}
% \begin{macro}{\MRST at cr}
% \cs{MRST at cr} is a truncated copy of \cs{ST at cr}. It does all the bookkeeping
-% about the space the \env{longtable} occupies, but it doesn't
+% about the space the \env{supertabular} occupies, but it doesn't
% do the pagebreaking part.
+% \changes{v2.9}{2024/11/1}{Adapt the definition to be compatible with
+% \texttt{supertabular} version 4.2a or later.}
% \begin{macrocode}
\def\MRST at cr{%
\noalign{%
@@ -1591,12 +1601,14 @@
\global\ST at toadd=\z@}}
\else
% \end{macrocode}
-% These are the newer versions.
+% These are the newer versions. However, in version 4.2a and later of \texttt{supertabular},
+% \cs{ST at lineht} is renamed \cs{ST at rowht}.
% \begin{macrocode}
\def\ST at tabularcr{%
{\ifnum0=`}\fi
\ST at save@lineno
\@ifstar{\MRST at xtabularcr}{\ST at xtabularcr}}
+\ifx\ST at rowht\undefined
\def\MRST at cr{%
\noalign{%
\ifnum\ST at pboxht<\ST at lineht
@@ -1612,7 +1624,27 @@
\global\advance\ST at pageleft -\ST at toadd
\global\ST at toadd=\z@
\ST at trace@cr\thr@@{Space left for tabular: \the\ST at pageleft}}}
+\else
+% \end{macrocode}
+% Now the post 4.2a version.
+% \begin{macrocode}
+\def\MRST at cr{%
+ \noalign{%
+ \ifnum\ST at pboxht<\ST at rowht
+ \global\advance\ST at pageleft -\ST at rowht
+ \global\ST at prevht\ST at rowht
+ \else
+ \ST at trace@cr\thr@@{Added par box with height \the\ST at pboxht}%
+ \global\advance\ST at pageleft -\ST at pboxht
+ \global\advance\ST at pageleft -0.1\ST at pboxht
+ \global\ST at prevht\ST at pboxht
+ \global\ST at pboxht\z@
+ \fi
+ \global\advance\ST at pageleft -\ST at toadd
+ \global\ST at toadd=\z@
+ \ST at trace@cr\thr@@{Space left for tabular: \the\ST at pageleft}}}
\fi
+\fi
% \end{macrocode}
% \end{macro}
% \begin{macro}{\MRST at xtabularc}
Modified: trunk/Master/texmf-dist/tex/latex/multirow/bigdelim.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/multirow/bigdelim.sty 2024-11-12 21:25:57 UTC (rev 72832)
+++ trunk/Master/texmf-dist/tex/latex/multirow/bigdelim.sty 2024-11-12 21:26:05 UTC (rev 72833)
@@ -19,11 +19,11 @@
%% 2005/12/01 or later.
%%
%% Copyright (C) 1994 by \O ystein Bache
-%% Copyright (C) 2016-2021 by Pieter van Oostrum <pieter at vanoostrum.org>
+%% Copyright (C) 2016-2024 by Pieter van Oostrum <pieter at vanoostrum.org>
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{bigdelim}
- [2021/03/15 v2.8
+ [2024/11/12 v2.9
Create big delimiters in tabular or array]
\RequirePackage{multirow}
\newcommand\ldelim[2]{\@ifnextchar[{\@ldelim{#1}{#2}}{\@ldelim{#1}{#2}[0pt]}}
Modified: trunk/Master/texmf-dist/tex/latex/multirow/bigstrut.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/multirow/bigstrut.sty 2024-11-12 21:25:57 UTC (rev 72832)
+++ trunk/Master/texmf-dist/tex/latex/multirow/bigstrut.sty 2024-11-12 21:26:05 UTC (rev 72833)
@@ -19,11 +19,11 @@
%% 2005/12/01 or later.
%%
%% Copyright (C) 1994 by Jerry Leichter
-%% Copyright (C) 2016-2021 by Pieter van Oostrum <pieter at vanoostrum.org>
+%% Copyright (C) 2016-2024 by Pieter van Oostrum <pieter at vanoostrum.org>
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{bigstrut}
- [2021/03/15 v2.8
+ [2024/11/12 v2.9
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 2024-11-12 21:25:57 UTC (rev 72832)
+++ trunk/Master/texmf-dist/tex/latex/multirow/multirow.sty 2024-11-12 21:26:05 UTC (rev 72833)
@@ -19,11 +19,11 @@
%% 2005/12/01 or later.
%%
%% Copyright (C) 1994 by Jerry Leichter
-%% Copyright (C) 2016-2021 by Pieter van Oostrum <pieter at vanoostrum.org>
+%% Copyright (C) 2016-2024 by Pieter van Oostrum <pieter at vanoostrum.org>
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{multirow}%
- [2021/03/15 v2.8
+ [2024/11/12 v2.9
Span multiple rows of a table]%
\newif\ifmultirowdebug
\DeclareOption{debug}{\multirowdebugtrue}
@@ -78,6 +78,7 @@
{\ifnum0=`}\fi
\ST at save@lineno
\@ifstar{\MRST at xtabularcr}{\ST at xtabularcr}}
+\ifx\ST at rowht\undefined
\def\MRST at cr{%
\noalign{%
\ifnum\ST at pboxht<\ST at lineht
@@ -93,7 +94,24 @@
\global\advance\ST at pageleft -\ST at toadd
\global\ST at toadd=\z@
\ST at trace@cr\thr@@{Space left for tabular: \the\ST at pageleft}}}
+\else
+\def\MRST at cr{%
+ \noalign{%
+ \ifnum\ST at pboxht<\ST at rowht
+ \global\advance\ST at pageleft -\ST at rowht
+ \global\ST at prevht\ST at rowht
+ \else
+ \ST at trace@cr\thr@@{Added par box with height \the\ST at pboxht}%
+ \global\advance\ST at pageleft -\ST at pboxht
+ \global\advance\ST at pageleft -0.1\ST at pboxht
+ \global\ST at prevht\ST at pboxht
+ \global\ST at pboxht\z@
+ \fi
+ \global\advance\ST at pageleft -\ST at toadd
+ \global\ST at toadd=\z@
+ \ST at trace@cr\thr@@{Space left for tabular: \the\ST at pageleft}}}
\fi
+\fi
\def\MRST at xtabularcr{%
\@ifnextchar[%]
{\MRST at argtabularcr}%
More information about the tex-live-commits
mailing list.