texlive[74466] branches/branch2024.final/Master/texmf-dist:
commits+karl at tug.org
commits+karl at tug.org
Wed Mar 5 22:36:01 CET 2025
Revision: 74466
https://tug.org/svn/texlive?view=revision&revision=74466
Author: karl
Date: 2025-03-05 22:36:00 +0100 (Wed, 05 Mar 2025)
Log Message:
-----------
nicematrix (branch) (5mar25)
Modified Paths:
--------------
branches/branch2024.final/Master/texmf-dist/doc/latex/nicematrix/nicematrix-code.pdf
branches/branch2024.final/Master/texmf-dist/doc/latex/nicematrix/nicematrix-french.pdf
branches/branch2024.final/Master/texmf-dist/doc/latex/nicematrix/nicematrix-french.tex
branches/branch2024.final/Master/texmf-dist/doc/latex/nicematrix/nicematrix.pdf
branches/branch2024.final/Master/texmf-dist/doc/latex/nicematrix/nicematrix.tex
branches/branch2024.final/Master/texmf-dist/source/latex/nicematrix/nicematrix-code.dtx
branches/branch2024.final/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty
Modified: branches/branch2024.final/Master/texmf-dist/doc/latex/nicematrix/nicematrix-code.pdf
===================================================================
(Binary files differ)
Modified: branches/branch2024.final/Master/texmf-dist/doc/latex/nicematrix/nicematrix-french.pdf
===================================================================
(Binary files differ)
Modified: branches/branch2024.final/Master/texmf-dist/doc/latex/nicematrix/nicematrix-french.tex
===================================================================
--- branches/branch2024.final/Master/texmf-dist/doc/latex/nicematrix/nicematrix-french.tex 2025-03-05 21:35:50 UTC (rev 74465)
+++ branches/branch2024.final/Master/texmf-dist/doc/latex/nicematrix/nicematrix-french.tex 2025-03-05 21:36:00 UTC (rev 74466)
@@ -7,6 +7,8 @@
\usepackage{geometry}
\geometry{left=2.8cm,right=2.8cm,top=2.5cm,bottom=2.5cm,papersize={21cm,29.7cm}}
+
+\usepackage{array}%[=v2.5]
\usepackage{nicematrix}
\usepackage{tikz}
@@ -215,10 +217,10 @@
automatiquement un nombre de compilations suffisant (en utilisant |latexmk|).}. L'utilisateur ne doit
pas utiliser la commande |\nofiles| (qui bloque l'écriture du fichier |aux|).
-% \medskip
-% La plupart des fonctionnalités de \pkg{nicematrix} sont accessibles sans avoir à
-% utiliser explicitement \textsc{pgf} ou TikZ (ce dernier n'est d'ailleurs pas
-% chargé par défaut).
+\medskip
+La plupart des fonctionnalités de \pkg{nicematrix} sont accessibles sans avoir à
+utiliser explicitement \textsc{pgf} ou TikZ (ce dernier n'est d'ailleurs pas
+chargé par défaut).
\medskip
\indexcommand{NiceMatrixOptions}
@@ -227,9 +229,6 @@
semi-globales).
-\medskip
-\colorbox{yellow!50}{\bfseries Nouveau 7.0}\enskip \pkg{nicematrix} est
-compatible avec le \emph{Tagging Project} : cf. p.~\pageref{Tagging Project}.
\newpage
@@ -977,7 +976,7 @@
\bigskip
On peut mettre un environnement |{itemize}| ou |{enumerate}| dans un bloc qui
-utilise la clé |p| ou la clé |j| (dans les autres cas, on a une erreur
+utilise la clé |p| ou la clé |j| (dans les autres cas, on aura une erreur:
|Not allowed in LR mode|). Dans l'exemple suivant, on a chargé l'extension
\pkg{enumitem} (pour pouvoir utiliser la clé |left| de l'environnement
|{itemize}|).
@@ -2794,7 +2793,9 @@
de la même manière que la commande éponyme de \pkg{colortbl} (néanmoins,
contrairement à la commande |\columncolor| de \pkg{colortbl}, celle de
\pkg{nicematrix} peut apparaître à l'intérieur d'une autre commande, elle-même
-utilisée dans le préambule) ;
+utilisée dans le préambule; en revanche, elle ne prend pas les deux arguments
+optionnels à la fin entre crochets pour du débord comme la commande de
+\pkg{colortbl}) ;
\item \DefinitionCommande{rowcolors} qui prend pour arguments deux couleurs et
colorie la suite du tableau avec ces deux couleurs ;
\item \DefinitionCommande{rowlistcolors} qui prend pour argument une liste de
@@ -4011,7 +4012,10 @@
\label{Hbrace}
\indexcommand{Hbrace}
\indexcommand{Vbrace}
+\index{brace (nicematrix/brace est un style TikZ\newline utilisé par \textbackslash
+ Hbrace et \textbackslash Vbrace)}
+
\smallskip
Puisque, comme dit dans la partie précédente, il est possible d'utiliser, avec
les commandes |\Cdots|, |\Ldots|, |\Vdots|, etc. n'importe quel style de ligne
@@ -4087,7 +4091,21 @@
& \Hbrace{3}{p} & \Hbrace[color=blue]{2}{q} \\
\end{NiceArray}$
+
\medskip
+Le style TikZ utilisé par \pkg{nicematrix} pour tracer ces accolades est appelé
+\Definition{nicematrix/brace}. Voici la valeur initiale de ce style :
+
+\begin{Code}
+\emph{decoration = { brace , raise = -0.15 em } , }
+\emph{decorate }
+\end{Code}
+
+L'utilisateur final peut changer ce style TikZ à sa guise (en respectant la
+structure avec les clés |decorate| et |decoration|).
+
+
+\medskip
Pour un autre exemple d'utilisation de |\Hbrace| et |\Vbrace|, voir la partie
«Des lignes pointillées qui ne sont plus pointillées»,
p.~\pageref{ex:no-longer-dotted-rules}.
@@ -4574,7 +4592,7 @@
& a second sub-part \\
\bottomrule
\CodeAfter
- \emph{\SubMatrix{\{}{2-2}{3-2}{.}}
+ \emph{\SubMatrix{\lbrace}{2-2}{3-2}{.}}
\end{NiceTabular}
\end{Code}
\hspace{2cm}
@@ -4585,21 +4603,23 @@
& a second sub-part \\
\bottomrule
\CodeAfter
- \SubMatrix{\{}{2-2}{3-2}{.}
+ \SubMatrix{\lbrace}{2-2}{3-2}{.}
\end{NiceTabular}
+
\vspace{1cm}
\emph{Attention} : La fonctionnalité suivante est fragile et ne fonctionne pas
avec |latex|--|dvips|--|ps2pdf|.\par\nobreak
+\smallskip
La clé \Definition{code} de la commande |\SubMatrix| permet d'insérer du code
après la création de la matrice. Elle a surtout pour vocation d'être utilisée
pour insérer des instructions TikZ, sachant que, dans les instructions TikZ
-insérées dans cette clé, les nœuds de la forme \verb+i-|j+ sont interprétés avec
-|i| et |j| étant des numéros de ligne et colonne \emph{relatifs à la
- sous-matrice}.\footnote{Attention : la syntaxe \texttt{j\string|-i} n'est
- \emph{pas} autorisée.}
+insérées dans cette clé, les nœuds de la forme \texttt{i-j.\textsl{anchor}} ou
+\verb+i-|j+ sont interprétés avec |i| et |j| étant des numéros de ligne et
+colonne \emph{relatifs à la sous-matrice}.\footnote{Attention : la syntaxe
+ \texttt{j\string|-i} n'est \emph{pas} autorisée.}
\medskip
\begin{Code}
@@ -7295,7 +7315,8 @@
\pkg{decorations.pathreplacing} de TikZ, le mieux est d'utiliser les commandes
|\Hbrace| et |\Vbrace| proposées par \pkg{nicematrix} (cf.
p.~\pageref{Hbrace}).\footnote{Ces commandes ne sont disponibles que si TikZ a
- été chargée ainsi que la bibliothèque \pkg{decorations.pathreplacing} de TikZ.}
+ été chargée ainsi que la bibliothèque \pkg{decorations.pathreplacing} de TikZ
+ : |\usepackage{TikZ}| |\usetikzlibrary{decorations.pathreplacing}|.}
\medskip
Modified: branches/branch2024.final/Master/texmf-dist/doc/latex/nicematrix/nicematrix.pdf
===================================================================
(Binary files differ)
Modified: branches/branch2024.final/Master/texmf-dist/doc/latex/nicematrix/nicematrix.tex
===================================================================
--- branches/branch2024.final/Master/texmf-dist/doc/latex/nicematrix/nicematrix.tex 2025-03-05 21:35:50 UTC (rev 74465)
+++ branches/branch2024.final/Master/texmf-dist/doc/latex/nicematrix/nicematrix.tex 2025-03-05 21:36:00 UTC (rev 74466)
@@ -211,9 +211,9 @@
a sufficient number of compilations.}. One must not use the command |\nofiles|
(which prevents the creation of the |aux| file).
-% \medskip
-% Most features of \pkg{nicematrix} may be used without explicit use of
-% \textsc{pgf} or TikZ (which, in fact, is not loaded by default).
+\medskip
+Most features of \pkg{nicematrix} may be used without explicit use of
+\textsc{pgf} or TikZ (which, in fact, is not loaded by default).
\medskip
\indexcommand{NiceMatrixOptions}
@@ -222,12 +222,7 @@
semi-global).
-\medskip
-\colorbox{yellow!50}{\bfseries New 7.0}\enskip \pkg{nicematrix} is
-compatible with the \emph{Tagging Project} : cf. p.~\pageref{Tagging Project}.
-
-
\newpage
\section{The environments of this package}
@@ -931,7 +926,7 @@
\bigskip
The command |\Block| supports also the keys |p| and |j|. With the key
\Definition{p}, the content of the block is formatted like a paragraph (as in a
-column of type |p|). That key may be used in conjunction with the key: |l|, |c|
+column of type |p|). That key may be used in conjunction with a key |l|, |c|
or |r|, and, in that case, the paragraph is formatted with |\raggedright|,
|\centering| or |\raggedleft| (or |\RaggedRight|, |\Centering| and |\RaggedLeft|
when \pkg{ragged2e}) est chargée. With the key \Definition{j} (which inforces
@@ -939,7 +934,7 @@
\bigskip
It's possible to put an environment |{itemize}| or |{enumerate}| in a block
-which uses the key~|p| or |j| (in the other case, you have a LaTeX error
+which uses the key~|p| or |j| (in the other case, you will have a LaTeX error:
|Not allowed in LR mode|). For the following example, we have loaded the package
\pkg{enumitem} (for the key |left| of the environment |{itemize}|).
@@ -2664,7 +2659,7 @@
It's also possible, in the |\CodeBefore|, to use the commands
\DefinitionCommand{EmptyColumn} and \DefinitionCommand{EmptyRow}. The command
|\EmptyColumn| takes in as argument a (comma-separated) list of numbers of
-columns and requires that no rules nor backbround colors will be drawn in the
+columns and requires that no rules nor background colors will be drawn in the
corresponding columns. The command |\EmptyRow| is similar for the rows.
\medskip
@@ -2716,14 +2711,15 @@
p.~\pageref{RowStyle}}
\item \DefinitionCommand{columncolor} which must be used in the preamble of the
environment with the same syntax as the corresponding command of \pkg{colortbl}
-(however, unlike the command columncolor of \pkg{colortbl}, this command
+(however, unlike the command |\columncolor| of \pkg{colortbl}, this command
|\columncolor| can appear within another command, itself used in the preamble of
-the array);
+the array; on the other hand, the two final optional arguments for fixing offset
+are not supported);
\item \DefinitionCommand{rowcolors} which takes in as arguments two colors and
color the rest of the tabular with those colors;
\item \DefinitionCommand{rowlistcolors} which takes in as argument a color and
color the rest of the tabular with the colors of that list of
-colors.\footnote{When the command |\rowlistcolors| (or the command |\rowcolors|
+colors.\footnote{When the command |\rowlistcolors| (or the command |\rowcolors|)
is used in a cell of the column~$j$ of the array, the command applies only on
the columns above~$j$ (by design).}
\end{itemize}
@@ -2804,7 +2800,7 @@
The extension \pkg{nicematrix} provides the special color \Definition{nocolor}
which may be used in all the coloring commands provided by \pkg{nicematrix} (in
-the |\CodeBefore| or the array itself).
+the |\CodeBefore| or in the array itself).
The cells marked by this color won't be colored, whatever the other instructions
of coloring which may apply to these cells.
@@ -2841,9 +2837,11 @@
The key \Definition{rowcolor} (alias: \Definition{fill}) sets the color of the
background and \Definition{opacity}\footnote{Caution: that feature creates instructions of
transparency in the \textsc{pdf} and some readers of \textsc{pdf} don't
- support such instructions.} sets its opacity. If the key
-\Definition{rounded-corners} is used, that background will have rounded-corners.
+ support such instructions.} sets its opacity.
+\item If the key \Definition{rounded-corners} is used, that background will have
+rounded-corners.
+
\item
\index{color!key of \texttt{\textbackslash RowStyle}}
The key \Definition{color} sets the color of the text.\footnote{The key
@@ -3896,6 +3894,8 @@
\indexcommand{Hbrace}
\indexcommand{Vbrace}
+\index{brace (nicematrix/brace is a TikZ style\newline used by \textbackslash
+ Hbrace et \textbackslash Vbrace)}
\index{tikz-braces (key at load-tome of \texttt{nicematrix)}}
\label{Hbrace}
@@ -3972,7 +3972,19 @@
& \Hbrace{3}{p} & \Hbrace[color=blue]{2}{q} \\
\end{NiceArray}$
+\medskip
+The TikZ style used by \pkg{nicematrix} to draw those braces is called
+\Definition{nicematrix/brace}. Here is the initial value of that style:
+\begin{Code}
+\emph{decoration = { brace , raise = -0.15 em } , }
+\emph{decorate }
+\end{Code}
+
+The final user can change that style TikZ as he wishes (respecting the structure
+with the keys |decorate| and |decoration|).
+
+
\medskip
For another example of use of |\Hbrace| and |\Vbrace|, see
the section ``Dotted lines that are no longer dotted'',
@@ -4450,7 +4462,7 @@
& a second sub-part \\
\bottomrule
\CodeAfter
- \emph{\SubMatrix{\{}{2-2}{3-2}{.}}
+ \emph{\SubMatrix{\lbrace}{2-2}{3-2}{.}}
\end{NiceTabular}
\end{Code}
\hspace{2cm}
@@ -4461,7 +4473,7 @@
& a second sub-part \\
\bottomrule
\CodeAfter
- \SubMatrix{\{}{2-2}{3-2}{.}
+ \SubMatrix{\lbrace}{2-2}{3-2}{.}
\end{NiceTabular}
\bigskip
@@ -4469,7 +4481,6 @@
using |\SubMatrix| in the |\CodeBefore|, the delimiters drawn by those
commands |\SubMatrix| are taken into account to limit the continuous dotted
lines (drawn by |\Cdots|, |\Vdots|, etc.) which have an open extremity.
-
For an example, see voir \ref{submatrix-in-codebefore}
p.~\pageref{submatrix-in-codebefore}.
@@ -4478,11 +4489,12 @@
\emph{Caution} : The following functionnality is fragile and does not work with
|latex|--|dvips|--|ps2pdf|.\par\nobreak
+\smallskip
The key \Definition{code} of the command |\SubMatrix| allows the insertion of
code after the construction of the submatrix. It's meant to be used to insert TikZ
instructions because, in the TikZ instructions inserted by that code, the
-nodes of the form \verb+i-|j+ are interpreted with |i| and |j| as
-numbers of row and columns \emph{relative to the submatrix}.\footnote{Be
+nodes of the form \texttt{i-j.\textsl{anchor}} or \verb+i-|j+ are interpreted
+with |i| and |j| as numbers of row and column \emph{relative to the submatrix}.\footnote{Be
careful: the syntax \verb+j|-i+ is \emph{not} allowed.}
\medskip
@@ -7120,8 +7132,10 @@
\interitem
If one prefers the braces of the library \pkg{decorations.pathreplacing} of TikZ, the
best way is to use the commands |\Hbrace| and |\Vbrace| provided by
-\pkg{nicematrix} (cf. p.~\pageref{Hbrace}).\footnote{Those commands are
-available only if TikZ has been loaded with the library \pkg{decorations.pathreplacing}.}
+\pkg{nicematrix} (cf. p.~\pageref{Hbrace}).\footnote{Remark that those commands are
+available only if TikZ has been loaded with the library
+\pkg{decorations.pathreplacing}: |\usepackage{TikZ}|
+|\usetikzlibrary{decorations.pathreplacing}|.}
\medskip
\begin{Code}[width=11cm]
Modified: branches/branch2024.final/Master/texmf-dist/source/latex/nicematrix/nicematrix-code.dtx
===================================================================
--- branches/branch2024.final/Master/texmf-dist/source/latex/nicematrix/nicematrix-code.dtx 2025-03-05 21:35:50 UTC (rev 74465)
+++ branches/branch2024.final/Master/texmf-dist/source/latex/nicematrix/nicematrix-code.dtx 2025-03-05 21:36:00 UTC (rev 74466)
@@ -17,8 +17,8 @@
%
% \fi
% \iffalse
-\def\myfileversion{7.1}
-\def\myfiledate{2025/02/01}
+\def\myfileversion{7.1a}
+\def\myfiledate{2025/03/04}
%
%
%<*batchfile>
@@ -1182,8 +1182,6 @@
% \end{macrocode}
%
% \bigskip
-% The use of |\l_@@_code_before_tl| is not clear. Maybe that, with the evolutions
-% of \pkg{nicematrix}, it has become obsolete. We should have a look at that.
% \begin{macrocode}
\tl_new:N \l_@@_code_before_tl
\bool_new:N \l_@@_code_before_bool
@@ -1208,7 +1206,7 @@
%
% \bigskip
% The L3 programming layer provides scratch dimensions |\l_tmpa_dim| and
-% |\l_tmpb_dim|. We creates several more in the same spirit.
+% |\l_tmpb_dim|. We create several more in the same spirit.
% \begin{macrocode}
\dim_new:N \l_@@_tmpc_dim
\dim_new:N \l_@@_tmpd_dim
@@ -1420,7 +1418,7 @@
%
% \medskip
% Here is the dimension for the width of the rule when a block (created by
-% |\Block|) is stroked.
+% |\Block|) is stroked or when the key |hvlines| is used.
% \begin{macrocode}
\dim_new:N \l_@@_line_width_dim
% \end{macrocode}
@@ -4537,8 +4535,7 @@
%
% The sequence |\g_@@_blocks_seq| will contain the carateristics of the blocks
% (specified by |\Block|) of the array. The sequence |\g_@@_pos_of_blocks_seq|
-% will contain only the position of the blocks (except the blocks with the key
-% |hvlines|).
+% will contain only the position of the blocks.
% \begin{macrocode}
\seq_gclear:N \g_@@_blocks_seq
\seq_gclear:N \g_@@_pos_of_blocks_seq
@@ -6208,7 +6205,10 @@
{ \int_use:N \c at iRow }
}
{ \int_eval:n { \c at jCol + #1 } }
- { } % for the name of the block
+% \end{macrocode}
+% The last argument is for the name of the block
+% \begin{macrocode}
+ { }
}
}
% \end{macrocode}
@@ -14188,8 +14188,8 @@
}
\bool_if:NF \l_@@_transparent_bool
{
- \bool_lazy_and:nnF \l_@@_vlines_block_bool \l_@@_hlines_block_bool
- {
+ \bool_lazy_and:nnF \l_@@_vlines_block_bool \l_@@_hlines_block_bool
+ {
% \end{macrocode}
% The sequence of the positions of the blocks (excepted the blocks with the key
% |hvlines|) will be used when drawing the rules (in fact, there is also the
@@ -14197,7 +14197,7 @@
% \begin{macrocode}
\seq_gput_left:Ne \g_@@_pos_of_blocks_seq
{ { #1 } { #2 } { #3 } { #4 } { \l_@@_block_name_str } }
- }
+ }
}
% \end{macrocode}
%
@@ -14896,6 +14896,9 @@
}
\group_end:
}
+% \end{macrocode}
+%
+% \begin{macrocode}
\cs_new_protected:Npn \@@_hlines_block:nnn #1 #2 #3
{
\group_begin:
@@ -16001,6 +16004,10 @@
}
% \end{macrocode}
%
+% \bigskip
+% Now, we deal with the key |code| of |\SubMatrix|. That key should contain a
+% TikZ instruction and the nodes in that instruction will be relative to the
+% current |\SubMatrix|. That's why we need a redefinition of |\pgfpointanchor|.
% \begin{macrocode}
\cs_set_eq:NN \pgfpointanchor \@@_pgfpointanchor:n
\flag_clear_new:N \l_@@_code_flag
@@ -16009,7 +16016,7 @@
% \end{macrocode}
%
% \bigskip
-% In the key |code| of the command |\SubMatrix| there may be Tikz instructions.
+% In the key |code| of the command |\SubMatrix| there may be TikZ instructions.
% We want that, in these instructions, the $i$ and $j$ in specifications of
% nodes of the forms $i$|-|$j$, |row-|$i$, |col-|$j$ and $i$\verb+-|+$j$ refer
% to the number of row and columm \emph{relative} of the current |\SubMatrix|.
@@ -16026,24 +16033,99 @@
% |\@@_pgfpointanchor_i:nn| before passing it to the original |\pgfpointanchor|.
% We have to act in an expandable way because the command |\pgfpointanchor| is
% used in names of Tikz nodes which are computed in an expandable way.
+%
+% The original command |\pgfpointanchor| takes in two arguments: the name of the
+% name and the name of the anchor. However, you don't have to modify the anchor,
+% and that's why we do a redefinition of |\pgfpointanchor| by curryfication.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_pgfpointanchor:n #1
- {
- \use:e
- { \exp_not:N \@@_old_pgfpointanchor { \@@_pgfpointanchor_i:nn #1 } }
- }
+\cs_new:Npn \@@_pgfpointanchor:n #1
+ { \exp_args:Ne \@@_old_pgfpointanchor { \@@_pgfpointanchor_i:n { #1 } } }
% \end{macrocode}
%
+% \medskip
+% First, we must detect whether the argument is of the form |\tikz at pp@name{...}|
+% (the command |\tikz at pp@name| is a command of TikZ that adds the prefix and the
+% suffix of the name. If the name refers to a TikZ node which does not exist,
+% there isn't the wrapper |\tikz at pp@name|.
+% \begin{macrocode}
+\cs_new:Npn \@@_pgfpointanchor_i:n #1
+ { \@@_pgfpointanchor_ii:w #1 \tikz at pp@name \q_stop }
+% \end{macrocode}
+%
+% \begin{macrocode}
+\cs_new:Npn \@@_pgfpointanchor_ii:w #1 \tikz at pp@name #2 \q_stop
+ {
+% \end{macrocode}
+% The command |\str_if_empty:nTF| is ``fully expandable''.
+% \begin{macrocode}
+ \str_if_empty:nTF { #1 }
+% \end{macrocode}
+% First, when the name of the name begins with |\tikz at pp@name|.
+% \begin{macrocode}
+ { \@@_pgfpointanchor_iv:w #2 }
+% \end{macrocode}
+% And now, when there is no |\tikz at pp@name|.
+% \begin{macrocode}
+ { \@@_pgfpointanchor_ii:n { #1 } }
+ }
+% \end{macrocode}
+%
+% In the case where the name begins with |\tikz at pp@name|, we must retrieve
+% the second |\tikz at pp@name|, that is to say to marker that we have added at the
+% end (cf. |\@@_pgfpointanchor_i:n|).
+% \begin{macrocode}
+\cs_new:Npn \@@_pgfpointanchor_iv:w #1 \tikz at pp@name
+ { \@@_pgfpointanchor_ii:n { #1 } }
+% \end{macrocode}
+%
% \bigskip
-% In fact, the argument of |\pgfpointanchor| is always of the form
-% |\a_command { name_of_node }| where ``|name_of_node|'' is the name of the Tikz
-% node without the potential prefix and suffix. That's why we catch two
-% arguments and work only on the second by trying (first) to extract an hyphen |-|.
+% With the command |\@@_pgfpointanchor_ii:n|, we deal with the actual name of
+% the node (without the |\tikz at pp@name|). First, we have to detect whether it is
+% of the form |i| of the form |i-j| (with an hyphen).
+%
+% Remark: It would be possible to test the presence of the hyphen in an
+% expandable way to using |\etl_if_in:nnTF| of the package \pkg{etl} but, as of
+% now, we do not load \pkg{etl}.
% \begin{macrocode}
-\cs_new:Npn \@@_pgfpointanchor_i:nn #1 #2
- { #1 { \@@_pgfpointanchor_ii:w #2 - \q_stop } }
+\cs_new:Npn \@@_pgfpointanchor_ii:n #1 { \@@_pgfpointanchor_i:w #1-\q_stop }
% \end{macrocode}
+% \bigskip
+% \begin{macrocode}
+\cs_new:Npn \@@_pgfpointanchor_i:w #1-#2\q_stop
+ {
+% \end{macrocode}
+% The command |\str_if_empty:nTF| is ``fully expandable''.
+% \begin{macrocode}
+ \str_if_empty:nTF { #2 }
+% \end{macrocode}
+% First the case where the argument does \emph{not} contain an hyphen.
+% \begin{macrocode}
+ { \@@_pgfpointanchor_iii:n { #1 } }
+% \end{macrocode}
+% And now the case the argument contains a hyphen. In that case, we have a weird
+% construction because we must retreive the extra hyphen we have added as marker
+% (cf. |\@@_pgfpointanchor_ii:n|).
+% \begin{macrocode}
+ { \@@_pgfpointanchor_iii:w { #1 } #2 }
+ }
+% \end{macrocode}
%
+%
+% The following function is for the case when the name contains an hyphen.
+% \begin{macrocode}
+\cs_new:Npn \@@_pgfpointanchor_iii:w #1 #2 -
+ {
+% \end{macrocode}
+% We have to add the prefix |\@@_env:| ``by hand'' since we have retreived the
+% potential |\tikz at pp@name|.
+% \begin{macrocode}
+ \@@_env:
+ - \int_eval:n { #1 + \l_@@_first_i_tl - 1 }
+ - \int_eval:n { #2 + \l_@@_first_j_tl - 1 }
+ }
+% \end{macrocode}
+%
+%
% \bigskip
% Since |\seq_if_in:NnTF| and |\clist_if_in:NnTF| are not expandable, we will
% use the following token list and |\str_case:nVTF| to test whether we have an
@@ -16060,58 +16142,49 @@
%
% \bigskip
% \begin{macrocode}
-\cs_new:Npn \@@_pgfpointanchor_ii:w #1-#2\q_stop
+\cs_new:Npn \@@_pgfpointanchor_iii:n #1
{
% \end{macrocode}
% If there is no hyphen, that means that the node is of the form of a single
% number (ex.: |5| or |11|). In that case, we are in an analysis which result
-% from a specification of node of the form $i$\verb+-|+$j$. In that case, the
-% $i$ of the number of row arrives first (and alone) in a |\pgfpointanchor| and,
-% the, the $j$ arrives (alone) in the following |\pgfpointanchor|. In order to
-% know whether we have a number of row or a number of column, we keep track of
-% the number of such treatments by the expandable flag called |nicematrix|.
+% from a specification of node of the form $i$\verb+-|+$j$. That special form is
+% the reason of the special form of the argument of |\pgfpointanchor| which
+% arises witht its command |\name_of_command| (see above).
+%
+% In that case, the $i$ of the number of row arrives first (and alone) in a
+% |\pgfpointanchor| and, the, the $j$ arrives (alone) in the following
+% |\pgfpointanchor|. In order to know whether we have a number of row or a
+% number of column, we keep track of the number of such treatments by the
+% expandable flag called |nicematrix|.
% \begin{macrocode}
- \tl_if_empty:nTF { #2 }
+ \str_case:nVTF { #1 } \c_@@_integers_alist_tl
+ {
+ \flag_raise:N \l_@@_code_flag
+% \end{macrocode}
+% We have to add the prefix |\@@_env:| ``by hand'' since we have retreived the
+% potential |\tikz at pp@name|.
+% \begin{macrocode}
+ \@@_env: -
+ \int_if_even:nTF { \flag_height:N \l_@@_code_flag }
+ { \int_eval:n { #1 + \l_@@_first_i_tl - 1 } }
+ { \int_eval:n { #1 + \l_@@_first_j_tl - 1 } }
+ }
{
- \str_case:nVTF { #1 } \c_@@_integers_alist_tl
- {
+ \str_if_eq:eeTF { #1 } { last }
+ {
\flag_raise:N \l_@@_code_flag
+ \@@_env: -
\int_if_even:nTF { \flag_height:N \l_@@_code_flag }
- { \int_eval:n { #1 + \l_@@_first_i_tl - 1 } }
- { \int_eval:n { #1 + \l_@@_first_j_tl - 1 } }
- }
- { #1 }
+ { \int_eval:n { \l_@@_last_i_tl + 1 } }
+ { \int_eval:n { \l_@@_last_j_tl + 1 } }
+ }
+ { #1 }
}
-% \end{macrocode}
-% If there is an hyphen, we have to see whether we have a node of the form
-% $i$|-|$j$, |row-|$i$ or |col-|$j$.
-% \begin{macrocode}
- { \@@_pgfpointanchor_iii:w { #1 } #2 }
}
% \end{macrocode}
%
+%
% \bigskip
-% There was an hyphen in the name of the node and that's why we have to retrieve
-% the extra hyphen we have put (cf. |\@@_pgfpointanchor_i:nn|).
-% \begin{macrocode}
-\cs_new:Npn \@@_pgfpointanchor_iii:w #1 #2 -
- {
- \str_case:nnF { #1 }
- {
- { row } { row - \int_eval:n { #2 + \l_@@_first_i_tl - 1 } }
- { col } { col - \int_eval:n { #2 + \l_@@_first_j_tl - 1 } }
- }
-% \end{macrocode}
-% Now the case of a node of the form $i$|-|$j$.
-% \begin{macrocode}
- {
- \int_eval:n { #1 + \l_@@_first_i_tl - 1 }
- - \int_eval:n { #2 + \l_@@_first_j_tl - 1 }
- }
- }
-% \end{macrocode}
-%
-% \medskip
% The command |\@@_node_left:nn| puts the left delimiter with the correct size.
% The argument |#1| is the delimiter to put. The argument |#2| is the name we
% will give to this PGF node (if the key |name| has been used in |\SubMatrix|).
@@ -16406,17 +16479,19 @@
{
\tikzset
{
- nicematrix~normal~brace / .style =
+ nicematrix / brace / .style =
{
- decoration = brace ,
+ decoration = { brace , raise = -0.15 em } ,
decorate ,
- outer~sep = 0.25 em
} ,
- nicematrix~mirrored~brace / .style =
+% \end{macrocode}
+% Unlike the previous one, the following set of keys is internal. It won't be
+% provided by the final user.
+% \begin{macrocode}
+ nicematrix / mirrored-brace / .style =
{
- decoration = { brace , mirror } ,
- decorate ,
- outer~sep = 0.25 em
+ nicematrix / brace ,
+ decoration = mirror ,
}
}
}
@@ -16464,7 +16539,7 @@
\NiceMatrixOptions{nullify-dots}
\Ldots
[
- line-style = nicematrix~normal~brace ,
+ line-style = nicematrix / brace ,
#1 ,
up =
\bool_if:NT \l_@@_tabular_bool \text { \exp_not:n { #3 } }
@@ -16473,7 +16548,7 @@
{
\Hdotsfor
[
- line-style = nicematrix~normal~brace ,
+ line-style = nicematrix / brace ,
#1 ,
up =
\bool_if:NT \l_@@_tabular_bool \text { \exp_not:n { #3 } }
@@ -16487,7 +16562,7 @@
\NiceMatrixOptions{nullify-dots}
\Ldots
[
- line-style = nicematrix~mirrored~brace ,
+ line-style = nicematrix / mirrored-brace ,
#1 ,
down =
\bool_if:NT \l_@@_tabular_bool \text { \exp_not:n { #3 } }
@@ -16496,7 +16571,7 @@
{
\Hdotsfor
[
- line-style = nicematrix~mirrored~brace ,
+ line-style = nicematrix / mirrored-brace ,
#1 ,
down =
\bool_if:NT \l_@@_tabular_bool \text { \exp_not:n { #3 } }
@@ -16531,7 +16606,7 @@
\NiceMatrixOptions{nullify-dots}
\Vdots
[
- line-style = nicematrix~mirrored~brace ,
+ line-style = nicematrix / mirrored-brace ,
#1 ,
down =
\bool_if:NT \l_@@_tabular_bool \text { \exp_not:n { #3 } }
@@ -16540,7 +16615,7 @@
{
\Vdotsfor
[
- line-style = nicematrix~mirrored~brace ,
+ line-style = nicematrix / mirrored-brace ,
#1 ,
down =
\bool_if:NT \l_@@_tabular_bool \text { \exp_not:n { #3 } }
@@ -16554,7 +16629,7 @@
\NiceMatrixOptions{nullify-dots}
\Vdots
[
- line-style = nicematrix~normal~brace ,
+ line-style = nicematrix / brace ,
#1 ,
up =
\bool_if:NT \l_@@_tabular_bool \text { \exp_not:n { #3 } }
@@ -16563,7 +16638,7 @@
{
\Vdotsfor
[
- line-style = nicematrix~normal~brace ,
+ line-style = nicematrix / brace ,
#1 ,
up =
\bool_if:NT \l_@@_tabular_bool \text { \exp_not:n { #3 } }
@@ -17058,10 +17133,11 @@
In~the~row~\int_eval:n { \c at iRow },~
~you~try~to~use~more~columns~than~allowed~by~your~
\@@_full_name_env:.\@@_message_hdotsfor:\ The~maximal~number~of~columns~is~
- \int_use:N \g_@@_static_num_of_col_int
+ \int_use:N \g_@@_static_num_of_col_int\
\bool_if:nT
{ \int_compare_p:nNn \l_@@_first_col_int = 0 || \g_@@_last_col_found_bool }
- { ~(plus~the~exterior~ones) }.~
+ { ~(plus~the~exterior~ones) }
+ since~the~preamble~is~'\g_@@_user_preamble_tl'.\\
This~error~is~fatal.
}
% \end{macrocode}
@@ -17071,10 +17147,11 @@
\@@_msg_new:nn { columns~not~used }
{
Columns~not~used.\\
- The~preamble~of~your~\@@_full_name_env:\ announces~\int_use:N
- \g_@@_static_num_of_col_int\ columns~but~you~use~only~\int_use:N \c at jCol.\\
+ The~preamble~of~your~\@@_full_name_env:\ is~'\g_@@_user_preamble_tl'.~
+ It~announces~\int_use:N
+ \g_@@_static_num_of_col_int\ columns~but~you~only~used~\int_use:N \c at jCol.\\
The~columns~you~did~not~used~won't~be~created.\\
- You~won't~have~similar~error~message~till~the~end~of~the~document.
+ You~won't~have~similar~warning~till~the~end~of~the~document.
}
% \end{macrocode}
%
@@ -17484,7 +17561,8 @@
% \begin{macrocode}
\@@_msg_new:nnn { width~without~X~columns }
{
- You~have~used~the~key~'width'~but~you~have~put~no~'X'~column.~
+ You~have~used~the~key~'width'~but~you~have~put~no~'X'~column~in~
+ the~preamble~('\g_@@_user_preamble_tl')~of~your~\@@_full_name_env:.\\
That~key~will~be~ignored.
}
{
@@ -17530,8 +17608,9 @@
\@@_msg_new:nn { Forbidden~letter }
{
Forbidden~letter.\\
- You~can't~use~the~letter~'#1'~for~a~customized~line.\\
- It~will~be~ignored.
+ You~can't~use~the~letter~'#1'~for~a~customized~line.~
+ It~will~be~ignored.\\
+ The~forbidden~letters~are:~\c_@@_forbidden_letters_str
}
% \end{macrocode}
%
@@ -17837,7 +17916,8 @@
\@@_msg_new:nn { One~letter~allowed }
{
Bad~name.\\
- The~value~of~key~'\l_keys_key_str'~must~be~of~length~1.\\
+ The~value~of~key~'\l_keys_key_str'~must~be~of~length~1~and~
+ you~have~used~'\l_keys_value_tl'.\\
It~will~be~ignored.
}
% \end{macrocode}
@@ -18324,7 +18404,7 @@
\@@_msg_new:nn { Invalid~col~number }
{
Invalid~column~number.\\
- A~color~instruction~the~\token_to_str:N \CodeBefore\
+ A~color~instruction~in~the~\token_to_str:N \CodeBefore\
specifies~a~column~which~is~outside~the~array.~It~will~be~ignored.
}
% \end{macrocode}
@@ -18333,7 +18413,7 @@
\@@_msg_new:nn { Invalid~row~number }
{
Invalid~row~number.\\
- A~color~instruction~the~\token_to_str:N \CodeBefore\
+ A~color~instruction~in~the~\token_to_str:N \CodeBefore\
specifies~a~row~which~is~outside~the~array.~It~will~be~ignored.
}
% \end{macrocode}
Modified: branches/branch2024.final/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty
===================================================================
--- branches/branch2024.final/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty 2025-03-05 21:35:50 UTC (rev 74465)
+++ branches/branch2024.final/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty 2025-03-05 21:36:00 UTC (rev 74466)
@@ -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{7.1}
-\def\myfiledate{2025/02/01}
+\def\myfileversion{7.1a}
+\def\myfiledate{2025/03/04}
\RequirePackage{pgfcore}
\usepgfmodule{shapes}
\RequirePackage{l3keys2e}
@@ -2877,7 +2877,7 @@
{ \int_use:N \c at iRow }
}
{ \int_eval:n { \c at jCol + #1 } }
- { } % for the name of the block
+ { }
}
}
\RenewDocumentCommand \cellcolor { O { } m }
@@ -7709,11 +7709,11 @@
}
\bool_if:NF \l__nicematrix_transparent_bool
{
- \bool_lazy_and:nnF \l__nicematrix_vlines_block_bool \l__nicematrix_hlines_block_bool
- {
+ \bool_lazy_and:nnF \l__nicematrix_vlines_block_bool \l__nicematrix_hlines_block_bool
+ {
\seq_gput_left:Ne \g__nicematrix_pos_of_blocks_seq
{ { #1 } { #2 } { #3 } { #4 } { \l__nicematrix_block_name_str } }
- }
+ }
}
\tl_if_empty:NF \l__nicematrix_draw_tl
{
@@ -8918,13 +8918,31 @@
\l__nicematrix_code_tl
}
\cs_set_eq:NN \__nicematrix_old_pgfpointanchor \pgfpointanchor
-\cs_new_protected:Npn \__nicematrix_pgfpointanchor:n #1
+\cs_new:Npn \__nicematrix_pgfpointanchor:n #1
+ { \exp_args:Ne \__nicematrix_old_pgfpointanchor { \__nicematrix_pgfpointanchor_i:n { #1 } } }
+\cs_new:Npn \__nicematrix_pgfpointanchor_i:n #1
+ { \__nicematrix_pgfpointanchor_ii:w #1 \tikz at pp@name \q_stop }
+\cs_new:Npn \__nicematrix_pgfpointanchor_ii:w #1 \tikz at pp@name #2 \q_stop
{
- \use:e
- { \exp_not:N \__nicematrix_old_pgfpointanchor { \__nicematrix_pgfpointanchor_i:nn #1 } }
+ \str_if_empty:nTF { #1 }
+ { \__nicematrix_pgfpointanchor_iv:w #2 }
+ { \__nicematrix_pgfpointanchor_ii:n { #1 } }
}
-\cs_new:Npn \__nicematrix_pgfpointanchor_i:nn #1 #2
- { #1 { \__nicematrix_pgfpointanchor_ii:w #2 - \q_stop } }
+\cs_new:Npn \__nicematrix_pgfpointanchor_iv:w #1 \tikz at pp@name
+ { \__nicematrix_pgfpointanchor_ii:n { #1 } }
+\cs_new:Npn \__nicematrix_pgfpointanchor_ii:n #1 { \__nicematrix_pgfpointanchor_i:w #1-\q_stop }
+\cs_new:Npn \__nicematrix_pgfpointanchor_i:w #1-#2\q_stop
+ {
+ \str_if_empty:nTF { #2 }
+ { \__nicematrix_pgfpointanchor_iii:n { #1 } }
+ { \__nicematrix_pgfpointanchor_iii:w { #1 } #2 }
+ }
+\cs_new:Npn \__nicematrix_pgfpointanchor_iii:w #1 #2 -
+ {
+ \__nicematrix_env:
+ - \int_eval:n { #1 + \l__nicematrix_first_i_tl - 1 }
+ - \int_eval:n { #2 + \l__nicematrix_first_j_tl - 1 }
+ }
\tl_const:Nn \c__nicematrix_integers_alist_tl
{
{ 1 } { } { 2 } { } { 3 } { } { 4 } { } { 5 } { }
@@ -8932,33 +8950,28 @@
{ 11 } { } { 12 } { } { 13 } { } { 14 } { } { 15 } { }
{ 16 } { } { 17 } { } { 18 } { } { 19 } { } { 20 } { }
}
-\cs_new:Npn \__nicematrix_pgfpointanchor_ii:w #1-#2\q_stop
+\cs_new:Npn \__nicematrix_pgfpointanchor_iii:n #1
{
- \tl_if_empty:nTF { #2 }
+ \str_case:nVTF { #1 } \c__nicematrix_integers_alist_tl
{
- \str_case:nVTF { #1 } \c__nicematrix_integers_alist_tl
+ \flag_raise:N \l__nicematrix_code_flag
+ \__nicematrix_env: -
+ \int_if_even:nTF { \flag_height:N \l__nicematrix_code_flag }
+ { \int_eval:n { #1 + \l__nicematrix_first_i_tl - 1 } }
+ { \int_eval:n { #1 + \l__nicematrix_first_j_tl - 1 } }
+ }
+ {
+ \str_if_eq:eeTF { #1 } { last }
{
\flag_raise:N \l__nicematrix_code_flag
+ \__nicematrix_env: -
\int_if_even:nTF { \flag_height:N \l__nicematrix_code_flag }
- { \int_eval:n { #1 + \l__nicematrix_first_i_tl - 1 } }
- { \int_eval:n { #1 + \l__nicematrix_first_j_tl - 1 } }
- }
- { #1 }
+ { \int_eval:n { \l__nicematrix_last_i_tl + 1 } }
+ { \int_eval:n { \l__nicematrix_last_j_tl + 1 } }
+ }
+ { #1 }
}
- { \__nicematrix_pgfpointanchor_iii:w { #1 } #2 }
}
-\cs_new:Npn \__nicematrix_pgfpointanchor_iii:w #1 #2 -
- {
- \str_case:nnF { #1 }
- {
- { row } { row - \int_eval:n { #2 + \l__nicematrix_first_i_tl - 1 } }
- { col } { col - \int_eval:n { #2 + \l__nicematrix_first_j_tl - 1 } }
- }
- {
- \int_eval:n { #1 + \l__nicematrix_first_i_tl - 1 }
- - \int_eval:n { #2 + \l__nicematrix_first_j_tl - 1 }
- }
- }
\cs_new_protected:Npn \__nicematrix_node_left:nn #1 #2
{
\pgfnode
@@ -9191,17 +9204,15 @@
{
\tikzset
{
- nicematrix~normal~brace / .style =
+ nicematrix / brace / .style =
{
- decoration = brace ,
+ decoration = { brace , raise = -0.15 em } ,
decorate ,
- outer~sep = 0.25 em
} ,
- nicematrix~mirrored~brace / .style =
+ nicematrix / mirrored-brace / .style =
{
- decoration = { brace , mirror } ,
- decorate ,
- outer~sep = 0.25 em
+ nicematrix / brace ,
+ decoration = mirror ,
}
}
}
@@ -9230,7 +9241,7 @@
\NiceMatrixOptions{nullify-dots}
\Ldots
[
- line-style = nicematrix~normal~brace ,
+ line-style = nicematrix / brace ,
#1 ,
up =
\bool_if:NT \l__nicematrix_tabular_bool \text { \exp_not:n { #3 } }
@@ -9239,7 +9250,7 @@
{
\Hdotsfor
[
- line-style = nicematrix~normal~brace ,
+ line-style = nicematrix / brace ,
#1 ,
up =
\bool_if:NT \l__nicematrix_tabular_bool \text { \exp_not:n { #3 } }
@@ -9253,7 +9264,7 @@
\NiceMatrixOptions{nullify-dots}
\Ldots
[
- line-style = nicematrix~mirrored~brace ,
+ line-style = nicematrix / mirrored-brace ,
#1 ,
down =
\bool_if:NT \l__nicematrix_tabular_bool \text { \exp_not:n { #3 } }
@@ -9262,7 +9273,7 @@
{
\Hdotsfor
[
- line-style = nicematrix~mirrored~brace ,
+ line-style = nicematrix / mirrored-brace ,
#1 ,
down =
\bool_if:NT \l__nicematrix_tabular_bool \text { \exp_not:n { #3 } }
@@ -9287,7 +9298,7 @@
\NiceMatrixOptions{nullify-dots}
\Vdots
[
- line-style = nicematrix~mirrored~brace ,
+ line-style = nicematrix / mirrored-brace ,
#1 ,
down =
\bool_if:NT \l__nicematrix_tabular_bool \text { \exp_not:n { #3 } }
@@ -9296,7 +9307,7 @@
{
\Vdotsfor
[
- line-style = nicematrix~mirrored~brace ,
+ line-style = nicematrix / mirrored-brace ,
#1 ,
down =
\bool_if:NT \l__nicematrix_tabular_bool \text { \exp_not:n { #3 } }
@@ -9310,7 +9321,7 @@
\NiceMatrixOptions{nullify-dots}
\Vdots
[
- line-style = nicematrix~normal~brace ,
+ line-style = nicematrix / brace ,
#1 ,
up =
\bool_if:NT \l__nicematrix_tabular_bool \text { \exp_not:n { #3 } }
@@ -9319,7 +9330,7 @@
{
\Vdotsfor
[
- line-style = nicematrix~normal~brace ,
+ line-style = nicematrix / brace ,
#1 ,
up =
\bool_if:NT \l__nicematrix_tabular_bool \text { \exp_not:n { #3 } }
@@ -9674,19 +9685,21 @@
In~the~row~\int_eval:n { \c at iRow },~
~you~try~to~use~more~columns~than~allowed~by~your~
\__nicematrix_full_name_env:.\__nicematrix_message_hdotsfor:\ The~maximal~number~of~columns~is~
- \int_use:N \g__nicematrix_static_num_of_col_int
+ \int_use:N \g__nicematrix_static_num_of_col_int\
\bool_if:nT
{ \int_compare_p:nNn \l__nicematrix_first_col_int = 0 || \g__nicematrix_last_col_found_bool }
- { ~(plus~the~exterior~ones) }.~
+ { ~(plus~the~exterior~ones) }
+ since~the~preamble~is~'\g__nicematrix_user_preamble_tl'.\\
This~error~is~fatal.
}
\__nicematrix_msg_new:nn { columns~not~used }
{
Columns~not~used.\\
- The~preamble~of~your~\__nicematrix_full_name_env:\ announces~\int_use:N
- \g__nicematrix_static_num_of_col_int\ columns~but~you~use~only~\int_use:N \c at jCol.\\
+ The~preamble~of~your~\__nicematrix_full_name_env:\ is~'\g__nicematrix_user_preamble_tl'.~
+ It~announces~\int_use:N
+ \g__nicematrix_static_num_of_col_int\ columns~but~you~only~used~\int_use:N \c at jCol.\\
The~columns~you~did~not~used~won't~be~created.\\
- You~won't~have~similar~error~message~till~the~end~of~the~document.
+ You~won't~have~similar~warning~till~the~end~of~the~document.
}
\__nicematrix_msg_new:nn { empty~preamble }
{
@@ -9975,7 +9988,8 @@
}
\__nicematrix_msg_new:nnn { width~without~X~columns }
{
- You~have~used~the~key~'width'~but~you~have~put~no~'X'~column.~
+ You~have~used~the~key~'width'~but~you~have~put~no~'X'~column~in~
+ the~preamble~('\g__nicematrix_user_preamble_tl')~of~your~\__nicematrix_full_name_env:.\\
That~key~will~be~ignored.
}
{
@@ -10008,8 +10022,9 @@
\__nicematrix_msg_new:nn { Forbidden~letter }
{
Forbidden~letter.\\
- You~can't~use~the~letter~'#1'~for~a~customized~line.\\
- It~will~be~ignored.
+ You~can't~use~the~letter~'#1'~for~a~customized~line.~
+ It~will~be~ignored.\\
+ The~forbidden~letters~are:~\c__nicematrix_forbidden_letters_str
}
\__nicematrix_msg_new:nn { Several~letters }
{
@@ -10226,7 +10241,8 @@
\__nicematrix_msg_new:nn { One~letter~allowed }
{
Bad~name.\\
- The~value~of~key~'\l_keys_key_str'~must~be~of~length~1.\\
+ The~value~of~key~'\l_keys_key_str'~must~be~of~length~1~and~
+ you~have~used~'\l_keys_value_tl'.\\
It~will~be~ignored.
}
\__nicematrix_msg_new:nn { TabularNote~in~CodeAfter }
@@ -10648,13 +10664,13 @@
\__nicematrix_msg_new:nn { Invalid~col~number }
{
Invalid~column~number.\\
- A~color~instruction~the~\token_to_str:N \CodeBefore\
+ A~color~instruction~in~the~\token_to_str:N \CodeBefore\
specifies~a~column~which~is~outside~the~array.~It~will~be~ignored.
}
\__nicematrix_msg_new:nn { Invalid~row~number }
{
Invalid~row~number.\\
- A~color~instruction~the~\token_to_str:N \CodeBefore\
+ A~color~instruction~in~the~\token_to_str:N \CodeBefore\
specifies~a~row~which~is~outside~the~array.~It~will~be~ignored.
}
More information about the tex-live-commits
mailing list.