From aa6bd000fec765bbef2ae479183d3949fa2d2a5b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 15 Oct 2016 22:58:47 +0000 Subject: multirow (11oct16) git-svn-id: svn://tug.org/texlive/trunk@42279 c570f23f-e606-0410-a88d-b1316a301751 --- 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 | 11 +++++------ 3 files changed, 7 insertions(+), 8 deletions(-) (limited to 'Master/texmf-dist/tex/latex/multirow') diff --git a/Master/texmf-dist/tex/latex/multirow/bigdelim.sty b/Master/texmf-dist/tex/latex/multirow/bigdelim.sty index 52ad8f2fb09..bb47c93d48b 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} - [2016/09/27 v2.0 + [2016/10/11 v2.1 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 379c581190a..f18debf971a 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} - [2016/09/27 v2.0 + [2016/10/11 v2.1 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 91e4575b14d..33853c8e365 100644 --- a/Master/texmf-dist/tex/latex/multirow/multirow.sty +++ b/Master/texmf-dist/tex/latex/multirow/multirow.sty @@ -23,7 +23,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{multirow}% - [2016/09/27 v2.0 + [2016/10/11 v2.1 Span multiple rows of a table]% \newif\ifmultirowdebug \DeclareOption{debug}{\multirowdebugtrue} @@ -97,7 +97,7 @@ \long\def\multirow@vbox#1#2#3{\setbox0\vtop to \multirow@dima{#2% \if #1t\relax\else\vfill\fi \multirowsetup #3\if #1b\relax\else\vfill\fi}} -%% \multirow [vpos] {nrows} [bigstruts] {width} [fixup] {text} +%% \multirow [vpos] {nrows} [bigstruts] {width} [vmove] {text} \newcommand\multirow[2][c]{\@multirow[#1]{#2}} \def\@multirow[#1]#2{\@ifnextchar[{\@@multirow[#1]#2}{\@@multirow[#1]#2[0]}} \def\@@multirow[#1]#2[#3]#4{\@ifnextchar[{\@xmultirow[#1]{#2}[#3]{#4}}% @@ -125,7 +125,6 @@ \multirow@vbox{#1}{\hsize\multirow@colwidth\@parboxrestore}{\strut#6\strut\par}% \else \multirow@vbox{#1}{\hsize#4\@parboxrestore}{\strut#6\strut\par}% \fi \fi - \dp0=\z@ \ifnum\multirow@cnta>0 \if#1t\relax\multirow@dima=\ht0\else \multirow@dima=\ht\@arstrutbox @@ -146,9 +145,9 @@ \fi \advance\multirow@dima#5\relax \leavevmode - \ifmultirowdebug\setbox0\vtop{\vskip-\multirow@dima\box0\vss}% - {\showboxdepth=5 \showboxbreadth=10 \showbox0}\box0 - \else\vtop{\vskip-\multirow@dima\box0\vss}\fi + \setbox0\vtop{\vskip-\multirow@dima\box0\vss}\dp0=\z@ + \ifmultirowdebug{\showboxdepth=5 \showboxbreadth=10 \showbox0}\fi + \box0 } \@ifundefined{bigstrutjot}{\newdimen\bigstrutjot \bigstrutjot=\jot}{} \endinput -- cgit v1.2.3