From f1f093e6f46e846382bc73efff615dd856604044 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 26 Nov 2016 22:45:23 +0000 Subject: multirow (26nov16) git-svn-id: svn://tug.org/texlive/trunk@42588 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 | 15 +++++++-------- 3 files changed, 9 insertions(+), 10 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 bb47c93d48b..499186a007b 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/10/11 v2.1 + [2016/11/25 v2.2 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 f18debf971a..edcad6222bf 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/10/11 v2.1 + [2016/11/25 v2.2 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 33853c8e365..2a67c0fda89 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/10/11 v2.1 + [2016/11/25 v2.2 Span multiple rows of a table]% \newif\ifmultirowdebug \DeclareOption{debug}{\multirowdebugtrue} @@ -82,11 +82,10 @@ } \ProcessOptions \newlength{\multirow@colwidth} -\newcount\multirow@cnta \newcount\multirow@cntb \newlength\multirow@dima \def\multirow@setcolwidth#1{% - \ifx\TY@final\@undefined \multirow@colwidth=\hsize + \ifx\TY@final\multirow@undefined \multirow@colwidth=\hsize \else \ifx\TY@box\TY@box@v\multirow@colwidth=\hsize \else \setbox0\hbox @@ -114,18 +113,18 @@ \else \multirow@cntb=#1#2#3% \fi \fi} -\def\@xmultirow[#1]#2[#3]#4[#5]#6{\multirow@cnta=#2% +\def\@xmultirow[#1]#2[#3]#4[#5]#6{% \expandafter\multirow@piii#3\relax\end% - \multirow@dima=\multirow@cnta\ht\@arstrutbox - \advance\multirow@dima\multirow@cnta\dp\@arstrutbox - \ifnum\multirow@cnta<0\multirow@dima=-\multirow@dima\fi + \multirow@dima=#2\ht\@arstrutbox + \advance\multirow@dima#2\dp\@arstrutbox + \ifdim#2pt<\z@\multirow@dima=-\multirow@dima\fi \advance\multirow@dima \multirow@cntb\bigstrutjot \if*#4\multirow@vbox{#1}{}{\hbox{\strut#6\strut}}% \else \if=#4\multirow@setcolwidth{#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 - \ifnum\multirow@cnta>0 + \ifdim#2pt>\z@ \if#1t\relax\multirow@dima=\ht0\else \multirow@dima=\ht\@arstrutbox \ifmultirow@prefixt \advance\multirow@dima\bigstrutjot\fi -- cgit v1.2.3