texlive[59829] Master/texmf-dist: nicematrix (4jul21)
commits+karl at tug.org
commits+karl at tug.org
Sun Jul 4 22:42:37 CEST 2021
Revision: 59829
http://tug.org/svn/texlive?view=revision&revision=59829
Author: karl
Date: 2021-07-04 22:42:36 +0200 (Sun, 04 Jul 2021)
Log Message:
-----------
nicematrix (4jul21)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/nicematrix/nicematrix-french.pdf
trunk/Master/texmf-dist/doc/latex/nicematrix/nicematrix.pdf
trunk/Master/texmf-dist/source/latex/nicematrix/nicematrix.dtx
trunk/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty
Modified: trunk/Master/texmf-dist/doc/latex/nicematrix/nicematrix-french.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/nicematrix/nicematrix.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/nicematrix/nicematrix.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/nicematrix/nicematrix.dtx 2021-07-04 20:42:21 UTC (rev 59828)
+++ trunk/Master/texmf-dist/source/latex/nicematrix/nicematrix.dtx 2021-07-04 20:42:36 UTC (rev 59829)
@@ -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 @@
%
%
% \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 @@
% \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 at firstamp \@firstampfalse \else \@preamerr 5 \fi }
% \end{macrocode}
%
% \medskip
@@ -9100,10 +9107,12 @@
% \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 @@
% The following lines were in the original definition of |\multicolumn|.
% \begin{macrocode}
\cs_set:Npn \@sharp { #3 }
- \set at 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 at jCol { #1 - 1 }
\int_compare:nNnT \c at jCol > \g_@@_col_total_int
{ \int_gset_eq:NN \g_@@_col_total_int \c at jCol }
@@ -17831,6 +17841,7 @@
%
% It's now possible to use a key |l|, |r| or |c| with the command
% |\pAutoNiceMatrix| (and the similar ones).
+%
%
% \PrintIndex
%
Modified: trunk/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty 2021-07-04 20:42:21 UTC (rev 59828)
+++ trunk/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty 2021-07-04 20:42:36 UTC (rev 59829)
@@ -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,6 +1954,7 @@
{
\multispan { #1 }
\begingroup
+ \cs_set:Npn \@addamp { \if at firstamp \@firstampfalse \else \@preamerr 5 \fi }
\@temptokena = { #2 }
\@tempswatrue
\@whilesw \if at tempswa \fi { \@tempswafalse \the \NC at list }
@@ -1960,6 +1961,8 @@
\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 at typeset@protect
- \cs_set_eq:NN \@startpbox \__nicematrixstartpbox
- \cs_set_eq:NN \@endpbox \__nicematrixendpbox
\@arstrut
\@preamble
- \hbox { }
- \endgroup
+ \null
\int_gadd:Nn \c at jCol { #1 - 1 }
\int_compare:nNnT \c at jCol > \g__nicematrix_col_total_int
{ \int_gset_eq:NN \g__nicematrix_col_total_int \c at jCol }
More information about the tex-live-commits
mailing list.