texlive[53721] Master/texmf-dist: nicematrix (8feb20)
commits+karl at tug.org
commits+karl at tug.org
Sat Feb 8 23:18:20 CET 2020
Revision: 53721
http://tug.org/svn/texlive?view=revision&revision=53721
Author: karl
Date: 2020-02-08 23:18:19 +0100 (Sat, 08 Feb 2020)
Log Message:
-----------
nicematrix (8feb20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/nicematrix/nicematrix-french.pdf
trunk/Master/texmf-dist/doc/latex/nicematrix/nicematrix-french.tex
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-french.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/nicematrix/nicematrix-french.tex 2020-02-08 22:18:03 UTC (rev 53720)
+++ trunk/Master/texmf-dist/doc/latex/nicematrix/nicematrix-french.tex 2020-02-08 22:18:19 UTC (rev 53721)
@@ -514,7 +514,7 @@
manière transparente dans les environnements de l'\pkg{amsmath} : |{matrix}|, |{pmatrix}|, etc. En fait, cette
option est un alias pour la conjonction de deux options : |renew-dots| et |renew-matrix|.\footnote{Comme toutes les
autres options, les options |renew-dots|, |renew-matrix| et |transparent| peuvent être fixées avec la commande
- |\NiceMatrixOptions|, mais elles peuvent aussi être passées en options du |\usepackage| (ce sont les trois
+ |\NiceMatrixOptions|, mais elles peuvent aussi être passées en option du |\usepackage| (ce sont les trois
seules).}
\smallskip
@@ -1215,7 +1215,9 @@
La commande |\Block| doit être utilisée dans la case supérieure gauche du bloc avec deux arguments. Le premier
argument est la taille de ce bloc avec la syntaxe $i$-$j$ où $i$ est le nombre de rangées et $j$ le nombre de
-colonnes du bloc. Le deuxième argument, est, sans surprise, le contenu du bloc (en mode mathématique).
+colonnes du bloc. Le deuxième argument, est, sans surprise, le contenu du bloc (en mode mathématique). Un nœud Tikz
+correspondant à l'ensemble des cellules fusionnées est créé sous le nom «\textsl{nom}-$i$-$j$» où \textsl{nom} est
+le nom donné au tableau.
\medskip
\begin{BVerbatim}[baseline=c,boxwidth=10.6cm]
@@ -1379,7 +1381,7 @@
Dans les environnements de \pkg{nicematrix}, on peut bien entendu ajouter des filets horizontaux entre les lignes
avec la commande~|\hline|. Par souci de commodité, l'extension \pkg{nicematrix} fournit l'option |hlines| qui impose
-directement que tous les filets horizontaux soient tracés (à l'exception, très naturelle, du filet avanet
+directement que tous les filets horizontaux soient tracés (à l'exception, très naturelle, du filet avant
l'éventuelle «première rangée» et après l'éventuelle «dernière rangée»).
\medskip
@@ -1668,7 +1670,7 @@
remove it [in |{matrix}|] (perhaps we should instead remove it from array in general, but that's a harder
task).} Il est possible de supprimer les espaces pour un environnement |{array}| donné par une construction du
type |\begin{array}{@{}ccccc@{}}...\end{array}|.}. L'environnement |{matrix}| et ses variantes (|{pmatrix}|,
-|{vmatrix}|, etc.) de \pkg{amsmath} prefèrent supprimer ces espaces avec des instructions explicites
+|{vmatrix}|, etc.) de \pkg{amsmath} préfèrent supprimer ces espaces avec des instructions explicites
|\hskip -\arraycolsep|. L'extension \pkg{nicematrix} fait de même dans \emph{tous} ses environnements y compris
l'environnement |{NiceArray}|. Néanmoins, si l'utilisateur souhaite que l'environnement |{NiceArray}| se comporte
par défaut comme l'environnement |{array}| de \pkg{array} (par exemple pour faciliter l'adaptation d'un document
@@ -2157,6 +2159,35 @@
\end{scope}
\vspace{1cm}
+On rappelle que dans le cas d'un ensemble de cellules fusionnées (avec la commande |\Block|), un nœud Tikz est créé
+pour l'ensemble des cellules avec pour nom $i$|-|$j$ où $i$ et $j$ sont les numéros de ligne et de colonne de
+la cellule en haut à gauche (où a été utilisée la commande |\Block|).
+
+\medskip
+\begin{BVerbatim}[baseline=c,boxwidth=11.6cm]
+$\begin{pNiceMatrix}%
+ [margin,
+ code-after = { \tikz \node [~emphase#highlight = (1-1)@] {} ; } ]
+\Block{3-3}<\Large>{A} & & & 0 \\
+& \hspace*{1cm} & & \Vdots \\
+& & & 0 \\
+0 & \Cdots& 0 & 0
+\end{pNiceMatrix}$
+\end{BVerbatim}
+$\begin{pNiceMatrix}%
+ [margin,
+ code-after = { \tikz \node [highlight = (1-1)] {} ; } ]
+\Block{3-3}<\Large>{A} & & & 0 \\
+& \hspace*{1cm} & & \Vdots \\
+& & & 0 \\
+0 & \Cdots& 0 & 0
+\end{pNiceMatrix}$
+
+
+
+
+
+\vspace{1cm}
On considère maintenant la matrice suivante que l'on a appelée |exemple|.
\medskip
@@ -2331,7 +2362,7 @@
La matrice $A$ a une «première colonne» (pour $L_i$) d'où l'option |first-col|.
\begin{Verbatim}
\begin{bNiceArray}{CC>{\strut}CCC}[name=A,first-col]
- & a_{11} & \Cdots & & & a_{nn} \\
+ & a_{11} & \Cdots & & & a_{1n} \\
& \Vdots & & & & \Vdots \\
L_i & a_{i1} & \Cdots & a_{ik} & \Cdots & a_{in} \\
& \Vdots & & & & \Vdots \\
@@ -2376,7 +2407,7 @@
b_{n1} & \Cdots & b_{nj} & \Cdots & b_{nn}
\end{bNiceArray} \\ \\
\begin{bNiceArray}{CC>{\strut}CCC}[name=A,first-col]
- & a_{11} & \Cdots & & & a_{nn} \\
+ & a_{11} & \Cdots & & & a_{1n} \\
& \Vdots & & & & \Vdots \\
L_i & a_{i1} & \Cdots & a_{ik} & \Cdots & a_{in} \\
& \Vdots & & & & \Vdots \\
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 2020-02-08 22:18:03 UTC (rev 53720)
+++ trunk/Master/texmf-dist/source/latex/nicematrix/nicematrix.dtx 2020-02-08 22:18:19 UTC (rev 53721)
@@ -15,8 +15,8 @@
%
% \fi
% \iffalse
-\def\myfileversion{3.10}
-\def\myfiledate{2020/01/22}
+\def\myfileversion{3.11}
+\def\myfiledate{2020/02/07}
%
%
%<*batchfile>
@@ -1267,10 +1267,10 @@
% two arguments. The first argument is the size of the block with the syntax
% $i$\verb|-|$j$ where $i$ is the number of rows of the block and $j$ its number
% of columns. The second argument is the content of the block (composed in math
-% mode).
+% mode). A Tikz node corresponding to the merged cells is created with the name
+% ``\textsl{name}-$i$-$j$'' where \textsl{name} is the name given to the array.
%
%
-%
% \medskip
% \begin{BVerbatim}[baseline=c,boxwidth=10.6cm]
% \arrayrulecolor{cyan}
@@ -2248,6 +2248,31 @@
%
% |\ExplSyntaxOff|
% \end{scope}
+%
+% \vspace{1cm}
+% We recall that, for a rectangle of merged cells (with the command |\Block|), a
+% Tikz node is created for the set of merged cells with the name $i$|-|$j$ where
+% $i$ and $j$ are the number of the row and the number of the column of the
+% upper left cell (where the command |\Block| has been issued).
+%
+% \medskip
+% \begin{BVerbatim}[baseline=c,boxwidth=11.6cm]
+% $\begin{pNiceMatrix}%
+% [margin,
+% code-after = { \tikz \node [~emphase#highlight = (1-1)@] {} ; } ]
+% \Block{3-3}<\Large>{A} & & & 0 \\
+% & \hspace*{1cm} & & \Vdots \\
+% & & & 0 \\
+% 0 & \Cdots& 0 & 0
+% \end{pNiceMatrix}$
+% \end{BVerbatim}
+% $\begin{pNiceMatrix}[margin,
+% code-after = { \tikz \node [highlight = (1-1)] {} ; } ]
+% \Block{3-3}<\Large>{A} & & & 0 \\
+% & \hspace*{1cm} & & \Vdots \\
+% & & & 0 \\
+% 0 & \Cdots& 0 & 0
+% \end{pNiceMatrix}$
%
% \vspace{1cm}
% Considerer now the following matrix which we have named |example|.
@@ -2432,7 +2457,7 @@
% key |first-col|.
% \begin{Verbatim}
% \begin{bNiceArray}{CC>{\strut}CCC}[name=A,first-col]
-% & a_{11} & \Cdots & & & a_{nn} \\
+% & a_{11} & \Cdots & & & a_{1n} \\
% & \Vdots & & & & \Vdots \\
% L_i & a_{i1} & \Cdots & a_{ik} & \Cdots & a_{in} \\
% & \Vdots & & & & \Vdots \\
@@ -2477,7 +2502,7 @@
% b_{n1} & \Cdots & b_{nj} & \Cdots & b_{nn}
% \end{bNiceArray} \\ \\
% \begin{bNiceArray}{CC>{\strut}CCC}[name=A,first-col]
-% & a_{11} & \Cdots & & & a_{nn} \\
+% & a_{11} & \Cdots & & & a_{1n} \\
% & \Vdots & & & & \Vdots \\
% L_i & a_{i1} & \Cdots & a_{ik} & \Cdots & a_{in} \\
% & \Vdots & & & & \Vdots \\
@@ -2548,7 +2573,7 @@
{nicematrix}
{\myfiledate}
{\myfileversion}
- {Several features to improve the typesetting of mathematical matrices with TikZ}
+ {Mathematical matrices with TikZ}
% \end{macrocode}
%
% \bigskip
@@ -3429,8 +3454,8 @@
% |\l_@@_code_for_first_row_tl| and \emph{al} don't apply in the corners of the
% matrix.
% \begin{macrocode}
- \int_compare:nNnTF \c at iRow = \c_zero_int
- { \int_compare:nNnT \c at jCol > \c_zero_int \l_@@_code_for_first_row_tl }
+ \int_compare:nNnTF \c at iRow = 0
+ { \int_compare:nNnT \c at jCol > 0 \l_@@_code_for_first_row_tl }
{
\int_compare:nNnT \c at iRow = \l_@@_last_row_int
\l_@@_code_for_last_row_tl
@@ -3447,8 +3472,8 @@
{
\int_gincr:N \c at iRow
\dim_gset_eq:NN \g_@@_dp_ante_last_row_dim \g_@@_dp_last_row_dim
- \dim_gzero:N \g_@@_dp_last_row_dim
- \dim_gzero:N \g_@@_ht_last_row_dim
+ \dim_gset:Nn \g_@@_dp_last_row_dim { \box_dp:N \@arstrutbox }
+ \dim_gset:Nn \g_@@_ht_last_row_dim { \box_ht:N \@arstrutbox }
}
% \end{macrocode}
%
@@ -3460,7 +3485,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_actualization_for_first_and_last_row:
{
- \int_compare:nNnT \c at iRow = \c_zero_int
+ \int_compare:nNnT \c at iRow = 0
{
\dim_gset:Nn \g_@@_dp_row_zero_dim
{ \dim_max:nn \g_@@_dp_row_zero_dim { \box_dp:N \l_tmpa_box } }
@@ -3549,11 +3574,11 @@
{
> {
\hbox_set:Nw \l_tmpa_box
- \_@@_Cell:
+ \@@_Cell:
}
c
< {
- \_@@_end_Cell:
+ \@@_end_Cell:
\hbox_set_end:
#2
\tikz [ remember~picture ]
@@ -3774,7 +3799,6 @@
\dim_gzero_new:N \g_@@_ht_row_one_dim
\dim_gset:Nn \g_@@_ht_row_one_dim { \box_ht:N \@arstrutbox }
\dim_gzero_new:N \g_@@_dp_ante_last_row_dim
- \dim_gset:Nn \g_@@_dp_ante_last_row_dim { \box_dp:N \@arstrutbox }
\dim_gzero_new:N \g_@@_ht_last_row_dim
\dim_gset:Nn \g_@@_ht_last_row_dim { \box_ht:N \@arstrutbox }
\dim_gzero_new:N \g_@@_dp_last_row_dim
@@ -4095,7 +4119,7 @@
% We construct the preamble of the array in |\l_tmpa_tl|.
% \begin{macrocode}
\tl_set:Nn \l_tmpa_tl { #4 }
- \int_compare:nNnTF \l_@@_first_col_int = \c_zero_int
+ \int_compare:nNnTF \l_@@_first_col_int = 0
{ \tl_put_left:NV \l_tmpa_tl \c_@@_preamble_first_col_tl }
{
\bool_if:NT \l_@@_NiceArray_bool
@@ -4142,7 +4166,7 @@
% Now, the box containing the array is constructed (in |\l_@@_the_array_box|).
% However, we have some computations to do before inserting that box in the TeX
% flow (mainly because the exterior columns are in overlapping positions).
-%
+%
% \bigskip
% \begin{macrocode}
\int_compare:nNnT \l_@@_last_row_int > { -2 }
@@ -4155,42 +4179,17 @@
\int_gset_eq:NN \l_@@_last_row_int \c at iRow
}
}
- }
+ }
% \end{macrocode}
-%
-% Now, we compute |\l_tmpa_dim| which is the vertical dimension of the ``first
-% row'' above the array (when the key |first-row| is used).
-% \begin{macrocode}
- \int_compare:nNnTF \l_@@_first_row_int = \c_zero_int
- {
- \dim_set:Nn \l_tmpa_dim
- { \g_@@_dp_row_zero_dim + \lineskip + \g_@@_ht_row_zero_dim }
- }
- { \dim_zero:N \l_tmpa_dim }
-% \end{macrocode}
-% We compute |\l_tmpb_dim| which is the vertical dimension of the ``last row''
-% below the array (when the key |last-row| is used). A value of $-2$ for
-% |\l_@@_last_row_int| means that there is no ``last row''.\footnote{A value of
-% $-1$ for |\l_@@_last_row_int| means that there is a ``last row'' but the
-% number of that row is unknown (the user have not set the value with the option
-% |last row|).}
-% \begin{macrocode}
- \int_compare:nNnTF \l_@@_last_row_int > { -2 }
- {
- \dim_set:Nn \l_tmpb_dim
- { \g_@@_ht_last_row_dim + \lineskip + \g_@@_dp_last_row_dim }
- }
- { \dim_zero:N \l_tmpb_dim }
-% \end{macrocode}
%
% \bigskip
-% Now, we begin the real construction in the output flow of TeX. First, we take
+% \textbf{Now, we begin the real construction in the output flow of TeX}. First, we take
% into account a potential ``first column'' (we remind that this ``first
% column'' has been constructed in an overlapping position and that we have
% computed its width in |\g_@@_width_first_col_dim|: see
% p.~\pageref{overlap-left}).
% \begin{macrocode}
- \int_compare:nNnT \l_@@_first_col_int = \c_zero_int
+ \int_compare:nNnT \l_@@_first_col_int = 0
{
\skip_horizontal:n \arraycolsep
\skip_horizontal:n \g_@@_width_first_col_dim
@@ -4204,13 +4203,12 @@
% \begin{macrocode}
\bool_if:NTF \l_@@_NiceArray_bool
{
- \int_compare:nNnT \l_@@_first_row_int = \c_zero_int
+ \int_compare:nNnTF \l_@@_first_row_int = 0
{
- \str_if_eq:VnTF \l_@@_pos_env_str { t }
- {
- \box_move_up:nn
- { \l_tmpa_dim - \g_@@_ht_row_zero_dim + \g_@@_ht_row_one_dim }
- }
+ \str_if_eq:VnT \l_@@_pos_env_str { t }
+ {
+ \box_move_up:nn { \g_@@_dp_row_zero_dim + \g_@@_ht_row_one_dim }
+ }
}
{
\int_compare:nNnT \l_@@_last_row_int > 0
@@ -4218,10 +4216,7 @@
\str_if_eq:VnT \l_@@_pos_env_str { b }
{
\box_move_down:nn
- {
- \l_tmpb_dim
- - \g_@@_dp_last_row_dim + \g_@@_dp_ante_last_row_dim
- }
+ { \g_@@_ht_last_row_dim + \g_@@_dp_ante_last_row_dim }
}
}
}
@@ -4229,9 +4224,34 @@
}
% \end{macrocode}
%
-% Now, in the case of an environment |{pNiceArray}|, |{bNiceArray}|, etc.
+% Now, in the case of an environment |{pNiceArray}|, |{bNiceArray}|, etc. We
+% compute |\l_tmpa_dim| which is the total height of the ``first row'' above the
+% array (when the key |first-row| is used).
% \begin{macrocode}
{
+ \int_compare:nNnTF \l_@@_first_row_int = 0
+ {
+ \dim_set:Nn \l_tmpa_dim
+ { \g_@@_dp_row_zero_dim + \g_@@_ht_row_zero_dim }
+ }
+ { \dim_zero:N \l_tmpa_dim }
+% \end{macrocode}
+% We compute |\l_tmpb_dim| which is the total height of the ``last row''
+% below the array (when the key |last-row| is used). A value of $-2$ for
+% |\l_@@_last_row_int| means that there is no ``last row''.\footnote{A value of
+% $-1$ for |\l_@@_last_row_int| means that there is a ``last row'' but the
+% number of that row is unknown (the user have not set the value with the option
+% |last row|).}
+% \begin{macrocode}
+ \int_compare:nNnTF \l_@@_last_row_int > { -2 }
+ {
+ \dim_set:Nn \l_tmpb_dim
+ { \g_@@_ht_last_row_dim + \g_@@_dp_last_row_dim }
+ }
+ { \dim_zero:N \l_tmpb_dim }
+% \end{macrocode}
+%
+% \begin{macrocode}
\hbox_set:Nn \l_tmpa_box
{
\c_math_toggle_token
@@ -4239,8 +4259,8 @@
\vcenter
{
% \end{macrocode}
-% We take into account the ``first row'' (we have previously computed its size
-% in |\l_tmpa_dim|).
+% We take into account the ``first row'' (we have previously computed its total
+% height in |\l_tmpa_dim|).
% \begin{macrocode}
\skip_vertical:n { - \l_tmpa_dim }
\hbox:n
@@ -4250,8 +4270,8 @@
\skip_horizontal:n { - \arraycolsep }
}
% \end{macrocode}
-% We take into account the ``last row'' (we have previously computed its size
-% in |\l_tmpb_dim|).
+% We take into account the ``last row'' (we have previously computed its total
+% height in |\l_tmpb_dim|).
% \begin{macrocode}
\skip_vertical:n { - \l_tmpb_dim }
}
@@ -4263,9 +4283,9 @@
\box_use_drop:N \l_tmpa_box
}
% \end{macrocode}
-% We take into account a potential ``last column'' (this ``last
-% column'' has been constructed in an overlapping position and we have computed
-% its width in |\g_@@_width_last_col_dim|: see p.~\pageref{overlap-right}).
+% We take into account a potential ``last column'' (this ``last column'' has
+% been constructed in an overlapping position and we have computed its width in
+% |\g_@@_width_last_col_dim|: see p.~\pageref{overlap-right}).
% \begin{macrocode}
\bool_if:NT \g_@@_last_col_found_bool
{
@@ -4489,7 +4509,7 @@
% \begin{macrocode}
\bool_if:nT
{
- \int_compare_p:nNn \c at iRow > \c_zero_int
+ \int_compare_p:nNn \c at iRow > 0
&&
(
\int_compare_p:nNn \l_@@_last_row_int < 0
@@ -4586,7 +4606,7 @@
% \begin{macrocode}
\bool_if:nT
{
- \int_compare_p:nNn \c at iRow > \c_zero_int
+ \int_compare_p:nNn \c at iRow > 0
&&
(
\int_compare_p:nNn \l_@@_last_row_int < 0
@@ -4879,7 +4899,7 @@
% \begin{macrocode}
\cs_new_protected:Nn \@@_after_array:
{
- \int_compare:nNnTF \c at iRow > \c_zero_int
+ \int_compare:nNnTF \c at iRow > 0
\@@_after_array_i:
{
\@@_error:n { Zero~row }
@@ -5375,7 +5395,7 @@
\cs_if_free:cT { @@ _ dotted _ #1 - #2 }
{
\bool_set_false:N \l_@@_impossible_line_bool
- \@@_find_extremities_of_line:nnnn { #1 } { #2 } \c_zero_int \c_one_int
+ \@@_find_extremities_of_line:nnnn { #1 } { #2 } 0 \c_one_int
\bool_if:NF \l_@@_impossible_line_bool \@@_actually_draw_Ldots:
}
}
@@ -5445,7 +5465,7 @@
\cs_if_free:cT { @@ _ dotted _ #1 - #2 }
{
\bool_set_false:N \l_@@_impossible_line_bool
- \@@_find_extremities_of_line:nnnn { #1 } { #2 } \c_zero_int \c_one_int
+ \@@_find_extremities_of_line:nnnn { #1 } { #2 } 0 \c_one_int
\bool_if:NF \l_@@_impossible_line_bool
{
\@@_retrieve_coords:xx
@@ -5501,7 +5521,7 @@
\cs_if_free:cT { @@ _ dotted _ #1 - #2 }
{
\bool_set_false:N \l_@@_impossible_line_bool
- \@@_find_extremities_of_line:nnnn { #1 } { #2 } \c_one_int \c_zero_int
+ \@@_find_extremities_of_line:nnnn { #1 } { #2 } \c_one_int 0
\bool_if:NF \l_@@_impossible_line_bool
{
\@@_retrieve_coords:xx
@@ -6191,7 +6211,7 @@
&&
! \l_@@_exterior_arraycolsep_bool
&&
- \int_compare_p:nNn \l_@@_first_col_int > \c_zero_int
+ \int_compare_p:nNn \l_@@_first_col_int > 0
}
{ \skip_horizontal:n { - \arraycolsep } }
\hbox_to_wd:nn
@@ -6213,7 +6233,7 @@
% We should allow the letter ``|:|'' in the first position of the preamble
% but that would need a special programmation.
% \begin{macrocode}
- \int_compare:nNnTF #1 = \c_zero_int
+ \int_compare:nNnTF #1 = 0
{ \@@_error:n { Use~of~:~in~first~position } }
{
\bool_if:NF \c_@@_draft_bool
@@ -6300,7 +6320,7 @@
% with |\newcolumntype|:
% \begin{Verbatim}[commandchars=\~\#\+]
% \newcolumntype { | }
-% { ! { \int_compare:nNnF \c at iRow = \c_zero_int \vline } }
+% { ! { \int_compare:nNnF \c at iRow = 0 \vline } }
% \end{Verbatim}
%
% However, this code fails if the user uses "\DefineShortVerb{\|}" of
@@ -6318,13 +6338,13 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_vline:
{
- \int_compare:nNnTF \l_@@_first_col_int = \c_zero_int
+ \int_compare:nNnTF \l_@@_first_col_int = 0
{
- \int_compare:nNnTF \c at jCol = \c_zero_int
+ \int_compare:nNnTF \c at jCol = 0
{
- \int_compare:nNnTF \l_@@_first_row_int = \c_zero_int
+ \int_compare:nNnTF \l_@@_first_row_int = 0
{
- \int_compare:nNnF \c at iRow = \c_zero_int
+ \int_compare:nNnF \c at iRow = 0
{
\int_compare:nNnF \c at iRow = \l_@@_last_row_int
\@@_vline_i:
@@ -6331,7 +6351,7 @@
}
}
{
- \int_compare:nNnF \c at iRow = \c_zero_int
+ \int_compare:nNnF \c at iRow = 0
{
\int_compare:nNnF \c at iRow = \l_@@_last_row_int
\@@_vline_i:
@@ -6339,7 +6359,7 @@
}
}
{
- \int_compare:nNnF \c at iRow = \c_zero_int
+ \int_compare:nNnF \c at iRow = 0
{
\int_compare:nNnF \c at iRow = \l_@@_last_row_int
\@@_vline_i:
@@ -6347,7 +6367,7 @@
}
}
{
- \int_compare:nNnTF \c at jCol = \c_zero_int
+ \int_compare:nNnTF \c at jCol = 0
{
\int_compare:nNnF \c at iRow = { -1 }
{
@@ -6356,7 +6376,7 @@
}
}
{
- \int_compare:nNnF \c at iRow = \c_zero_int
+ \int_compare:nNnF \c at iRow = 0
{
\int_compare:nNnF \c at iRow = \l_@@_last_row_int
\@@_vline_i:
@@ -6396,7 +6416,7 @@
% \begin{macrocode}
\cs_new:Npn \@@_OnlyMainNiceMatrix:n #1
{
- \int_compare:nNnF \c at iRow = \c_zero_int
+ \int_compare:nNnF \c at iRow = 0
{ \int_compare:nNnF \c at iRow = \l_@@_last_row_int { #1 } }
}
% \end{macrocode}
@@ -7010,15 +7030,15 @@
\@@_set_size:n #4 \q_stop
\begin { NiceArrayWithDelims } { #1 } { #2 }
{ * { \l_@@_nb_cols_int } { C } } [ #3 , #5 , #7 ]
- \int_compare:nNnT \l_@@_first_row_int = \c_zero_int
+ \int_compare:nNnT \l_@@_first_row_int = 0
{
- \int_compare:nNnT \l_@@_first_col_int = \c_zero_int { & }
+ \int_compare:nNnT \l_@@_first_col_int = 0 { & }
\prg_replicate:nn { \l_@@_nb_cols_int - 1 } { & }
\int_compare:nNnT \l_@@_last_col_int > { -1 } { & } \\
}
\prg_replicate:nn \l_@@_nb_rows_int
{
- \int_compare:nNnT \l_@@_first_col_int = \c_zero_int { & }
+ \int_compare:nNnT \l_@@_first_col_int = 0 { & }
% \end{macrocode}
% You put |{ }| before |#6| to avoid a hasty expansion of an eventual
% |\arabic{iRow}| at the beginning of the row which would result in an incorrect
@@ -7030,7 +7050,7 @@
}
\int_compare:nNnT \l_@@_last_row_int > { -2 }
{
- \int_compare:nNnT \l_@@_first_col_int = \c_zero_int { & }
+ \int_compare:nNnT \l_@@_first_col_int = 0 { & }
\prg_replicate:nn { \l_@@_nb_cols_int - 1 } { & }
\int_compare:nNnT \l_@@_last_col_int > { -1 } { & } \\
}
@@ -7372,7 +7392,7 @@
{
\@@_error:nn { Obsolete~environment }
{ the~option~'last-col' }
- \int_set:Nn \l_@@_last_col_int \c_zero_dim
+ \int_zero:N \l_@@_last_col_int
\pNiceArray
}
{ \endpNiceArray }
@@ -7383,7 +7403,7 @@
{
\@@_error:nn { Obsolete~environment }
{ the~option~'last-col' }
- \int_set:Nn \l_@@_last_col_int \c_zero_dim
+ \int_zero:N \l_@@_last_col_int
\bNiceArray
}
{ \endbNiceArray }
@@ -7394,7 +7414,7 @@
{
\@@_error:nn { Obsolete~environment }
{ the~option~'last-col' }
- \int_set:Nn \l_@@_last_col_int \c_zero_dim
+ \int_zero:N \l_@@_last_col_int
\BNiceArray
}
{ \endBNiceArray }
@@ -7405,7 +7425,7 @@
{
\@@_error:nn { Obsolete~environment }
{ the~option~'last-col' }
- \int_set:Nn \l_@@_last_col_int \c_zero_dim
+ \int_zero:N \l_@@_last_col_int
\vNiceArray
}
{ \endvNiceArray }
@@ -7416,7 +7436,7 @@
{
\@@_error:nn { Obsolete~environment }
{ the~option~'last-col' }
- \int_set:Nn \l_@@_last_col_int \c_zero_dim
+ \int_zero:N \l_@@_last_col_int
\VNiceArray
}
{ \endVNiceArray }
@@ -7427,8 +7447,8 @@
{
\@@_error:nn { Obsolete~environment }
{ the~options~'last-col'~and~'first-row' }
- \int_set:Nn \l_@@_last_col_int \c_zero_dim
- \int_set:Nn \l_@@_first_row_int \c_zero_int
+ \int_zero:N \l_@@_last_col_int
+ \int_zero:N \l_@@_first_row_int
\pNiceArray
}
{ \endpNiceArray }
@@ -7439,8 +7459,8 @@
{
\@@_error:nn { Obsolete~environment }
{ the~options~'last-col'~and~'first-row' }
- \int_set:Nn \l_@@_last_col_int \c_zero_dim
- \int_set:Nn \l_@@_first_row_int \c_zero_int
+ \int_zero:N \l_@@_last_col_int
+ \int_zero:N \l_@@_first_row_int
\bNiceArray
}
{ \endbNiceArray }
@@ -7451,8 +7471,8 @@
{
\@@_error:nn { Obsolete~environment }
{ the~options~'last-col'~and~'first-row' }
- \int_set:Nn \l_@@_last_col_int \c_zero_dim
- \int_set:Nn \l_@@_first_row_int \c_zero_int
+ \int_zero:N \l_@@_last_col_int
+ \int_zero:N \l_@@_first_row_int
\BNiceArray
}
{ \endBNiceArray }
@@ -7463,8 +7483,8 @@
{
\@@_error:nn { Obsolete~environment }
{ the~options~'last-col'~and~'first-row' }
- \bool_set_true:N \l_@@_last_col_bool
- \int_set:Nn \l_@@_first_row_int \c_zero_int
+ \int_zero:N \l_@@_last_col_int
+ \int_zero:N \l_@@_first_row_int
\vNiceArray
}
{ \endvNiceArray }
@@ -7475,8 +7495,8 @@
{
\@@_error:nn { Obsolete~environment }
{ the~options~'last-col'~and~'first-row' }
- \int_set:Nn \l_@@_last_col_int \c_zero_dim
- \int_set:Nn \l_@@_first_row_int \c_zero_int
+ \int_zero:N \l_@@_last_col_int
+ \int_zero:N \l_@@_first_row_int
\VNiceArray
}
{ \endVNiceArray }
@@ -7487,7 +7507,7 @@
{
\@@_error:nn { Obsolete~environment }
{ the~option~'last-col' }
- \int_set:Nn \l_@@_last_col_int \c_zero_dim
+ \int_zero:N \l_@@_last_col_int
\NiceArrayWithDelims
}
{ \endNiceArrayWithDelims }
@@ -7498,8 +7518,8 @@
{
\@@_error:nn { Obsolete~environment }
{ the~options~'last-col'~and~'first-row' }
- \int_set:Nn \l_@@_last_col_int \c_zero_dim
- \int_set:Nn \l_@@_first_row_int \c_zero_int
+ \int_zero:N \l_@@_last_col_int
+ \int_zero:N \l_@@_first_row_int
\NiceArrayWithDelims
}
{ \endNiceArrayWithDelims }
@@ -7738,7 +7758,11 @@
% New option |light-syntax| (and |end-of-row|).
%
% New option |dotted-lines-margin| for fine tuning of the dotted lines.
+%
+% \subsection*{Changes between versions 3.10 and 3.11}
%
+% Correction of a bug linked to |first-row| and |last-row|.
+%
% \PrintIndex
%
% \tableofcontents
Modified: trunk/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty 2020-02-08 22:18:03 UTC (rev 53720)
+++ trunk/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty 2020-02-08 22:18:19 UTC (rev 53721)
@@ -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{3.10}
-\def\myfiledate{2020/01/22}
+\def\myfileversion{3.11}
+\def\myfiledate{2020/02/07}
\RequirePackage{tikz}
\usetikzlibrary{fit}
\RequirePackage{expl3}[2019/07/01]
@@ -28,7 +28,7 @@
{nicematrix}
{\myfiledate}
{\myfileversion}
- {Several features to improve the typesetting of mathematical matrices with TikZ}
+ {Mathematical matrices with TikZ}
\bool_new:N \c__nicematrix_draft_bool
\DeclareOption { draft } { \bool_set_true:N \c__nicematrix_draft_bool }
\DeclareOption* { }
@@ -325,8 +325,8 @@
\hbox_set:Nw \l_tmpa_box
\c_math_toggle_token
\bool_if:NT \l__nicematrix_small_bool \scriptstyle
- \int_compare:nNnTF \c at iRow = \c_zero_int
- { \int_compare:nNnT \c at jCol > \c_zero_int \l__nicematrix_code_for_first_row_tl }
+ \int_compare:nNnTF \c at iRow = 0
+ { \int_compare:nNnT \c at jCol > 0 \l__nicematrix_code_for_first_row_tl }
{
\int_compare:nNnT \c at iRow = \l__nicematrix_last_row_int
\l__nicematrix_code_for_last_row_tl
@@ -336,12 +336,12 @@
{
\int_gincr:N \c at iRow
\dim_gset_eq:NN \g__nicematrix_dp_ante_last_row_dim \g__nicematrix_dp_last_row_dim
- \dim_gzero:N \g__nicematrix_dp_last_row_dim
- \dim_gzero:N \g__nicematrix_ht_last_row_dim
+ \dim_gset:Nn \g__nicematrix_dp_last_row_dim { \box_dp:N \@arstrutbox }
+ \dim_gset:Nn \g__nicematrix_ht_last_row_dim { \box_ht:N \@arstrutbox }
}
\cs_new_protected:Npn \__nicematrix_actualization_for_first_and_last_row:
{
- \int_compare:nNnT \c at iRow = \c_zero_int
+ \int_compare:nNnT \c at iRow = 0
{
\dim_gset:Nn \g__nicematrix_dp_row_zero_dim
{ \dim_max:nn \g__nicematrix_dp_row_zero_dim { \box_dp:N \l_tmpa_box } }
@@ -503,7 +503,6 @@
\dim_gzero_new:N \g__nicematrix_ht_row_one_dim
\dim_gset:Nn \g__nicematrix_ht_row_one_dim { \box_ht:N \@arstrutbox }
\dim_gzero_new:N \g__nicematrix_dp_ante_last_row_dim
- \dim_gset:Nn \g__nicematrix_dp_ante_last_row_dim { \box_dp:N \@arstrutbox }
\dim_gzero_new:N \g__nicematrix_ht_last_row_dim
\dim_gset:Nn \g__nicematrix_ht_last_row_dim { \box_ht:N \@arstrutbox }
\dim_gzero_new:N \g__nicematrix_dp_last_row_dim
@@ -656,7 +655,7 @@
}
\box_clear_new:N \l__nicematrix_the_array_box
\tl_set:Nn \l_tmpa_tl { #4 }
- \int_compare:nNnTF \l__nicematrix_first_col_int = \c_zero_int
+ \int_compare:nNnTF \l__nicematrix_first_col_int = 0
{ \tl_put_left:NV \l_tmpa_tl \c__nicematrix_preamble_first_col_tl }
{
\bool_if:NT \l__nicematrix_NiceArray_bool
@@ -701,31 +700,18 @@
}
}
}
- \int_compare:nNnTF \l__nicematrix_first_row_int = \c_zero_int
+ \int_compare:nNnT \l__nicematrix_first_col_int = 0
{
- \dim_set:Nn \l_tmpa_dim
- { \g__nicematrix_dp_row_zero_dim + \lineskip + \g__nicematrix_ht_row_zero_dim }
- }
- { \dim_zero:N \l_tmpa_dim }
- \int_compare:nNnTF \l__nicematrix_last_row_int > { -2 }
- {
- \dim_set:Nn \l_tmpb_dim
- { \g__nicematrix_ht_last_row_dim + \lineskip + \g__nicematrix_dp_last_row_dim }
- }
- { \dim_zero:N \l_tmpb_dim }
- \int_compare:nNnT \l__nicematrix_first_col_int = \c_zero_int
- {
\skip_horizontal:n \arraycolsep
\skip_horizontal:n \g__nicematrix_width_first_col_dim
}
\bool_if:NTF \l__nicematrix_NiceArray_bool
{
- \int_compare:nNnT \l__nicematrix_first_row_int = \c_zero_int
+ \int_compare:nNnTF \l__nicematrix_first_row_int = 0
{
- \str_if_eq:VnTF \l__nicematrix_pos_env_str { t }
+ \str_if_eq:VnT \l__nicematrix_pos_env_str { t }
{
- \box_move_up:nn
- { \l_tmpa_dim - \g__nicematrix_ht_row_zero_dim + \g__nicematrix_ht_row_one_dim }
+ \box_move_up:nn { \g__nicematrix_dp_row_zero_dim + \g__nicematrix_ht_row_one_dim }
}
}
{
@@ -734,10 +720,7 @@
\str_if_eq:VnT \l__nicematrix_pos_env_str { b }
{
\box_move_down:nn
- {
- \l_tmpb_dim
- - \g__nicematrix_dp_last_row_dim + \g__nicematrix_dp_ante_last_row_dim
- }
+ { \g__nicematrix_ht_last_row_dim + \g__nicematrix_dp_ante_last_row_dim }
}
}
}
@@ -744,6 +727,18 @@
{ \box_use_drop:N \l__nicematrix_the_array_box }
}
{
+ \int_compare:nNnTF \l__nicematrix_first_row_int = 0
+ {
+ \dim_set:Nn \l_tmpa_dim
+ { \g__nicematrix_dp_row_zero_dim + \g__nicematrix_ht_row_zero_dim }
+ }
+ { \dim_zero:N \l_tmpa_dim }
+ \int_compare:nNnTF \l__nicematrix_last_row_int > { -2 }
+ {
+ \dim_set:Nn \l_tmpb_dim
+ { \g__nicematrix_ht_last_row_dim + \g__nicematrix_dp_last_row_dim }
+ }
+ { \dim_zero:N \l_tmpb_dim }
\hbox_set:Nn \l_tmpa_box
{
\c_math_toggle_token
@@ -876,7 +871,7 @@
\bool_if:NT \l__nicematrix_small_bool \scriptstyle
\bool_if:nT
{
- \int_compare_p:nNn \c at iRow > \c_zero_int
+ \int_compare_p:nNn \c at iRow > 0
&&
(
\int_compare_p:nNn \l__nicematrix_last_row_int < 0
@@ -947,7 +942,7 @@
\bool_if:NT \l__nicematrix_small_bool \scriptstyle
\bool_if:nT
{
- \int_compare_p:nNn \c at iRow > \c_zero_int
+ \int_compare_p:nNn \c at iRow > 0
&&
(
\int_compare_p:nNn \l__nicematrix_last_row_int < 0
@@ -1130,7 +1125,7 @@
}
\cs_new_protected:Nn \__nicematrix_after_array:
{
- \int_compare:nNnTF \c at iRow > \c_zero_int
+ \int_compare:nNnTF \c at iRow > 0
\__nicematrix_after_array_i:
{
\__nicematrix_error:n { Zero~row }
@@ -1407,7 +1402,7 @@
\cs_if_free:cT { __nicematrix _ dotted _ #1 - #2 }
{
\bool_set_false:N \l__nicematrix_impossible_line_bool
- \__nicematrix_find_extremities_of_line:nnnn { #1 } { #2 } \c_zero_int \c_one_int
+ \__nicematrix_find_extremities_of_line:nnnn { #1 } { #2 } 0 \c_one_int
\bool_if:NF \l__nicematrix_impossible_line_bool \__nicematrix_actually_draw_Ldots:
}
}
@@ -1458,7 +1453,7 @@
\cs_if_free:cT { __nicematrix _ dotted _ #1 - #2 }
{
\bool_set_false:N \l__nicematrix_impossible_line_bool
- \__nicematrix_find_extremities_of_line:nnnn { #1 } { #2 } \c_zero_int \c_one_int
+ \__nicematrix_find_extremities_of_line:nnnn { #1 } { #2 } 0 \c_one_int
\bool_if:NF \l__nicematrix_impossible_line_bool
{
\__nicematrix_retrieve_coords:xx
@@ -1506,7 +1501,7 @@
\cs_if_free:cT { __nicematrix _ dotted _ #1 - #2 }
{
\bool_set_false:N \l__nicematrix_impossible_line_bool
- \__nicematrix_find_extremities_of_line:nnnn { #1 } { #2 } \c_one_int \c_zero_int
+ \__nicematrix_find_extremities_of_line:nnnn { #1 } { #2 } \c_one_int 0
\bool_if:NF \l__nicematrix_impossible_line_bool
{
\__nicematrix_retrieve_coords:xx
@@ -1936,7 +1931,7 @@
&&
! \l__nicematrix_exterior_arraycolsep_bool
&&
- \int_compare_p:nNn \l__nicematrix_first_col_int > \c_zero_int
+ \int_compare_p:nNn \l__nicematrix_first_col_int > 0
}
{ \skip_horizontal:n { - \arraycolsep } }
\hbox_to_wd:nn
@@ -1950,7 +1945,7 @@
}
\cs_new_protected:Nn \__nicematrix_vdottedline:n
{
- \int_compare:nNnTF #1 = \c_zero_int
+ \int_compare:nNnTF #1 = 0
{ \__nicematrix_error:n { Use~of~:~in~first~position } }
{
\bool_if:NF \c__nicematrix_draft_bool
@@ -2014,13 +2009,13 @@
}
\cs_new_protected:Npn \__nicematrix_vline:
{
- \int_compare:nNnTF \l__nicematrix_first_col_int = \c_zero_int
+ \int_compare:nNnTF \l__nicematrix_first_col_int = 0
{
- \int_compare:nNnTF \c at jCol = \c_zero_int
+ \int_compare:nNnTF \c at jCol = 0
{
- \int_compare:nNnTF \l__nicematrix_first_row_int = \c_zero_int
+ \int_compare:nNnTF \l__nicematrix_first_row_int = 0
{
- \int_compare:nNnF \c at iRow = \c_zero_int
+ \int_compare:nNnF \c at iRow = 0
{
\int_compare:nNnF \c at iRow = \l__nicematrix_last_row_int
\__nicematrix_vline_i:
@@ -2027,7 +2022,7 @@
}
}
{
- \int_compare:nNnF \c at iRow = \c_zero_int
+ \int_compare:nNnF \c at iRow = 0
{
\int_compare:nNnF \c at iRow = \l__nicematrix_last_row_int
\__nicematrix_vline_i:
@@ -2035,7 +2030,7 @@
}
}
{
- \int_compare:nNnF \c at iRow = \c_zero_int
+ \int_compare:nNnF \c at iRow = 0
{
\int_compare:nNnF \c at iRow = \l__nicematrix_last_row_int
\__nicematrix_vline_i:
@@ -2043,7 +2038,7 @@
}
}
{
- \int_compare:nNnTF \c at jCol = \c_zero_int
+ \int_compare:nNnTF \c at jCol = 0
{
\int_compare:nNnF \c at iRow = { -1 }
{
@@ -2052,7 +2047,7 @@
}
}
{
- \int_compare:nNnF \c at iRow = \c_zero_int
+ \int_compare:nNnF \c at iRow = 0
{
\int_compare:nNnF \c at iRow = \l__nicematrix_last_row_int
\__nicematrix_vline_i:
@@ -2064,7 +2059,7 @@
\cs_set_eq:NN \OnlyMainNiceMatrix \use:n
\cs_new:Npn \__nicematrix_OnlyMainNiceMatrix:n #1
{
- \int_compare:nNnF \c at iRow = \c_zero_int
+ \int_compare:nNnF \c at iRow = 0
{ \int_compare:nNnF \c at iRow = \l__nicematrix_last_row_int { #1 } }
}
\bool_new:N \l__nicematrix_block_auto_columns_width_bool
@@ -2405,21 +2400,21 @@
\__nicematrix_set_size:n #4 \q_stop
\begin { NiceArrayWithDelims } { #1 } { #2 }
{ * { \l__nicematrix_nb_cols_int } { C } } [ #3 , #5 , #7 ]
- \int_compare:nNnT \l__nicematrix_first_row_int = \c_zero_int
+ \int_compare:nNnT \l__nicematrix_first_row_int = 0
{
- \int_compare:nNnT \l__nicematrix_first_col_int = \c_zero_int { & }
+ \int_compare:nNnT \l__nicematrix_first_col_int = 0 { & }
\prg_replicate:nn { \l__nicematrix_nb_cols_int - 1 } { & }
\int_compare:nNnT \l__nicematrix_last_col_int > { -1 } { & } \\
}
\prg_replicate:nn \l__nicematrix_nb_rows_int
{
- \int_compare:nNnT \l__nicematrix_first_col_int = \c_zero_int { & }
+ \int_compare:nNnT \l__nicematrix_first_col_int = 0 { & }
\prg_replicate:nn { \l__nicematrix_nb_cols_int - 1 } { { } #6 & } #6
\int_compare:nNnT \l__nicematrix_last_col_int > { -1 } { & } \\
}
\int_compare:nNnT \l__nicematrix_last_row_int > { -2 }
{
- \int_compare:nNnT \l__nicematrix_first_col_int = \c_zero_int { & }
+ \int_compare:nNnT \l__nicematrix_first_col_int = 0 { & }
\prg_replicate:nn { \l__nicematrix_nb_cols_int - 1 } { & }
\int_compare:nNnT \l__nicematrix_last_col_int > { -1 } { & } \\
}
@@ -2665,7 +2660,7 @@
{
\__nicematrix_error:nn { Obsolete~environment }
{ the~option~'last-col' }
- \int_set:Nn \l__nicematrix_last_col_int \c_zero_dim
+ \int_zero:N \l__nicematrix_last_col_int
\pNiceArray
}
{ \endpNiceArray }
@@ -2673,7 +2668,7 @@
{
\__nicematrix_error:nn { Obsolete~environment }
{ the~option~'last-col' }
- \int_set:Nn \l__nicematrix_last_col_int \c_zero_dim
+ \int_zero:N \l__nicematrix_last_col_int
\bNiceArray
}
{ \endbNiceArray }
@@ -2681,7 +2676,7 @@
{
\__nicematrix_error:nn { Obsolete~environment }
{ the~option~'last-col' }
- \int_set:Nn \l__nicematrix_last_col_int \c_zero_dim
+ \int_zero:N \l__nicematrix_last_col_int
\BNiceArray
}
{ \endBNiceArray }
@@ -2689,7 +2684,7 @@
{
\__nicematrix_error:nn { Obsolete~environment }
{ the~option~'last-col' }
- \int_set:Nn \l__nicematrix_last_col_int \c_zero_dim
+ \int_zero:N \l__nicematrix_last_col_int
\vNiceArray
}
{ \endvNiceArray }
@@ -2697,7 +2692,7 @@
{
\__nicematrix_error:nn { Obsolete~environment }
{ the~option~'last-col' }
- \int_set:Nn \l__nicematrix_last_col_int \c_zero_dim
+ \int_zero:N \l__nicematrix_last_col_int
\VNiceArray
}
{ \endVNiceArray }
@@ -2705,8 +2700,8 @@
{
\__nicematrix_error:nn { Obsolete~environment }
{ the~options~'last-col'~and~'first-row' }
- \int_set:Nn \l__nicematrix_last_col_int \c_zero_dim
- \int_set:Nn \l__nicematrix_first_row_int \c_zero_int
+ \int_zero:N \l__nicematrix_last_col_int
+ \int_zero:N \l__nicematrix_first_row_int
\pNiceArray
}
{ \endpNiceArray }
@@ -2714,8 +2709,8 @@
{
\__nicematrix_error:nn { Obsolete~environment }
{ the~options~'last-col'~and~'first-row' }
- \int_set:Nn \l__nicematrix_last_col_int \c_zero_dim
- \int_set:Nn \l__nicematrix_first_row_int \c_zero_int
+ \int_zero:N \l__nicematrix_last_col_int
+ \int_zero:N \l__nicematrix_first_row_int
\bNiceArray
}
{ \endbNiceArray }
@@ -2723,8 +2718,8 @@
{
\__nicematrix_error:nn { Obsolete~environment }
{ the~options~'last-col'~and~'first-row' }
- \int_set:Nn \l__nicematrix_last_col_int \c_zero_dim
- \int_set:Nn \l__nicematrix_first_row_int \c_zero_int
+ \int_zero:N \l__nicematrix_last_col_int
+ \int_zero:N \l__nicematrix_first_row_int
\BNiceArray
}
{ \endBNiceArray }
@@ -2732,8 +2727,8 @@
{
\__nicematrix_error:nn { Obsolete~environment }
{ the~options~'last-col'~and~'first-row' }
- \bool_set_true:N \l__nicematrix_last_col_bool
- \int_set:Nn \l__nicematrix_first_row_int \c_zero_int
+ \int_zero:N \l__nicematrix_last_col_int
+ \int_zero:N \l__nicematrix_first_row_int
\vNiceArray
}
{ \endvNiceArray }
@@ -2741,8 +2736,8 @@
{
\__nicematrix_error:nn { Obsolete~environment }
{ the~options~'last-col'~and~'first-row' }
- \int_set:Nn \l__nicematrix_last_col_int \c_zero_dim
- \int_set:Nn \l__nicematrix_first_row_int \c_zero_int
+ \int_zero:N \l__nicematrix_last_col_int
+ \int_zero:N \l__nicematrix_first_row_int
\VNiceArray
}
{ \endVNiceArray }
@@ -2750,7 +2745,7 @@
{
\__nicematrix_error:nn { Obsolete~environment }
{ the~option~'last-col' }
- \int_set:Nn \l__nicematrix_last_col_int \c_zero_dim
+ \int_zero:N \l__nicematrix_last_col_int
\NiceArrayWithDelims
}
{ \endNiceArrayWithDelims }
@@ -2758,8 +2753,8 @@
{
\__nicematrix_error:nn { Obsolete~environment }
{ the~options~'last-col'~and~'first-row' }
- \int_set:Nn \l__nicematrix_last_col_int \c_zero_dim
- \int_set:Nn \l__nicematrix_first_row_int \c_zero_int
+ \int_zero:N \l__nicematrix_last_col_int
+ \int_zero:N \l__nicematrix_first_row_int
\NiceArrayWithDelims
}
{ \endNiceArrayWithDelims }
More information about the tex-live-commits
mailing list.