summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-03-15 22:13:42 +0000
committerKarl Berry <karl@freefriends.org>2021-03-15 22:13:42 +0000
commite266906c4f77f48db69186a254dfdb899aa5d22b (patch)
tree378a965e0a392007990d77086349929691e1024a
parentcd9eec02fc8ec41603ef2ab23b988aa34e5018a9 (diff)
multirow (15mar21) (branch)
git-svn-id: svn://tug.org/texlive/branches/branch2020.0@58403 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/multirow/README6
-rw-r--r--Master/texmf-dist/doc/latex/multirow/multirow.pdfbin596749 -> 599745 bytes
-rw-r--r--Master/texmf-dist/source/latex/multirow/multirow.dtx38
-rw-r--r--Master/texmf-dist/tex/latex/multirow/bigdelim.sty20
-rw-r--r--Master/texmf-dist/tex/latex/multirow/bigstrut.sty2
-rw-r--r--Master/texmf-dist/tex/latex/multirow/multirow.sty2
6 files changed, 43 insertions, 25 deletions
diff --git a/Master/texmf-dist/doc/latex/multirow/README b/Master/texmf-dist/doc/latex/multirow/README
index a1d00a0479e..d6e00c1779a 100644
--- a/Master/texmf-dist/doc/latex/multirow/README
+++ b/Master/texmf-dist/doc/latex/multirow/README
@@ -1,6 +1,6 @@
-multirow.sty v2.7 2021/01/29
-bigstruts.sty v2.7 2021/01/29
-bigdelim.sty v2.7 2021/01/29
+multirow.sty v2.8 2021/03/15
+bigstruts.sty v2.8 2021/03/15
+bigdelim.sty v2.8 2021/03/15
Original Author: Jerry Leichter
Current Author: Pieter van Oostrum <pieter@vanoostrum.org>
diff --git a/Master/texmf-dist/doc/latex/multirow/multirow.pdf b/Master/texmf-dist/doc/latex/multirow/multirow.pdf
index c797cb0a4da..a1075ac37fc 100644
--- a/Master/texmf-dist/doc/latex/multirow/multirow.pdf
+++ b/Master/texmf-dist/doc/latex/multirow/multirow.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/multirow/multirow.dtx b/Master/texmf-dist/source/latex/multirow/multirow.dtx
index 139e0ed25b5..9cd957a2e70 100644
--- a/Master/texmf-dist/source/latex/multirow/multirow.dtx
+++ b/Master/texmf-dist/source/latex/multirow/multirow.dtx
@@ -32,7 +32,7 @@
%<multirow>\ProvidesPackage{multirow}%
%<bigstrut>\ProvidesPackage{bigstrut}
%<bigdelim>\ProvidesPackage{bigdelim}
-%<multirow|bigstrut|bigdelim> [2021/01/29 v2.7
+%<multirow|bigstrut|bigdelim> [2021/03/15 v2.8
%<multirow> Span multiple rows of a table]%
%<bigstrut> Provide larger struts in tabulars]
%<bigdelim> Create big delimiters in tabular or array]
@@ -130,6 +130,12 @@
% \section{Changes in version 2}
% \label{sec:changes-2}
%
+%\subsection*{version 2.8}
+%
+%\begin{itemize}
+%\item Optional argument \meta{vmove} for \cs{ldelim} and \cs{rdelim}.
+%\end{itemize}
+%
%\subsection*{version 2.7}
%
%\begin{itemize}
@@ -1219,8 +1225,8 @@
% \DescribeMacro{\rdelim}
% Syntax of use is
% \begin{quote}
-% \cs{ldelim} ( \marg{n}\marg{width}\oarg{text}\\
-% \cs{rdelim} ) \marg{n}\marg{width}\oarg{text}
+% \cs{ldelim} ( \marg{n}\oarg{vmove}\marg{width}\oarg{text}\\
+% \cs{rdelim} ) \marg{n}\oarg{vmove}\marg{width}\oarg{text}
% \end{quote}
% The commands are used in a column of a \env{tabular} or
% \env{array}; they create a big parenthesis, brace or whatever
@@ -1259,6 +1265,12 @@
% \end{equation}
% \end{quote}
%
+% The optional parameter \meta{vmove} is a length used for fine-tuning: the
+% delimiter (with the optional \meta{text}) will be raised (or lowered, if
+% \meta{vmove} is negative) by that length above (below) wherever it would
+% otherwise have gone. This is just like with \cs{multirow}, but note that
+% here the \meta{vmove} goes before the \meta{width}.
+%
% When \cs{ldelim} is used, the optional \meta{text} is set centred to the left of \cs{ldelim}.
% If \cs{rdelim} is used it is set to the right of \cs{rdelim}. The
% \meta{width} parameter is the space that is reserved for
@@ -1919,14 +1931,16 @@
% to a default value.
% \changes{bigdelim v2.3}{2018/08/03}{Replace \cs{textrm} by \cs{textnormal}}
% \changes{bigdelim v2.6}{2020/12/26}{Initialize \cs{@arstrutbox} if not defined}
+% \changes{bigdelim v2.8}{2021/03/15}{Add optional argument \meta{vmove}}
% \begin{macrocode}
-\newcommand\ldelim[3]{\@ifnextchar[{\@ldelim{#1}{#2}{#3}}{\@ldelim{#1}{#2}{#3}[\null]}}
-\def\@ldelim#1#2#3[#4]%
+\newcommand\ldelim[2]{\@ifnextchar[{\@ldelim{#1}{#2}}{\@ldelim{#1}{#2}[0pt]}}
+\def\@ldelim#1#2[#3]#4{\@ifnextchar[{\@@ldelim{#1}{#2}{#3}{#4}}{\@@ldelim{#1}{#2}{#3}{#4}[\null]}}
+\def\@@ldelim#1#2#3#4[#5]%
{\ifvoid\@arstrutbox\setbox\@arstrutbox\hbox{\strut}\fi
- \multirow{#2}{#3}{%
+ \multirow{#2}{#4}[#3]{%
\ensuremath
{\left.\vcenter{\hsize=0pt\vrule height \multirow@dima width 0pt}%
- \textnormal{#4}\right#1}}}
+ \textnormal{#5}\right#1}}}
% \end{macrocode}
% \end{macro}
%
@@ -1935,14 +1949,16 @@
% proper arguments, similar to \cs{ldelim}.
% \changes{bigdelim v2.3}{2018/08/03}{Replace \cs{textrm} by \cs{textnormal}}
% \changes{bigdelim v2.6}{2020/12/26}{Initialize \cs{@arstrutbox} if not defined}
+% \changes{bigdelim v2.8}{2021/03/15}{Add optional argument \meta{vmove}}
% \begin{macrocode}
-\newcommand\rdelim[3]{\@ifnextchar[{\@rdelim{#1}{#2}{#3}}{\@rdelim{#1}{#2}{#3}[\null]}}
-\def\@rdelim#1#2#3[#4]%
+\newcommand\rdelim[2]{\@ifnextchar[{\@rdelim{#1}{#2}}{\@rdelim{#1}{#2}[0pt]}}
+\def\@rdelim#1#2[#3]#4{\@ifnextchar[{\@@rdelim{#1}{#2}{#3}{#4}}{\@@rdelim{#1}{#2}{#3}{#4}[\null]}}
+\def\@@rdelim#1#2#3#4[#5]%
{\ifvoid\@arstrutbox\setbox\@arstrutbox\hbox{\strut}\fi
- \multirow{#2}{#3}{%
+ \multirow{#2}{#4}[#3]{%
\ensuremath
{\left#1\vcenter{\hsize=0pt\vrule height \multirow@dima width 0pt}%
- \textnormal{#4}\right.}}}
+ \textnormal{#5}\right.}}}
% \end{macrocode}
% \end{macro}
% \iffalse
diff --git a/Master/texmf-dist/tex/latex/multirow/bigdelim.sty b/Master/texmf-dist/tex/latex/multirow/bigdelim.sty
index 917dd7974c7..12200f5e334 100644
--- a/Master/texmf-dist/tex/latex/multirow/bigdelim.sty
+++ b/Master/texmf-dist/tex/latex/multirow/bigdelim.sty
@@ -23,23 +23,25 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{bigdelim}
- [2021/01/29 v2.7
+ [2021/03/15 v2.8
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]%
+\newcommand\ldelim[2]{\@ifnextchar[{\@ldelim{#1}{#2}}{\@ldelim{#1}{#2}[0pt]}}
+\def\@ldelim#1#2[#3]#4{\@ifnextchar[{\@@ldelim{#1}{#2}{#3}{#4}}{\@@ldelim{#1}{#2}{#3}{#4}[\null]}}
+\def\@@ldelim#1#2#3#4[#5]%
{\ifvoid\@arstrutbox\setbox\@arstrutbox\hbox{\strut}\fi
- \multirow{#2}{#3}{%
+ \multirow{#2}{#4}[#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]%
+ \textnormal{#5}\right#1}}}
+\newcommand\rdelim[2]{\@ifnextchar[{\@rdelim{#1}{#2}}{\@rdelim{#1}{#2}[0pt]}}
+\def\@rdelim#1#2[#3]#4{\@ifnextchar[{\@@rdelim{#1}{#2}{#3}{#4}}{\@@rdelim{#1}{#2}{#3}{#4}[\null]}}
+\def\@@rdelim#1#2#3#4[#5]%
{\ifvoid\@arstrutbox\setbox\@arstrutbox\hbox{\strut}\fi
- \multirow{#2}{#3}{%
+ \multirow{#2}{#4}[#3]{%
\ensuremath
{\left#1\vcenter{\hsize=0pt\vrule height \multirow@dima width 0pt}%
- \textnormal{#4}\right.}}}
+ \textnormal{#5}\right.}}}
\endinput
%%
%% End of file `bigdelim.sty'.
diff --git a/Master/texmf-dist/tex/latex/multirow/bigstrut.sty b/Master/texmf-dist/tex/latex/multirow/bigstrut.sty
index eec36558697..d419e14ff56 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}
- [2021/01/29 v2.7
+ [2021/03/15 v2.8
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 7cabdc3d2a5..423d9e80def 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}%
- [2021/01/29 v2.7
+ [2021/03/15 v2.8
Span multiple rows of a table]%
\newif\ifmultirowdebug
\DeclareOption{debug}{\multirowdebugtrue}