From 697e5a4c18f18af635994ed46a8b6a4de8e70a24 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 4 Jul 2021 20:42:36 +0000 Subject: nicematrix (4jul21) git-svn-id: svn://tug.org/texlive/trunk@59829 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/nicematrix/nicematrix-french.pdf | Bin 463607 -> 463618 bytes .../texmf-dist/doc/latex/nicematrix/nicematrix.pdf | Bin 1330962 -> 1331253 bytes .../source/latex/nicematrix/nicematrix.dtx | 31 ++++++++++++++------- .../texmf-dist/tex/latex/nicematrix/nicematrix.sty | 13 ++++----- 4 files changed, 27 insertions(+), 17 deletions(-) diff --git a/Master/texmf-dist/doc/latex/nicematrix/nicematrix-french.pdf b/Master/texmf-dist/doc/latex/nicematrix/nicematrix-french.pdf index 30ae5840fa2..e630974f2f1 100644 Binary files a/Master/texmf-dist/doc/latex/nicematrix/nicematrix-french.pdf and b/Master/texmf-dist/doc/latex/nicematrix/nicematrix-french.pdf differ diff --git a/Master/texmf-dist/doc/latex/nicematrix/nicematrix.pdf b/Master/texmf-dist/doc/latex/nicematrix/nicematrix.pdf index 2f690d64099..ca40e46907f 100644 Binary files a/Master/texmf-dist/doc/latex/nicematrix/nicematrix.pdf and b/Master/texmf-dist/doc/latex/nicematrix/nicematrix.pdf differ diff --git a/Master/texmf-dist/source/latex/nicematrix/nicematrix.dtx b/Master/texmf-dist/source/latex/nicematrix/nicematrix.dtx index 5e195b9103f..f9ae880666d 100644 --- a/Master/texmf-dist/source/latex/nicematrix/nicematrix.dtx +++ b/Master/texmf-dist/source/latex/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/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty b/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty index c7c622f016a..81f4976f7a4 100644 --- a/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty +++ b/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty @@ -18,8 +18,8 @@ %% and version 1.3 or later is part of all distributions of %% LaTeX version 2005/12/01 or later. %% -\def\myfileversion{5.17} -\def\myfiledate{2021/07/01} +\def\myfileversion{5.17a} +\def\myfiledate{2021/07/04} \RequirePackage{pgfcore} \usepgfmodule{shapes} \RequirePackage{l3keys2e} @@ -1954,12 +1954,15 @@ { \multispan { #1 } \begingroup + \cs_set:Npn \@addamp { \if@firstamp \@firstampfalse \else \@preamerr 5 \fi } \@temptokena = { #2 } \@tempswatrue \@whilesw \if@tempswa \fi { \@tempswafalse \the \NC@list } \tl_gclear:N \g__nicematrix_preamble_tl \exp_after:wN \__nicematrix_patch_m_preamble:n \the \@temptokena \q_stop \exp_args:NV \@mkpream \g__nicematrix_preamble_tl + \@addtopreamble \@empty + \endgroup \int_compare:nNnT { #1 } > 1 { \seq_gput_left:Nx \g__nicematrix_multicolumn_cells_seq @@ -1974,13 +1977,9 @@ } } \cs_set:Npn \@sharp { #3 } - \set@typeset@protect - \cs_set_eq:NN \@startpbox \__nicematrixstartpbox - \cs_set_eq:NN \@endpbox \__nicematrixendpbox \@arstrut \@preamble - \hbox { } - \endgroup + \null \int_gadd:Nn \c@jCol { #1 - 1 } \int_compare:nNnT \c@jCol > \g__nicematrix_col_total_int { \int_gset_eq:NN \g__nicematrix_col_total_int \c@jCol } -- cgit v1.2.3