diff options
author | Karl Berry <karl@freefriends.org> | 2021-01-03 22:31:28 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-01-03 22:31:28 +0000 |
commit | cf27ef058533b80901749c9a66916387de2795b5 (patch) | |
tree | db17bfa5964d82ad496b375d54686bdec75b0d4f /Master/texmf-dist/tex/latex/multirow/multirow.sty | |
parent | 84aa58500b092a3cdfe24c869194e2de892da943 (diff) |
multirow (3jan21)
git-svn-id: svn://tug.org/texlive/trunk@57314 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/multirow/multirow.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/multirow/multirow.sty | 54 |
1 files changed, 38 insertions, 16 deletions
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 <piet@vanoostrum.org> +%% Copyright (C) 2016-2021 by Pieter van Oostrum <pieter@vanoostrum.org> %% \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} } |