From 500adb5fa10a924ea571a0d9d7754ed17dab5dbf Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 5 Jul 2021 03:00:50 +0000 Subject: CTAN sync 202107050300 --- .../latex/contrib/nicematrix/nicematrix-french.pdf | Bin 463607 -> 463618 bytes macros/latex/contrib/nicematrix/nicematrix.dtx | 31 ++++++++++++++------- macros/latex/contrib/nicematrix/nicematrix.pdf | Bin 1330962 -> 1331253 bytes 3 files changed, 21 insertions(+), 10 deletions(-) (limited to 'macros/latex/contrib/nicematrix') diff --git a/macros/latex/contrib/nicematrix/nicematrix-french.pdf b/macros/latex/contrib/nicematrix/nicematrix-french.pdf index 30ae5840fa..e630974f2f 100644 Binary files a/macros/latex/contrib/nicematrix/nicematrix-french.pdf and b/macros/latex/contrib/nicematrix/nicematrix-french.pdf differ diff --git a/macros/latex/contrib/nicematrix/nicematrix.dtx b/macros/latex/contrib/nicematrix/nicematrix.dtx index 5e195b9103..f9ae880666 100644 --- a/macros/latex/contrib/nicematrix/nicematrix.dtx +++ b/macros/latex/contrib/nicematrix/nicematrix.dtx @@ -15,8 +15,8 @@ % % \fi % \iffalse -\def\myfileversion{5.17} -\def\myfiledate{2021/07/01} +\def\myfileversion{5.17a} +\def\myfiledate{2021/07/04} % % %<*batchfile> @@ -9071,7 +9071,7 @@ version 2005/12/01 or later. % % % \bigskip -% \subsection{The redefinition of \textbackslash multicolumn} +% \subsection*{The redefinition of \textbackslash multicolumn} % % \medskip % The following command must \emph{not} be protected since it begins with @@ -9079,8 +9079,15 @@ version 2005/12/01 or later. % \begin{macrocode} \cs_new:Npn \@@_multicolumn:nnn #1 #2 #3 { +% \end{macrocode} +% The following lines are from the definition of |\multicolumn| in \pkg{array} +% (and \emph{not} in standard LaTeX). The first line aims to raise an error if +% the user has put more that one column specifier in the preamble of +% |\multicolumn|. +% \begin{macrocode} \multispan { #1 } \begingroup + \cs_set:Npn \@addamp { \if@firstamp \@firstampfalse \else \@preamerr 5 \fi } % \end{macrocode} % % \medskip @@ -9100,10 +9107,12 @@ version 2005/12/01 or later. % \end{macrocode} % % \medskip -% The following line creates the preamble. This line is a adaptation of a line -% of the initial definition of |\multicolumn|. +% The following lines are an adaptation of the definition of |\multicolumn| in +% \pkg{array}. % \begin{macrocode} \exp_args:NV \@mkpream \g_@@_preamble_tl + \@addtopreamble \@empty + \endgroup % \end{macrocode} % % \medskip @@ -9129,13 +9138,14 @@ version 2005/12/01 or later. % The following lines were in the original definition of |\multicolumn|. % \begin{macrocode} \cs_set:Npn \@sharp { #3 } - \set@typeset@protect - \cs_set_eq:NN \@startpbox \@@startpbox - \cs_set_eq:NN \@endpbox \@@endpbox \@arstrut \@preamble - \hbox { } - \endgroup + \null +% \end{macrocode} +% +% \medskip +% We add some lines. +% \begin{macrocode} \int_gadd:Nn \c@jCol { #1 - 1 } \int_compare:nNnT \c@jCol > \g_@@_col_total_int { \int_gset_eq:NN \g_@@_col_total_int \c@jCol } @@ -17831,6 +17841,7 @@ version 2005/12/01 or later. % % It's now possible to use a key |l|, |r| or |c| with the command % |\pAutoNiceMatrix| (and the similar ones). +% % % \PrintIndex % diff --git a/macros/latex/contrib/nicematrix/nicematrix.pdf b/macros/latex/contrib/nicematrix/nicematrix.pdf index 2f690d6409..ca40e46907 100644 Binary files a/macros/latex/contrib/nicematrix/nicematrix.pdf and b/macros/latex/contrib/nicematrix/nicematrix.pdf differ -- cgit v1.2.3