summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/multirow
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-01-01 22:50:59 +0000
committerKarl Berry <karl@freefriends.org>2019-01-01 22:50:59 +0000
commitd26dc81b1551a9fb8d750dda224e334eb6dd4e0b (patch)
tree82245aaa334aa0e0087a8933f53c35ccfed70d23 /Master/texmf-dist/tex/latex/multirow
parent98890e60b2f71ab52763c5ddeb6b68160de110c2 (diff)
multirow (1jan19)
git-svn-id: svn://tug.org/texlive/trunk@49572 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/multirow')
-rw-r--r--Master/texmf-dist/tex/latex/multirow/bigdelim.sty4
-rw-r--r--Master/texmf-dist/tex/latex/multirow/bigstrut.sty6
-rw-r--r--Master/texmf-dist/tex/latex/multirow/multirow.sty38
3 files changed, 24 insertions, 24 deletions
diff --git a/Master/texmf-dist/tex/latex/multirow/bigdelim.sty b/Master/texmf-dist/tex/latex/multirow/bigdelim.sty
index 766b5556e95..339052154ed 100644
--- a/Master/texmf-dist/tex/latex/multirow/bigdelim.sty
+++ b/Master/texmf-dist/tex/latex/multirow/bigdelim.sty
@@ -19,11 +19,11 @@
%% 2005/12/01 or later.
%%
%% Copyright (C) 1994 by \O ystein Bache
-%% Copyright (C) 2016 , 2018 by Piet van Oostrum <piet@vanoostrum.org>
+%% Copyright (C) 2016 , 2018, 2019 by Piet van Oostrum <piet@vanoostrum.org>
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{bigdelim}
- [2018/08/03 v2.3
+ [2019/01/01 v2.4
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 b9ce9834b29..eaa934c36d1 100644
--- a/Master/texmf-dist/tex/latex/multirow/bigstrut.sty
+++ b/Master/texmf-dist/tex/latex/multirow/bigstrut.sty
@@ -19,15 +19,15 @@
%% 2005/12/01 or later.
%%
%% Copyright (C) 1994 by Jerry Leichter
-%% Copyright (C) 2016 , 2018 by Piet van Oostrum <piet@vanoostrum.org>
+%% Copyright (C) 2016 , 2018, 2019 by Piet van Oostrum <piet@vanoostrum.org>
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{bigstrut}
- [2018/08/03 v2.3
+ [2019/01/01 v2.4
Provide larger struts in tabulars]
\@ifundefined{bigstrutjot}{\newdimen\bigstrutjot}{}\bigstrutjot=2pt
\newcommand\bigstrut[1][x]{%
- \unskip\@tempdima=\ht\@arstrutbox \@tempdimb=\dp\@arstrutbox
+ \leavevmode\unskip\@tempdima=\ht\@arstrutbox \@tempdimb=\dp\@arstrutbox
\ifx #1b\relax \else \advance\@tempdima by \bigstrutjot\fi
\ifx #1t\relax \else \advance\@tempdimb by \bigstrutjot\fi
\hbox{\vrule \@height\@tempdima \@depth\@tempdimb \@width\z@}\ignorespaces}
diff --git a/Master/texmf-dist/tex/latex/multirow/multirow.sty b/Master/texmf-dist/tex/latex/multirow/multirow.sty
index b5798315f58..88c8ce3daab 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 by Piet van Oostrum <piet@vanoostrum.org>
+%% Copyright (C) 2016 , 2018, 2019 by Piet van Oostrum <piet@vanoostrum.org>
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{multirow}%
- [2018/08/03 v2.3
+ [2019/01/01 v2.4
Span multiple rows of a table]%
\newif\ifmultirowdebug
\DeclareOption{debug}{\multirowdebugtrue}
@@ -115,34 +115,34 @@
\fi}
\def\@xmultirow[#1]#2[#3]#4[#5]#6{%
\expandafter\multirow@piii#3\relax\end%
- \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
+ \setlength\multirow@dima{#2\ht\@arstrutbox}%
+ \addtolength\multirow@dima{#2\dp\@arstrutbox}%
+ \ifdim#2pt<\z@\setlength\multirow@dima{-\multirow@dima}\fi
+ \addtolength\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}%
+ \multirow@vbox{#1}{\setlength\hsize{\multirow@colwidth}\@parboxrestore}{\strut#6\strut\par}%
+ \else \multirow@vbox{#1}{\setlength\hsize{#4}\@parboxrestore}{\strut#6\strut\par}%
\fi \fi
\ifdim#2pt>\z@
- \if#1t\relax\multirow@dima=\ht0\else
- \multirow@dima=\ht\@arstrutbox
- \ifmultirow@prefixt \advance\multirow@dima\bigstrutjot\fi
- \if#1b\relax \advance\multirow@dima\dp\@arstrutbox
- \ifmultirow@prefixb \advance\multirow@dima\bigstrutjot\fi
+ \if#1t\relax\setlength\multirow@dima{\ht0}\else
+ \setlength\multirow@dima{\ht\@arstrutbox}%
+ \ifmultirow@prefixt \addtolength\multirow@dima{\bigstrutjot}\fi
+ \if#1b\relax \addtolength\multirow@dima{\dp\@arstrutbox}%
+ \ifmultirow@prefixb \addtolength\multirow@dima{\bigstrutjot}\fi
\fi
\fi
\else
\if#1b\relax\else
- \advance\multirow@dima-\dp\@arstrutbox
- \ifmultirow@prefixb \advance\multirow@dima-\bigstrutjot\fi
- \if#1t\relax\advance\multirow@dima-\ht\@arstrutbox
- \ifmultirow@prefixt \advance\multirow@dima-\bigstrutjot\fi
- \advance\multirow@dima\ht0
+ \addtolength\multirow@dima{-\dp\@arstrutbox}%
+ \ifmultirow@prefixb \addtolength\multirow@dima{-\bigstrutjot}\fi
+ \if#1t\relax\addtolength\multirow@dima{-\ht\@arstrutbox}%
+ \ifmultirow@prefixt \addtolength\multirow@dima{-\bigstrutjot}\fi
+ \addtolength\multirow@dima{\ht0}%
\fi
\fi
\fi
- \advance\multirow@dima#5\relax
+ \addtolength\multirow@dima{#5}%
\leavevmode
\setbox0\vtop{\vskip-\multirow@dima\box0\vss}\dp0=\z@
\ifmultirowdebug{\showboxdepth=5 \showboxbreadth=10 \showbox0}\fi