From cf27ef058533b80901749c9a66916387de2795b5 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 3 Jan 2021 22:31:28 +0000 Subject: multirow (3jan21) git-svn-id: svn://tug.org/texlive/trunk@57314 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/multirow/bigdelim.sty | 10 +++-- Master/texmf-dist/tex/latex/multirow/bigstrut.sty | 4 +- Master/texmf-dist/tex/latex/multirow/multirow.sty | 54 ++++++++++++++++------- 3 files changed, 46 insertions(+), 22 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/multirow/bigdelim.sty b/Master/texmf-dist/tex/latex/multirow/bigdelim.sty index eabc25fd885..85867929bb8 100644 --- a/Master/texmf-dist/tex/latex/multirow/bigdelim.sty +++ b/Master/texmf-dist/tex/latex/multirow/bigdelim.sty @@ -19,22 +19,24 @@ %% 2005/12/01 or later. %% %% Copyright (C) 1994 by \O ystein Bache -%% Copyright (C) 2016 , 2018, 2019 by Piet van Oostrum +%% Copyright (C) 2016-2021 by Pieter van Oostrum %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{bigdelim} - [2019/05/31 v2.5 + [2021/01/02 v2.6 Create big delimiters in tabular or array] \RequirePackage{multirow} \newcommand\ldelim[3]{\@ifnextchar[{\@ldelim{#1}{#2}{#3}}{\@ldelim{#1}{#2}{#3}[\null]}} \def\@ldelim#1#2#3[#4]% - {\multirow{#2}{#3}{% + {\ifvoid\@arstrutbox\setbox\@arstrutbox\hbox{\strut}\fi + \multirow{#2}{#3}{% \ensuremath {\left.\vcenter{\hsize=0pt\vrule height \multirow@dima width 0pt}% \textnormal{#4}\right#1}}} \newcommand\rdelim[3]{\@ifnextchar[{\@rdelim{#1}{#2}{#3}}{\@rdelim{#1}{#2}{#3}[\null]}} \def\@rdelim#1#2#3[#4]% - {\multirow{#2}{#3}{% + {\ifvoid\@arstrutbox\setbox\@arstrutbox\hbox{\strut}\fi + \multirow{#2}{#3}{% \ensuremath {\left#1\vcenter{\hsize=0pt\vrule height \multirow@dima width 0pt}% \textnormal{#4}\right.}}} diff --git a/Master/texmf-dist/tex/latex/multirow/bigstrut.sty b/Master/texmf-dist/tex/latex/multirow/bigstrut.sty index 843e27dc678..12777175d85 100644 --- a/Master/texmf-dist/tex/latex/multirow/bigstrut.sty +++ b/Master/texmf-dist/tex/latex/multirow/bigstrut.sty @@ -19,11 +19,11 @@ %% 2005/12/01 or later. %% %% Copyright (C) 1994 by Jerry Leichter -%% Copyright (C) 2016 , 2018, 2019 by Piet van Oostrum +%% Copyright (C) 2016-2021 by Pieter van Oostrum %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{bigstrut} - [2019/05/31 v2.5 + [2021/01/02 v2.6 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 02f8db7bcc3..f9a9284e58b 100644 --- a/Master/texmf-dist/tex/latex/multirow/multirow.sty +++ b/Master/texmf-dist/tex/latex/multirow/multirow.sty @@ -19,11 +19,11 @@ %% 2005/12/01 or later. %% %% Copyright (C) 1994 by Jerry Leichter -%% Copyright (C) 2016 , 2018, 2019 by Piet van Oostrum +%% Copyright (C) 2016-2021 by Pieter van Oostrum %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{multirow}% - [2019/05/31 v2.5 + [2021/01/02 v2.6 Span multiple rows of a table]% \newif\ifmultirowdebug \DeclareOption{debug}{\multirowdebugtrue} @@ -55,9 +55,45 @@ }} \DeclareOption{supertabular}{% \AtBeginDocument{% +\ifx\ST@save@lineno\undefined \def\ST@tabularcr{% {\ifnum0=`}\fi \@ifstar{\MRST@xtabularcr}{\ST@xtabularcr}} +\def\MRST@cr{% + \noalign{% + \ifnum\ST@pboxht<\ST@lineht + \global\advance\ST@pageleft -\ST@lineht + \global\ST@prevht\ST@lineht + \else + \global\advance\ST@pageleft -\ST@pboxht + \global\advance\ST@pageleft -0.1\ST@pboxht + \global\advance\ST@pageleft -\ST@stretchht + \global\ST@prevht\ST@pboxht + \global\ST@pboxht\z@ + \fi + \global\advance\ST@pageleft -\ST@toadd + \global\ST@toadd=\z@}} +\else +\def\ST@tabularcr{% + {\ifnum0=`}\fi + \ST@save@lineno + \@ifstar{\MRST@xtabularcr}{\ST@xtabularcr}} +\def\MRST@cr{% + \noalign{% + \ifnum\ST@pboxht<\ST@lineht + \global\advance\ST@pageleft -\ST@lineht + \global\ST@prevht\ST@lineht + \else + \ST@trace@cr\thr@@{Added par box with height \the\ST@pboxht}% + \global\advance\ST@pageleft -\ST@pboxht + \global\advance\ST@pageleft -0.1\ST@pboxht + \global\ST@prevht\ST@pboxht + \global\ST@pboxht\z@ + \fi + \global\advance\ST@pageleft -\ST@toadd + \global\ST@toadd=\z@ + \ST@trace@cr\thr@@{Space left for tabular: \the\ST@pageleft}}} +\fi \def\MRST@xtabularcr{% \@ifnextchar[%] {\MRST@argtabularcr}% @@ -75,20 +111,6 @@ \noalign{\global\ST@toadd=#1}\MRST@cr} \def\MRST@yargarraycr#1{% \cr\noalign{\vskip #1\global\MRST@toadd=#1}\MRST@cr} -\def\MRST@cr{% - \noalign{% - \ifnum\ST@pboxht<\ST@lineht - \global\advance\ST@pageleft -\ST@lineht - \global\ST@prevht\ST@lineht - \else - \global\advance\ST@pageleft -\ST@pboxht - \global\advance\ST@pageleft -0.1\ST@pboxht - \global\advance\ST@pageleft -\ST@stretchht - \global\ST@prevht\ST@pboxht - \global\ST@pboxht\z@ - \fi - \global\advance\ST@pageleft -\ST@toadd - \global\ST@toadd=\z@}} } \def\STneed#1{\ifdim\ST@pageleft<#1\ST@newpage\ST@next\fi} } -- cgit v1.2.3