From 0b2ae1a0d39f8b9035311e4fd7745686b73c8393 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sat, 2 Jan 2021 03:04:02 +0000 Subject: CTAN sync 202101020304 --- .../latex/contrib/nicematrix/nicematrix-french.pdf | Bin 429184 -> 433072 bytes .../latex/contrib/nicematrix/nicematrix-french.tex | 91 +- macros/latex/contrib/nicematrix/nicematrix.dtx | 1013 +++++++++++--------- macros/latex/contrib/nicematrix/nicematrix.pdf | Bin 1078185 -> 1080998 bytes 4 files changed, 610 insertions(+), 494 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 6ce7fd41b2..c203937ba5 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-french.tex b/macros/latex/contrib/nicematrix/nicematrix-french.tex index d634e3ff1e..1e14babd29 100644 --- a/macros/latex/contrib/nicematrix/nicematrix-french.tex +++ b/macros/latex/contrib/nicematrix/nicematrix-french.tex @@ -119,7 +119,8 @@ avec une distribution TeX comme MiKTeX ou TeXlive. \bigskip Cette extension peut être utilisée avec |xelatex|, |lualatex| et |pdflatex| mais aussi avec le cheminement -classique |latex|-|dvips|-|ps2pdf| (ou Adobe Distiller). +classique |latex|-|dvips|-|ps2pdf| (ou Adobe Distiller). \textsl{Néanmoins, le fichier nicematrix-french.tex de la présente documentation +ne peut être compilé qu'avec XeLaTeX.} \bigskip Cette extension nécessite et charge les extensions \pkg{l3keys2e}, \pkg{xparse}, \pkg{array}, \pkg{amsmath} et @@ -547,8 +548,7 @@ aussi fixer l'épaisseur du trait avec la clé |line-width|. \subsection{Les blocs mono-colonne} -\colorbox{yellow!30}{Nouveau 5.4}\enskip Les blocs mono-colonne ont un -comportement spécial. +Les blocs mono-colonne ont un comportement spécial. \begin{itemize} \item La largeur naturelle du contenu de ces blocs est prise en compte pour la largeur de la colonne courante. @@ -1281,40 +1281,72 @@ le \textsc{pdf}. est disponible quand \pkg{xcolor} est chargé avec l'option |table|.}. Le \emph{s} rappelle qu'il y a deux couleurs. Elle colorie alternativement les rangées avec les deux couleurs à partir de la rangée dont le numéro est donné en -premier argument (obligatoire). +premier argument (obligatoire), comme le fait la commande |\rowcolors| de +\pkg{xcolor}. + +\colorbox{yellow!50}{\textbf{Nouveau 5.8}}\enskip +En fait, le premier argument (obligatoire) peut, plus généralement, contenir +une liste d'intervalles correspondant à l'ensemble des rangées sur lesquelles +portera l'effet de |\rowcolors| (un intervalle de la forme $i$ désigne en fait +l'intervalle constitué de toutes les rangées du tableau à partir de de la rangée~$i$). + + +\bigskip +La commande |\rowcolors| accepte une liste de paires clé-valeur comme argument +optionnel en dernière position (l'argument optionel en première position +correspond à l'espace colorimétrique). Les clés disponibles sont |cols|, +|restart| et |respect-blocks|. +\begin{itemize} +\item \colorbox{yellow!50}{\textbf{Nouveau 5.8}}\enskip +La clé |cols| décrit un ensemble de colonnes sur lesquelles portera +l'effet de |\rowcolors|. Cet ensemble de colonnes est une liste d'intervalles de +la forme $i$|-|$j$. + +\item \colorbox{yellow!50}{\textbf{Nouveau 5.8}}\enskip Avec la clé |restart|, chacun +des intervalles de rangées spécifié par le premier argument de |\rowcolors| +recommence avec la même couleur.\footnote{Autrement, la couleur d'une rangée ne + dépend que de la partié de son number.} + + +\item Avec la clé |respect-blocks|, qui est de type booléen, les ``rangées'' +colorées alternativement peuvent s'étendre sur plusieurs rangées réelles du +tableau pour englober les blocs (créés par la commande |\Block|). +\end{itemize} + \medskip \begin{scope} \hfuzz=10cm \begin{BVerbatim}[baseline=c,boxwidth=9cm] -\begin{NiceTabular}{lr}[hlines,code-before = ~emphase#\rowcolors{1}{blue!10}{}@] -Pierre & 12 \\ -Jacques & 8 \\ -Stéphanie & 18 \\ -Amélie & 20 \\ -Henri & 14 \\ -Estelle & 15 +\begin{NiceTabular}{clr}% + [hvlines,code-before = ~emphase#{\rowcolors{2}{blue!10}{}[cols=2-3,restart]}@] +\Block{1-3}{Résultats} \\ +\Block{2-1}{A}& Pierre & 12 \\ + & Jacques & 8 \\ +\Block{4-1}{B}& Stéphanie & 18 \\ + & Amélie & 20 \\ + & Henri & 14 \\ + & Estelle & 15 \end{NiceTabular} \end{BVerbatim} -\begin{NiceTabular}{lr}[hlines,code-before = \rowcolors{1}{blue!10}{},baseline=3] -Pierre & 12 \\ -Jacques & 8 \\ -Stéphanie & 18 \\ -Amélie & 20 \\ -Henri & 14 \\ -Estelle & 15 +\begin{NiceTabular}{clr}[hvlines, + code-before = {\rowcolors{2}{blue!10}{}[cols=2-3,restart]},baseline=2] +\Block{1-3}{Résultats} \\ +\Block{2-1}{A}& Pierre & 12 \\ + & Jacques & 8 \\ +\Block{4-1}{B}& Stéphanie & 18 \\ + & Amélie & 20 \\ + & Henri & 14 \\ + & Estelle & 15 \end{NiceTabular} \end{scope} -\bigskip -Il existe une option |respect-blocks| pour la commande |\rowcolors|. Avec cette -option, les ``rangées'' colorées alternativement peuvent s'étendre sur plusieurs -rangées réelles du tableau pour englober les blocs. -\medskip +\vspace{1cm} + \begin{scope} \hfuzz=10cm -\begin{BVerbatim}[baseline=c,boxwidth=9cm] +\begin{BVerbatim}[baseline=c,boxwidth=11cm] \begin{NiceTabular}{lr}[hvlines,code-before = ~emphase#\rowcolors{1}{blue!10}{}[respect-blocks]@] \Block{2-1}{Pierre} & 12 \\ @@ -2481,8 +2513,7 @@ colonne). \item Si la clé |notes/para| est utilisée, les notes sont composées à la fin du tableau en un seul paragraphe. -\item \colorbox{yellow!30}{Nouveau 5.4}\enskip -Il existe une clé |tabularnote| qui permet d'insérer du texte dans la zone +\item Il existe une clé |tabularnote| qui permet d'insérer du texte dans la zone des notes avant les notes numérotées. \item Si l'extension \pkg{booktabs} a été chargée (avant ou après @@ -3989,10 +4020,10 @@ pointillées. \NiceMatrixOptions {nullify-dots,code-for-first-col = \color{blue},code-for-first-col=\color{blue}} $\begin{pNiceMatrix}[first-row,first-col] - & & \Ldots[line-style={solid,<->},shorten=0pt]^{n \text{ columns}} \\ + & & \Ldots[line-style={solid,<->},shorten=0pt]^{n \text{ colonnes}} \\ & 1 & 1 & 1 & \Ldots & 1 \\ & 1 & 1 & 1 & & 1 \\ -\Vdots[line-style={solid,<->}]_{n \text{ rows}} +\Vdots[line-style={solid,<->}]_{n \text{ rangées}} & 1 & 1 & 1 & & 1 \\ & 1 & 1 & 1 & & 1 \\ & 1 & 1 & 1 & \Ldots & 1 @@ -4004,10 +4035,10 @@ $\begin{pNiceMatrix}[first-row,first-col] \NiceMatrixOptions {nullify-dots,code-for-first-col = \color{blue},code-for-first-row=\color{blue}} \[\begin{pNiceMatrix}[first-row,first-col] - & & \Ldots[line-style={solid,<->},shorten=0pt]^{n \text{ columns}} \\ + & & \Ldots[line-style={solid,<->},shorten=0pt]^{n \text{ colonnes}} \\ & 1 & 1 & 1 & \Ldots & 1 \\ & 1 & 1 & 1 & & 1 \\ -\Vdots[line-style={solid,<->}]_{n \text{ rows}} & 1 & 1 & 1 & & 1 \\ +\Vdots[line-style={solid,<->}]_{n \text{ rangées}} & 1 & 1 & 1 & & 1 \\ & 1 & 1 & 1 & & 1 \\ & 1 & 1 & 1 & \Ldots & 1 \end{pNiceMatrix}\] diff --git a/macros/latex/contrib/nicematrix/nicematrix.dtx b/macros/latex/contrib/nicematrix/nicematrix.dtx index b485a9139d..83f99f5cbd 100644 --- a/macros/latex/contrib/nicematrix/nicematrix.dtx +++ b/macros/latex/contrib/nicematrix/nicematrix.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright (C) 2018-2020 by F. Pantigny +% Copyright (C) 2018-2021 by F. Pantigny % ----------------------------------- % % This file may be distributed and/or modified under the @@ -15,8 +15,8 @@ % % \fi % \iffalse -\def\myfileversion{5.7} -\def\myfiledate{2020/11/23} +\def\myfileversion{5.8} +\def\myfiledate{2021/01/01} % % %<*batchfile> @@ -26,7 +26,7 @@ \usedir{tex/latex/nicematrix} \preamble -Copyright (C) 2018-2020 by F. Pantigny +Copyright (C) 2018-2021 by F. Pantigny ----------------------------------- This file may be distributed and/or modified under the @@ -162,6 +162,8 @@ version 2005/12/01 or later. % \bigskip % This package can be used with |xelatex|, |lualatex|, |pdflatex| but also by % the classical workflow |latex|-|dvips|-|ps2pdf| (or Adobe Distiller). +% \textsl{However, the file nicematrix.dtx of the present documentation should +% be compiled with XeLaTeX.} % % \bigskip % This package requires and \textbf{loads} the packages \pkg{l3keys2e}, @@ -585,8 +587,7 @@ version 2005/12/01 or later. % % \subsection{The mono-column blocks} % -% % \colorbox{yellow!30}{New 5.4}\enskip The mono-column blocks have a -% special behaviour. +% The mono-column blocks have a special behaviour. % % \begin{itemize} % \item The natural width of the contents of these blocks is taken into account @@ -1288,15 +1289,41 @@ version 2005/12/01 or later. % command |\rowcolors| of \pkg{xcolor}\footnote{The command |\rowcolors| of % \pkg{xcolor} is available when \pkg{xcolor} is loaded with the % option~|table|.}. The \emph{s} emphasizes the fact that there is \emph{two} -% colors. This command colors alternately the rows of the tabular, beginning -% with the row whose number is given in first (mandatory) argument. The two -% other (mandatory) arguments are the colors. +% colors. This command colors alternately the rows of the tabular with the +% tow colors (provided in second and third argument), beginning +% with the row whose number is given in first (mandatory) argument. +% +% \colorbox{yellow!50}{\textbf{New 5.8}}\enskip In fact, the first (mandatory) +% argument is, more generally, a comma separated list of intervals describing +% the rows involved in the action of |\rowcolors| (an interval of the form +% $i$|-| describes in fact the interval of all the rows of the tabular, +% beginning with the row~$i$). +% +% +% +% \bigskip +% The last argument of |\rowcolors| is an optional list of pairs key-value (the +% optional argument in the first position corresponds to the colorimetric +% space). The available keys are |cols|, |restart| and |respect-blocks|. +% \begin{itemize} +% \item \colorbox{yellow!50}{\textbf{New 5.8}}\enskip The key |cols| describes a +% set of columns. The command |\rowcolors| will color only the cells of these +% columns. The value is a comma-separated list of intervals of the form $i$-$j$. +% \item \colorbox{yellow!50}{\textbf{New 5.8}}\enskip With the key |restart|, +% each interval of rows (specified by the first mandatory argument) begins with +% the same color.\footnote{Otherwise, the color of a given row relies only upon the +% parity of its number.} +% \item With the key |respect-blocks| the ``rows'' alternately colored may extend over +% several rows if they have to incorporate blocks (created with the command |\Block|). +% \end{itemize} % % \medskip % \begin{scope} % \hfuzz=10cm -% \begin{BVerbatim}[baseline=c,boxwidth=9cm] -% \begin{NiceTabular}{~LetterAt{}lr~LetterAt{}}[hlines,code-before = ~emphase#\rowcolors{1}{blue!10}{}@] +% \begin{BVerbatim}[baseline=c,boxwidth=10cm] +% \begin{NiceTabular}{clr} +% [hvlines,code-before = ~emphase#{\rowcolors{2}{blue!10}{}[cols=2-3,restart]}@] +% \Block{1-3}{Results} \\ % John & 12 \\ % Stephen & 8 \\ % Sarah & 18 \\ @@ -1305,25 +1332,22 @@ version 2005/12/01 or later. % Madison & 15 % \end{NiceTabular} % \end{BVerbatim} -% \begin{NiceTabular}{@{}lr@{}}[hlines,code-before = \rowcolors{1}{blue!10}{},baseline=3] -% John & 12 \\ -% Stephen & 8 \\ -% Sarah & 18 \\ -% Ashley & 20 \\ -% Henry & 14 \\ -% Madison & 15 +% \begin{NiceTabular}{clr}[hvlines,code-before = +% {\rowcolors{2}{blue!10}{}[cols=2-3,restart]},baseline=2] +% \Block{1-3}{Results} \\ +% \Block{2-1}{A}& John & 12 \\ +% & Stephen & 8 \\ +% \Block{4-1}{B}& Sarah & 18 \\ +% & Ashley & 20 \\ +% & Henry & 14 \\ +% & Madison & 15 % \end{NiceTabular} % \end{scope} % -% \bigskip -% There is a key |respect-blocks| for the instruction |\rowcolors|. With that -% key, the ``rows'' alternately colored may extend over several rows if they -% have to incorporate blocks. -% -% \medskip +% \vspace{1cm} % \begin{scope} % \hfuzz=10cm -% \begin{BVerbatim}[baseline=c,boxwidth=9cm] +% \begin{BVerbatim}[baseline=c,boxwidth=10cm] % \begin{NiceTabular}{lr}[hvlines,code-before = % ~emphase#\rowcolors{1}{blue!10}{}[respect-blocks]@] % \Block{2-1}{John} & 12 \\ @@ -2431,9 +2455,8 @@ version 2005/12/01 or later. % \item If the key |notes/para| is used, the notes are composed at the end of % the array in a single paragraph (as with the key |para| of \pkg{threeparttable}). % -% \item \colorbox{yellow!30}{New 5.4}\enskip There is a key -% |tabularnote| which provides a way to insert some text in the zone of the -% notes before the numbered tabular notes. +% \item There is a key |tabularnote| which provides a way to insert some text in +% the zone of the notes before the numbered tabular notes. % % \item If the package \pkg{booktabs} has been loaded (before or after % \pkg{nicematrix}), the key |notes/bottomrule| draws a |\bottomrule| of @@ -5110,7 +5133,9 @@ version 2005/12/01 or later. % \bigskip % The following command will be able to reconstruct the full name of the current % command or environment (despite its name which contains \textsl{env}). This -% command must \emph{not} be protected since it will be used in error messages. +% command must \emph{not} be protected since it will be used in error messages +% and we have to use |\str_if_eq:VnTF| and not |\tl_if_eq:NnTF| because we need +% to be fully expandable). % \begin{macrocode} \cs_new:Npn \@@_full_name_env: { @@ -5767,13 +5792,13 @@ version 2005/12/01 or later. % \end{macrocode} % % \bigskip -% The string |\l_@@_baseline_str| may contain one of the three values |t|, +% The string |\l_@@_baseline_tl| may contain one of the three values |t|, % |c| or |b| as in the option of the environment |{array}|. However, it may also % contain an integer (which represents the number of the row to which align the % array). % \begin{macrocode} -\str_new:N \l_@@_baseline_str -\tl_set:Nn \l_@@_baseline_str c +\str_new:N \l_@@_baseline_tl +\tl_set:Nn \l_@@_baseline_tl c % \end{macrocode} % % \bigskip @@ -6062,10 +6087,10 @@ version 2005/12/01 or later. % The options |c|, |t| and |b| of the environment |{NiceArray}| have the same % meaning as the option of the classical environment |{array}|. % \begin{macrocode} - c .code:n = \tl_set:Nn \l_@@_baseline_str c , - t .code:n = \tl_set:Nn \l_@@_baseline_str t , - b .code:n = \tl_set:Nn \l_@@_baseline_str b , - baseline .tl_set:N = \l_@@_baseline_str , + c .code:n = \tl_set:Nn \l_@@_baseline_tl c , + t .code:n = \tl_set:Nn \l_@@_baseline_tl t , + b .code:n = \tl_set:Nn \l_@@_baseline_tl b , + baseline .tl_set:N = \l_@@_baseline_tl , baseline .value_required:n = true , columns-width .code:n = \tl_if_eq:nnTF { #1 } { auto } @@ -6456,7 +6481,7 @@ version 2005/12/01 or later. % \begin{macrocode} \cs_new_protected:Npn \@@_begin_of_row: { - \refstepcounter { iRow } + \int_gincr:N \c@iRow \dim_gset_eq:NN \g_@@_dp_ante_last_row_dim \g_@@_dp_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 } @@ -6734,11 +6759,12 @@ version 2005/12/01 or later. \@tabarray } % \end{macrocode} -% |\l_@@_baseline_str| may have the value |t|, |c| or |b|. However, if the value +% |\l_@@_baseline_tl| may have the value |t|, |c| or |b|. However, if the value % is |b|, we compose the |\array| (of \pkg{array}) with the option |t| and the -% right translation will be done further. +% right translation will be done further. Remark that |\str_if_eq:VnTF| is +% fully expandable and you need something fully expandable here. % \begin{macrocode} - [ \str_if_eq:VnTF \l_@@_baseline_str c c t ] + [ \str_if_eq:VnTF \l_@@_baseline_tl c c t ] } % \end{macrocode} % @@ -6862,11 +6888,11 @@ version 2005/12/01 or later. % When the key |colortbl-like| is used, the following code will be executed. % \begin{macrocode} \cs_new_protected:Npn \@@_colortbl_like: - { - \cs_set_eq:NN \cellcolor \@@_cellcolor_tabular - \cs_set_eq:NN \rowcolor \@@_rowcolor_tabular - \cs_set_eq:NN \columncolor \@@_columncolor_preamble - } + { + \cs_set_eq:NN \cellcolor \@@_cellcolor_tabular + \cs_set_eq:NN \rowcolor \@@_rowcolor_tabular + \cs_set_eq:NN \columncolor \@@_columncolor_preamble + } % \end{macrocode} % % \bigskip @@ -6936,7 +6962,7 @@ version 2005/12/01 or later. % % The box |\@arstrutbox| is a box constructed in the beginning of the % environment |{array}|. The construction of that box takes into account the -% current values of |\arraystretch|\footnote{The option |small| of +% current value of |\arraystretch|\footnote{The option |small| of % \pkg{nicematrix} changes (among other) the value of |\arraystretch|. This is % done, of course, before the call of |{array}|.} and |\extrarowheight| (of % \pkg{array}). That box is inserted (via |\@arstrut|) in the beginning of each @@ -7445,11 +7471,6 @@ version 2005/12/01 or later. \int_compare:nNnT \l_@@_last_col_int > { -1 } { \@@_error:n { last~col~not~used } } } - \bool_if:NF \l_@@_Matrix_bool - { - \int_compare:nNnT \c@jCol < \g_@@_static_num_of_col_int - { \@@_error:n { columns~not~used } } - } % \end{macrocode} % % We fix also the value of |\c@iRow| and |\g_@@_row_total_int| with the @@ -7483,7 +7504,7 @@ version 2005/12/01 or later. % \begin{macrocode} \bool_if:NTF \l_@@_NiceArray_bool { - \str_case:VnF \l_@@_baseline_str + \str_case:VnF \l_@@_baseline_tl { b \@@_use_arraybox_with_notes_b: c \@@_use_arraybox_with_notes_c: @@ -7577,6 +7598,15 @@ version 2005/12/01 or later. \skip_horizontal:N \g_@@_width_last_col_dim \skip_horizontal:N \col@sep } + \bool_if:NF \l_@@_Matrix_bool + { + \int_compare:nNnT \c@jCol < \g_@@_static_num_of_col_int + { \@@_error:n { columns~not~used } } + } + \group_begin: + \globaldefs = 1 + \@@_msg_redirect_name:nn { columns~not~used } { error } + \group_end: \@@_after_array: % \end{macrocode} % The aim of the following |\egroup| (the corresponding |\bgroup| is, of course, @@ -7857,6 +7887,7 @@ version 2005/12/01 or later. \@@_Cell: \begin { minipage } [ #1 ] { #3 } \mode_leave_vertical: + \arraybackslash % added in the version 5.8 \box_use:N \@arstrutbox } c @@ -7970,7 +8001,7 @@ version 2005/12/01 or later. { \box_set_ht:Nn \l_tmpa_box { \box_ht:N \l_tmpa_box + \l_tmpa_dim } \box_set_dp:Nn \l_tmpa_box { \box_dp:N \l_tmpa_box + \l_tmpb_dim } - \str_if_eq:VnTF \l_@@_baseline_str { c } + \tl_if_eq:NnTF \l_@@_baseline_tl { c } { \box_use_drop:N \l_tmpa_box } \@@_put_box_in_flow_i: } @@ -7978,7 +8009,7 @@ version 2005/12/01 or later. % % \medskip % The command |\@@_put_box_in_flow_i:| is used when the value of -% |\l_@@_baseline_str| is different of |c| (which is the initial value and the +% |\l_@@_baseline_tl| is different of |c| (which is the initial value and the % most used). % \begin{macrocode} \cs_new_protected:Npn \@@_put_box_in_flow_i: @@ -7993,24 +8024,24 @@ version 2005/12/01 or later. % Now, |\g_tmpa_dim| contains the $y$-value of the center of the array (the % delimiters are centered in relation with this value). % \begin{macrocode} - \str_if_in:NnTF \l_@@_baseline_str { line- } + \str_if_in:NnTF \l_@@_baseline_tl { line- } { \int_set:Nn \l_tmpa_int { \str_range:Nnn - \l_@@_baseline_str + \l_@@_baseline_tl 6 - { \str_count:N \l_@@_baseline_str } + { \tl_count:V \l_@@_baseline_tl } } \@@_qpoint:n { row - \int_use:N \l_tmpa_int } } { - \str_case:VnF \l_@@_baseline_str + \str_case:VnF \l_@@_baseline_tl { { t } { \int_set:Nn \l_tmpa_int 1 } { b } { \int_set_eq:NN \l_tmpa_int \c@iRow } } - { \int_set:Nn \l_tmpa_int \l_@@_baseline_str } + { \int_set:Nn \l_tmpa_int \l_@@_baseline_tl } \bool_lazy_or:nnT { \int_compare_p:nNn \l_tmpa_int < \l_@@_first_row_int } { \int_compare_p:nNn \l_tmpa_int > \g_@@_row_total_int } @@ -8155,28 +8186,28 @@ version 2005/12/01 or later. % \end{macrocode} % We convert a value of |t| to a value of |1|. % \begin{macrocode} - \str_if_eq:VnT \l_@@_baseline_str { t } - { \tl_set:Nn \l_@@_baseline_str { 1 } } + \tl_if_eq:NnT \l_@@_baseline_tl { t } + { \tl_set:Nn \l_@@_baseline_tl { 1 } } % \end{macrocode} -% Now, we convert the value of |\l_@@_baseline_str| (which should represent an +% Now, we convert the value of |\l_@@_baseline_tl| (which should represent an % integer) to an integer stored in |\l_tmpa_int|. % \begin{macrocode} \pgfpicture \@@_qpoint:n { row - 1 } \dim_gset_eq:NN \g_tmpa_dim \pgf@y - \str_if_in:NnTF \l_@@_baseline_str { line- } + \str_if_in:NnTF \l_@@_baseline_tl { line- } { \int_set:Nn \l_tmpa_int { \str_range:Nnn - \l_@@_baseline_str + \l_@@_baseline_tl 6 - { \str_count:N \l_@@_baseline_str } + { \tl_count:V \l_@@_baseline_tl } } \@@_qpoint:n { row - \int_use:N \l_tmpa_int } } { - \int_set:Nn \l_tmpa_int \l_@@_baseline_str + \int_set:Nn \l_tmpa_int \l_@@_baseline_tl \bool_lazy_or:nnT { \int_compare_p:nNn \l_tmpa_int < \l_@@_first_row_int } { \int_compare_p:nNn \l_tmpa_int > \g_@@_row_total_int } @@ -8452,7 +8483,7 @@ version 2005/12/01 or later. { \hbox { - \skip_horizontal:N 0.5 \arrayrulewidth + \skip_horizontal:N 0.5\arrayrulewidth \pgfsys@markposition { \@@_env: - col - 1 } \skip_horizontal:N -0.5\arrayrulewidth } @@ -9116,7 +9147,7 @@ version 2005/12/01 or later. { \tl_gset:cn { g_@@_code_before_ \int_use:N \g_@@_env_int _ tl } - { \g_nicematrix_code_before_tl } + { \exp_not:V \g_nicematrix_code_before_tl } } \iow_now:Nn \@mainaux \ExplSyntaxOff \bool_set_true:N \l_@@_code_before_bool @@ -9129,7 +9160,7 @@ version 2005/12/01 or later. \@@_restore_iRow_jCol: % \end{macrocode} % The command |\CT@arc@| contains the instruction of color for the rules of the -% array\footnote{e.g. |\color[rgb]{0.5,0.5,0}|)}. This command is used by +% array\footnote{e.g. |\color[rgb]{0.5,0.5,0}|}. This command is used by % |\CT@arc@| but we use it also for compatibility with \pkg{colortbl}. But we % want also to be able to use color for the rules of the array when % \pkg{colortbl} is \emph{not} loaded. That's why we do the following @@ -9154,24 +9185,27 @@ version 2005/12/01 or later. % \begin{macrocode} \cs_new_protected:Npn \@@_adjust_pos_of_blocks_seq: { - \seq_gclear:N \g_tmpa_seq - \seq_map_inline:Nn \g_@@_pos_of_blocks_seq + \seq_gset_map_x:NNn \g_@@_pos_of_blocks_seq \g_@@_pos_of_blocks_seq { \@@_adjust_pos_of_blocks_seq_i:nnnn ##1 } - \seq_gset_eq:NN \g_@@_pos_of_blocks_seq \g_tmpa_seq } % \end{macrocode} % +% The following command must \emph{not} be protected. % \begin{macrocode} -\cs_new_protected:Npn \@@_adjust_pos_of_blocks_seq_i:nnnn #1 #2 #3 #4 +\cs_new:Npn \@@_adjust_pos_of_blocks_seq_i:nnnn #1 #2 #3 #4 { - \int_compare:nNnTF { #3 } > { 99 } - { \int_set_eq:NN \l_tmpa_int \c@iRow } - { \int_set:Nn \l_tmpa_int { #3 } } - \int_compare:nNnTF { #4 } > { 99 } - { \int_set_eq:NN \l_tmpb_int \c@jCol } - { \int_set:Nn \l_tmpb_int { #4 } } - \seq_gput_right:Nx \g_tmpa_seq - { { #1 } { #2 } { \int_use:N \l_tmpa_int } { \int_use:N \l_tmpb_int } } + { #1 } + { #2 } + { + \int_compare:nNnTF { #3 } > { 99 } + { \int_use:N \c@iRow } + { #3 } + } + { + \int_compare:nNnTF { #4 } > { 99 } + { \int_use:N \c@jCol } + { #4 } + } } % \end{macrocode} % @@ -10403,7 +10437,7 @@ version 2005/12/01 or later. % deprecated. % \begin{macrocode} { - \exp_args:Ne \str_case:nn { \tl_lower_case:n { #2 } } + \exp_args:Ne \str_case:nn { \str_foldcase:n { #2 } } { l { > \@@_Cell: l < \@@_end_Cell: } r { > \@@_Cell: r < \@@_end_Cell: } @@ -10456,7 +10490,9 @@ version 2005/12/01 or later. % \begin{macrocode} \cs_new:Npn \@@_Hdotsfor: { - \int_compare:nNnTF \c@jCol = 0 + \bool_lazy_and:nnTF + { \int_compare_p:nNn \c@jCol = 0 } + { \int_compare_p:nNn \l_@@_first_col_int = 0 } { \bool_if:NTF \g_@@_after_col_zero_bool { @@ -10807,32 +10843,44 @@ version 2005/12/01 or later. } % \end{macrocode} % -% % \bigskip -% Here an example : |\@@_rowcolor {red!15} {1,3,5-7,10-}| +% The following command uses two implicit arguments : |\l_@@_rows_tl| and +% |\l_@@_cols_tl| which are specifications for a set of row and a set of +% columns. The cartesian product is filled with the current color. % \begin{macrocode} -\NewDocumentCommand \@@_rowcolor { O { } m m } +\cs_new_protected:Npn \@@_cartesian_fill: { - \tl_if_blank:nF { #2 } - { - \pgfpicture - \pgf@relevantforpicturesizefalse - \tl_if_empty:nTF { #1 } \color { \color [ #1 ] } { #2 } % \end{macrocode} -% |\l_tmpa_dim| is the $x$-value of the right side of the rows. +% We begin the loop over the columns. % \begin{macrocode} - \@@_qpoint:n { col - 1} - \int_compare:nNnTF \l_@@_first_col_int = 0 - { \dim_set:Nn \l_tmpc_dim { \pgf@x + 0.5 \arrayrulewidth } } + \clist_map_inline:Nn \l_@@_cols_tl + { + \tl_set:Nn \l_tmpa_tl { ##1 } + \tl_if_in:NnTF \l_tmpa_tl { - } + { \@@_cut_on_hyphen:w ##1 \q_stop } + { \@@_cut_on_hyphen:w ##1 - ##1 \q_stop } + \tl_if_empty:NT \l_tmpa_tl { \tl_set:Nn \l_tmpa_tl { 1 } } + \tl_if_empty:NT \l_tmpb_tl + { \tl_set:Nx \l_tmpb_tl { \int_use:N \c@jCol } } + \int_compare:nNnT \l_tmpb_tl > \c@jCol + { \tl_set:Nx \l_tmpb_tl { \int_use:N \c@jCol } } + \@@_qpoint:n { col - \l_tmpa_tl } + \bool_lazy_and:nnTF + { \str_if_eq_p:Vn \l_tmpa_tl 0 } + { \int_compare_p:nNn \l_@@_first_col_int > 0 } { \dim_set:Nn \l_tmpc_dim { \pgf@x - 0.5 \arrayrulewidth } } - \@@_qpoint:n { col - \@@_succ:n \c@jCol } + { \dim_set:Nn \l_tmpc_dim { \pgf@x + 0.5 \arrayrulewidth } } + \@@_qpoint:n { col - \@@_succ:n \l_tmpb_tl } \dim_set:Nn \l_tmpa_dim { \pgf@x + 0.5 \arrayrulewidth } - \clist_map_inline:nn { #3 } +% \end{macrocode} +% We begin the loop over the rows +% \begin{macrocode} + \clist_map_inline:Nn \l_@@_rows_tl { - \tl_set:Nn \l_tmpa_tl { ##1 } + \tl_set:Nn \l_tmpa_tl { ####1 } \tl_if_in:NnTF \l_tmpa_tl { - } - { \@@_cut_on_hyphen:w ##1 \q_stop } - { \@@_cut_on_hyphen:w ##1 - ##1 \q_stop } + { \@@_cut_on_hyphen:w ####1 \q_stop } + { \@@_cut_on_hyphen:w ####1 - ####1 \q_stop } \tl_if_empty:NT \l_tmpa_tl { \tl_set:Nn \l_tmpa_tl { 1 } } \tl_if_empty:NT \l_tmpb_tl { \tl_set:Nx \l_tmpb_tl { \int_use:N \c@iRow } } @@ -10849,12 +10897,35 @@ version 2005/12/01 or later. { \pgfpoint \l_tmpc_dim \l_tmpd_dim } { \pgfpoint \l_tmpa_dim \l_tmpb_dim } } - \pgfusepathqfill + } + \pgfusepathqfill + } +% \end{macrocode} +% +% +% \bigskip +% Here is an example : |\@@_rowcolor {red!15} {1,3,5-7,10-}| +% \begin{macrocode} +\NewDocumentCommand \@@_rowcolor { O { } m m } + { + \tl_if_blank:nF { #2 } + { + \pgfpicture + \pgf@relevantforpicturesizefalse + \tl_if_empty:nTF { #1 } \color { \color [ #1 ] } { #2 } + \tl_set:Nn \l_@@_rows_tl { #3 } + \tl_set:Nn \l_@@_cols_tl { - } +% \end{macrocode} +% The command |\@@_cartesian_fill:| takes in two implicit arguments: +% |\l_@@_cols_tl| and |\l_@@_row_tl|. +% \begin{macrocode} + \@@_cartesian_fill: \endpgfpicture } } % \end{macrocode} % +% % \bigskip % Here an example : |\@@_columncolor:nn {red!15} {1,3,5-7,10-}| % \begin{macrocode} @@ -10865,215 +10936,215 @@ version 2005/12/01 or later. \pgfpicture \pgf@relevantforpicturesizefalse \tl_if_empty:nTF { #1 } \color { \color [ #1 ] } { #2 } - \@@_qpoint:n { row - 1 } + \tl_set:Nn \l_@@_rows_tl { - } + \tl_set:Nn \l_@@_cols_tl { #3 } % \end{macrocode} -% |\l_tmpa_dim| is the $y$-value of the top of the columns et |\l_tmpb_dim| is -% the $y$-value of the bottom. +% The command |\@@_cartesian_fill:| takes in two implicit arguments: +% |\l_@@_cols_tl| and |\l_@@_row_tl|. % \begin{macrocode} - \dim_set:Nn \l_tmpa_dim {\pgf@y + 0.5 \arrayrulewidth } - \@@_qpoint:n { row - \@@_succ:n \c@iRow } - \dim_set:Nn \l_tmpb_dim { \pgf@y + 0.5 \arrayrulewidth } - \clist_map_inline:nn { #3 } - { - \tl_set:Nn \l_tmpa_tl { ##1 } - \tl_if_in:NnTF \l_tmpa_tl { - } - { \@@_cut_on_hyphen:w ##1 \q_stop } - { \@@_cut_on_hyphen:w ##1 - ##1 \q_stop } - \tl_if_empty:NT \l_tmpa_tl { \tl_set:Nn \l_tmpa_tl { 1 } } - \tl_if_empty:NT \l_tmpb_tl - { \tl_set:Nx \l_tmpb_tl { \int_use:N \c@jCol } } - \int_compare:nNnT \l_tmpb_tl > \c@jCol - { \tl_set:Nx \l_tmpb_tl { \int_use:N \c@jCol } } -% \end{macrocode} -% Now, the numbers of both columns are in |\l_tmpa_tl| and |\l_tmpb_tl|. -% \begin{macrocode} - \@@_qpoint:n { col - \l_tmpa_tl } - \int_compare:nNnTF \l_@@_first_col_int = \l_tmpa_tl - { \dim_set:Nn \l_tmpc_dim { \pgf@x - 0.5 \arrayrulewidth } } - { \dim_set:Nn \l_tmpc_dim { \pgf@x + 0.5 \arrayrulewidth } } - \@@_qpoint:n { col - \@@_succ:n \l_tmpb_tl } - \dim_set:Nn \l_tmpd_dim { \pgf@x + 0.5 \arrayrulewidth } - \pgfpathrectanglecorners - { \pgfpoint \l_tmpc_dim \l_tmpa_dim } - { \pgfpoint \l_tmpd_dim \l_tmpb_dim } - } - \pgfusepathqfill + \@@_cartesian_fill: \endpgfpicture } } % \end{macrocode} % +% % \bigskip -% Here an example : |\@@_cellcolor[rgb]{0.5,0.5,0}{2-3,3-4,4-5,5-6}| +% Here is an example : |\@@_rectanglecolor{red!15}{2-3}{5-6}| % \begin{macrocode} -\NewDocumentCommand \@@_cellcolor { O { } m m } +\NewDocumentCommand \@@_rectanglecolor { O { } m m m } { \tl_if_blank:nF { #2 } { \pgfpicture \pgf@relevantforpicturesizefalse \tl_if_empty:nTF { #1 } \color { \color [ #1 ] } { #2 } - \clist_map_inline:nn { #3 } - { - \@@_cut_on_hyphen:w ##1 \q_stop - \@@_qpoint:n { row - \l_tmpa_tl } - \bool_lazy_and:nnT - { \int_compare_p:n { \l_tmpa_tl <= \c@iRow } } - { \int_compare_p:n { \l_tmpb_tl <= \c@jCol } } - { - \dim_set:Nn \l_tmpb_dim { \pgf@y + 0.5 \arrayrulewidth } - \@@_qpoint:n { row - \@@_succ:n \l_tmpa_tl } - \dim_set:Nn \l_tmpa_dim { \pgf@y + 0.5 \arrayrulewidth } - \@@_qpoint:n { col - \l_tmpb_tl } - \int_compare:nNnTF \l_@@_first_col_int = \l_tmpb_tl - { \dim_set:Nn \l_tmpc_dim { \pgf@x - 0.5 \arrayrulewidth } } - { \dim_set:Nn \l_tmpc_dim { \pgf@x + 0.5 \arrayrulewidth } } - \@@_qpoint:n { col - \@@_succ:n \l_tmpb_tl } - \dim_set:Nn \l_tmpd_dim { \pgf@x + 0.5 \arrayrulewidth } - \pgfpathrectanglecorners - { \pgfpoint \l_tmpc_dim \l_tmpb_dim } - { \pgfpoint \l_tmpd_dim \l_tmpa_dim } - } - } - \pgfusepathqfill + \@@_rectanglecolor_i:nn { #3 } { #4 } \endpgfpicture } } % \end{macrocode} % % \bigskip -% Here an example : |\@@_rectanglecolor{red!15}{2-3}{5-6}| % \begin{macrocode} -\NewDocumentCommand \@@_rectanglecolor { O { } m m m } +\cs_new_protected:Npn \@@_rectanglecolor_i:nn #1 #2 + { + \@@_cut_on_hyphen:w #1 \q_stop + \tl_clear_new:N \l_tmpc_tl + \tl_clear_new:N \l_tmpd_tl + \tl_set_eq:NN \l_tmpc_tl \l_tmpa_tl + \tl_set_eq:NN \l_tmpd_tl \l_tmpb_tl + \@@_cut_on_hyphen:w #2 \q_stop + \tl_set:Nx \l_@@_rows_tl { \l_tmpc_tl - \l_tmpa_tl } + \tl_set:Nx \l_@@_cols_tl { \l_tmpd_tl - \l_tmpb_tl } +% \end{macrocode} +% The command |\@@_cartesian_fill:| takes in two implicit arguments: +% |\l_@@_cols_tl| and |\l_@@_row_tl|. +% \begin{macrocode} + \@@_cartesian_fill: + } +% \end{macrocode} +% +% +% \bigskip +% Here is an example : |\@@_cellcolor[rgb]{0.5,0.5,0}{2-3,3-4,4-5,5-6}| +% \begin{macrocode} +\NewDocumentCommand \@@_cellcolor { O { } m m } { \tl_if_blank:nF { #2 } { \pgfpicture \pgf@relevantforpicturesizefalse \tl_if_empty:nTF { #1 } \color { \color [ #1 ] } { #2 } - \@@_cut_on_hyphen:w #3 \q_stop - \bool_lazy_and:nnT - { \int_compare_p:n { \l_tmpa_tl <= \c@iRow } } - { \int_compare_p:n { \l_tmpb_tl <= \c@jCol } } - { - \@@_qpoint:n { row - \l_tmpa_tl } - \dim_set:Nn \l_tmpb_dim { \pgf@y + 0.5 \arrayrulewidth } - \@@_qpoint:n { col - \l_tmpb_tl } - \int_compare:nNnTF \l_@@_first_col_int = \l_tmpb_tl - { \dim_set:Nn \l_tmpc_dim { \pgf@x - 0.5 \arrayrulewidth } } - { \dim_set:Nn \l_tmpc_dim { \pgf@x + 0.5 \arrayrulewidth } } - \@@_cut_on_hyphen:w #4 \q_stop - \int_compare:nNnT \l_tmpa_tl > \c@iRow - { \tl_set:Nx \l_tmpa_tl { \int_use:N \c@iRow } } - \int_compare:nNnT \l_tmpb_tl > \c@jCol - { \tl_set:Nx \l_tmpb_tl { \int_use:N \c@jCol } } - \@@_qpoint:n { row - \@@_succ:n \l_tmpa_tl } - \dim_set:Nn \l_tmpa_dim { \pgf@y + 0.5 \arrayrulewidth } - \@@_qpoint:n { col - \@@_succ:n \l_tmpb_tl } - \dim_set:Nn \l_tmpd_dim { \pgf@x + 0.5 \arrayrulewidth } - \pgfpathrectanglecorners - { \pgfpoint \l_tmpc_dim \l_tmpb_dim } - { \pgfpoint \l_tmpd_dim \l_tmpa_dim } - \pgfusepathqfill - } + \clist_map_inline:nn { #3 } + { \@@_rectanglecolor_i:nn { ##1 } { ##1 } } + \pgfusepathqfill \endpgfpicture } } % \end{macrocode} -% -% +% % \bigskip -% The command |\rowcolors| (accessible in the |code-before|) is inspired by the -% command |\rowcolors| of the package \pkg{xcolor} (with the option |table|). -% However, the command |\rowcolors| of \pkg{nicematrix} has \emph{not} the -% optional argument of the command |\rowcolors| of \pkg{xcolor}. Here is an -% example: |\rowcolors{1}{blue!10}{}[respect-blocks]|. -% -% The last optional argument is for options. As of now, there is only one key -% available : |respect-blocks|. -% % \begin{macrocode} \keys_define:nn { NiceMatrix / rowcolors } { respect-blocks .bool_set:N = \l_@@_respect_blocks_bool , respect-blocks .default:n = true , + cols .tl_set:N = \l_@@_cols_tl , + restart .bool_set:N = \l_@@_rowcolors_restart_bool , + restart .default:n = true , unknown .code:n = \@@_error:n { Unknown~option~for~rowcolors } } % \end{macrocode} +% +% \medskip +% The command |\rowcolors| (accessible in the |code-before|) is inspired by the +% command |\rowcolors| of the package \pkg{xcolor} (with the option |table|). +% However, the command |\rowcolors| of \pkg{nicematrix} has \emph{not} the +% optional argument of the command |\rowcolors| of \pkg{xcolor}. Here is an +% example: |\rowcolors{1}{blue!10}{}[respect-blocks]|. % +% |#1| (optional) is the color space ; +% |#2| is a list of intervals of rows ; +% |#3| is the first color ; +% |#4| is the second color ; +% |#5| is for the optional list of pairs key-value. % \begin{macrocode} \NewDocumentCommand \@@_rowcolors { O { } m m m O { } } { +% \end{macrocode} +% The group is for the options. +% \begin{macrocode} + \group_begin: + \tl_clear_new:N \l_@@_cols_tl + \tl_set:Nn \l_@@_cols_tl { - } \keys_set:nn { NiceMatrix / rowcolors } { #5 } - \bool_lazy_and:nnTF - \l_@@_respect_blocks_bool - { \cs_if_exist_p:c { c_@@_pos_of_blocks_ \int_use:N \g_@@_env_int _ seq } } - { \@@_rowcolors_i:nnnn { #1 } { #2 } { #3 } { #4 } } - { - \int_step_inline:nnn { #2 } { \int_use:N \c@iRow } - { - \int_if_odd:nTF { ##1 } - { \@@_rowcolor [ #1 ] { #3 } } - { \@@_rowcolor [ #1 ] { #4 } } - { ##1 } - } - } - } % \end{macrocode} -% -% +% The boolean |\l_tmpa_bool| will indicate whereas we are in a row of the first +% color or of the second color. % \begin{macrocode} -\cs_new_protected:Npn \@@_rowcolors_i:nnnn #1 #2 #3 #4 - { - \seq_set_eq:Nc \l_tmpb_seq - { c_@@_pos_of_blocks_ \int_use:N \g_@@_env_int _ seq } + \bool_set_true:N \l_tmpa_bool + \bool_lazy_and:nnT + \l_@@_respect_blocks_bool + { + \cs_if_exist_p:c + { c_@@_pos_of_blocks_ \int_use:N \g_@@_env_int _ seq } } + { % \end{macrocode} % We don't want to take into account a block which is completely in the ``first -% column'' of (number $0$) or in the ``last column''. +% column'' of (number $0$) or in the ``last column'' and that's why we filter +% the sequence of the blocks (in a the sequence |\l_tmpa_seq|). % \begin{macrocode} - \seq_set_filter:NNn \l_tmpa_seq \l_tmpb_seq - { \@@_not_in_exterior_p:nnnn ##1 } -% \end{macrocode} + \seq_set_eq:Nc \l_tmpb_seq + { c_@@_pos_of_blocks_ \int_use:N \g_@@_env_int _ seq } + \seq_set_filter:NNn \l_tmpa_seq \l_tmpb_seq + { \@@_not_in_exterior_p:nnnn ##1 } + } + \pgfpicture + \pgf@relevantforpicturesizefalse + \clist_map_inline:nn { #2 } + { + \tl_set:Nn \l_tmpa_tl { ##1 } + \tl_if_in:NnTF \l_tmpa_tl { - } + { \@@_cut_on_hyphen:w ##1 \q_stop } + { \tl_set:Nx \l_tmpb_tl { \int_use:N \c@iRow } } +% \end{macrocode} % The counter |\l_tmpa_int| will be the index of the loop. % \begin{macrocode} - \int_set:Nn \l_tmpa_int { #2 } + \int_set:Nn \l_tmpa_int \l_tmpa_tl + \bool_if:NTF \l_@@_rowcolors_restart_bool + { \bool_set_true:N \l_tmpa_bool } + { \bool_set:Nn \l_tmpa_bool { \int_if_odd_p:n { \l_tmpa_tl } } } + \int_zero_new:N \l_tmpc_int + \int_set:Nn \l_tmpc_int \l_tmpb_tl + \int_do_until:nNnn \l_tmpa_int > \l_tmpc_int + { % \end{macrocode} -% The boolean |\l_tmpa_bool| will indicate whereas we are in a row of the first -% color or of the second color. +% We will compute in |\l_tmpb_int| the last row of the ``block''. % \begin{macrocode} - \bool_set_false:N \l_tmpa_bool + \int_set_eq:NN \l_tmpb_int \l_tmpa_int % \end{macrocode} -% We recall that, in the |code-before|, |\c@iRow| is the total number of rows of -% the array (excepted the potential exterior rows). +% If the key |respect-blocks| is in force, we have to adjust that value (of +% course). % \begin{macrocode} - \int_do_until:nNnn \l_tmpa_int > \c@iRow - { - \seq_set_filter:NNn \l_tmpb_seq \l_tmpa_seq - { \@@_intersect_our_row_p:nnnn ##1 } + \bool_lazy_and:nnT + \l_@@_respect_blocks_bool + { + \cs_if_exist_p:c + { c_@@_pos_of_blocks_ \int_use:N \g_@@_env_int _ seq } + } + { + \seq_set_filter:NNn \l_tmpb_seq \l_tmpa_seq + { \@@_intersect_our_row_p:nnnn ####1 } + \seq_map_inline:Nn \l_tmpb_seq { \@@_rowcolors_i:nnnn ####1 } % \end{macrocode} -% We compute in |\l_tmpb_int| the last row covered by a block. +% Now, the last row of the block is computed in |\l_tmpb_int|. % \begin{macrocode} - \int_set_eq:NN \l_tmpb_int \l_tmpa_int - \seq_map_inline:Nn \l_tmpb_seq { \@@_rowcolors_ii:nnnn ##1 } - \bool_if:NTF \l_tmpa_bool - { - \@@_rowcolor [ #1 ] { #4 } - { \int_use:N \l_tmpa_int - \int_use:N \l_tmpb_int } - \bool_set_false:N \l_tmpa_bool - } - { - \@@_rowcolor [ #1 ] { #3 } + } + \tl_set:Nx \l_@@_rows_tl { \int_use:N \l_tmpa_int - \int_use:N \l_tmpb_int } - \bool_set_true:N \l_tmpa_bool + \bool_if:NTF \l_tmpa_bool + { + \tl_if_blank:nF { #3 } + { + \tl_if_empty:nTF { #1 } + \color + { \color [ #1 ] } + { #3 } +% \end{macrocode} +% The command |\@@_cartesian_fill:| takes in two implicit arguments: +% |\l_@@_cols_tl| and |\l_@@_row_tl|. +% \begin{macrocode} + \@@_cartesian_fill: + } + \bool_set_false:N \l_tmpa_bool + } + { + \tl_if_blank:nF { #4 } + { + \tl_if_empty:nTF { #1 } + \color + { \color [ #1 ] } + { #4 } +% \end{macrocode} +% The command |\@@_cartesian_fill:| takes in two implicit arguments: +% |\l_@@_cols_tl| and |\l_@@_row_tl|. +% \begin{macrocode} + \@@_cartesian_fill: + } + \bool_set_true:N \l_tmpa_bool + } + \int_set:Nn \l_tmpa_int { \l_tmpb_int + 1 } } - \int_set:Nn \l_tmpa_int { \l_tmpb_int + 1 } } + \endpgfpicture + \group_end: } % \end{macrocode} % % \bigskip % \begin{macrocode} -\cs_new_protected:Npn \@@_rowcolors_ii:nnnn #1 #2 #3 #4 +\cs_new_protected:Npn \@@_rowcolors_i:nnnn #1 #2 #3 #4 { \int_compare:nNnT { #3 } > \l_tmpb_int { \int_set:Nn \l_tmpb_int { #3 } } @@ -11110,6 +11181,7 @@ version 2005/12/01 or later. } % \end{macrocode} % +% % \bigskip % \begin{macrocode} \NewDocumentCommand \@@_chessboardcolors { O { } m m } @@ -12614,21 +12686,10 @@ version 2005/12/01 or later. } % \end{macrocode} % Now, |\l_tmpa_tl| contains an ``object'' corresponding to the position of the -% block whith four components, each of them surrounded by curly brackets: +% block with four components, each of them surrounded by curly brackets: % % |{|\textsl{imin}|}{|\textsl{jmin}|}{|\textsl{imax}|}{|\textsl{jmax}|}|. % -% We store this information in the sequence |\g_@@_pos_of_blocks_seq|. -% \begin{macrocode} - \seq_gput_left:NV \g_@@_pos_of_blocks_seq \l_tmpa_tl -% \end{macrocode} -% We also store a complete description of the block in the sequence -% |\g_@@_blocks_seq|. Of course, the sequences |\g_@@_pos_of_blocks_seq| and -% |\g_@@_blocks_seq| are redundant, but it's for efficiency. In -% |\g_@@_blocks_seq|, each block is represented by an ``object'' with six -% components: -% -% |{|\textsl{imin}|}{|\textsl{jmin}|}{|\textsl{imax}|}{|\textsl{jmax}|}{|\textsl{options}|}{|\textsl{contents}|}|. % % \medskip % If the block is mono-column or mono-row, we have a special treatment. That's @@ -12771,7 +12832,7 @@ version 2005/12/01 or later. % alignement and that's why we put a key corresponding to the value of % |\l_@@_pos_of_block_tl|, which is fixed by the type of current column. % \begin{macrocode} - { #3 , \l_@@_pos_of_block_tl } + { \exp_not:n { #3 } , \l_@@_pos_of_block_tl } { \box_use_drop:c { g_@@_ block _ box _ \int_use:N \g_@@_block_box_int _ box } @@ -12791,7 +12852,7 @@ version 2005/12/01 or later. \seq_gput_right:Nx \g_@@_blocks_seq { \l_tmpa_tl - { #3 } + { \exp_not:n { #3 } } \exp_not:n { { @@ -12886,14 +12947,7 @@ version 2005/12/01 or later. % % \begin{macrocode} \cs_new_protected:Npn \@@_Block_iii:nnnnnn #1 #2 #3 #4 #5 #6 - { -% \end{macrocode} -% The group is for the keys. -% \begin{macrocode} - \group_begin: - \keys_set:nn { NiceMatrix / Block / SecondPass } { #5 } -% \end{macrocode} -% + { % The integer |\l_@@_last_row_int| will be the last row of the block and % |\l_@@_last_col_int| its last column. % \begin{macrocode} @@ -12915,7 +12969,42 @@ version 2005/12/01 or later. \int_compare:nNnTF { #4 } > { 99 } { \int_set_eq:NN \l_@@_last_col_int \c@jCol } { \int_set:Nn \l_@@_last_col_int { #4 } } + \bool_lazy_or:nnTF + { \int_compare_p:nNn \l_@@_last_row_int > \g_@@_row_total_int } + { \int_compare_p:nNn \l_@@_last_col_int > \g_@@_col_total_int } + { + \int_compare:nTF + { \l_@@_last_col_int <= \g_@@_static_num_of_col_int } + { + \msg_error:nnnn { nicematrix } { Block~too~large~2 } { #1 } { #2 } + \@@_msg_redirect_name:nn { Block~too~large~2 } { none } + \group_begin: + \globaldefs = 1 + \@@_msg_redirect_name:nn { columns~not~used } { none } + \group_end: + } + { \msg_error:nnnn { nicematrix } { Block~too~large~1 } { #1 } { #2 } } + } + { \@@_Block_iv:nnnnnn { #1 } { #2 } { #3 } { #4 } { #5 } { #6 } } + } +% \end{macrocode} +% +% \begin{macrocode} +\cs_new_protected:Npn \@@_Block_iv:nnnnnn #1 #2 #3 #4 #5 #6 + { +% \end{macrocode} +% The sequence of the positions of the blocks will be used when drawing the rules +% (in fact, there is also the |\multicolumn| and the |\diagbox| in that sequence). +% \begin{macrocode} + \seq_gput_left:Nn \g_@@_pos_of_blocks_seq { { #1 } { #2 } { #3 } { #4 } } % \end{macrocode} +% +% The group is for the keys. +% \begin{macrocode} + \group_begin: + \keys_set:nn { NiceMatrix / Block / SecondPass } { #5 } +% \end{macrocode} +% % % \begin{macrocode} \bool_lazy_or:nnT @@ -12925,7 +13014,7 @@ version 2005/12/01 or later. \tl_gput_right:Nx \g_nicematrix_code_after_tl { \@@_stroke_block:nnn - { #5 } + { \exp_not:n { #5 } } { #1 - #2 } { \int_use:N \l_@@_last_row_int - \int_use:N \l_@@_last_col_int } } @@ -12940,7 +13029,7 @@ version 2005/12/01 or later. \tl_gput_right:Nx \g_nicematrix_code_before_tl { \exp_not:N \rectanglecolor - { \l_@@_fill_tl } + { \exp_not:V \l_@@_fill_tl } { #1 - #2 } { \int_use:N \l_@@_last_row_int - \int_use:N \l_@@_last_col_int } } @@ -12965,13 +13054,8 @@ version 2005/12/01 or later. % % \medskip % \begin{macrocode} - \bool_lazy_or:nnTF - { \int_compare_p:nNn \l_@@_last_row_int > \g_@@_row_total_int } - { \int_compare_p:nNn \l_@@_last_col_int > \g_@@_col_total_int } - { \msg_error:nnnn { nicematrix } { Block~too~large } { #1 } { #2 } } - { - \hbox_set:Nn \l_@@_cell_box { #6 } - \bool_if:NT \g_@@_rotate_bool \@@_rotate_cell_box: + \hbox_set:Nn \l_@@_cell_box { #6 } + \bool_if:NT \g_@@_rotate_bool \@@_rotate_cell_box: % \end{macrocode} % % \bigskip @@ -13024,17 +13108,17 @@ version 2005/12/01 or later. % \bigskip % The construction of the node corresponding to the merged cells. % \begin{macrocode} - \pgfpicture - \pgfrememberpicturepositiononpagetrue - \pgf@relevantforpicturesizefalse - \@@_qpoint:n { row - #1 } - \dim_set_eq:NN \l_tmpa_dim \pgf@y - \@@_qpoint:n { col - #2 } - \dim_set_eq:NN \l_tmpb_dim \pgf@x - \@@_qpoint:n { row - \@@_succ:n { \l_@@_last_row_int } } - \dim_set_eq:NN \l_tmpc_dim \pgf@y - \@@_qpoint:n { col - \@@_succ:n { \l_@@_last_col_int } } - \dim_set_eq:NN \l_tmpd_dim \pgf@x + \pgfpicture + \pgfrememberpicturepositiononpagetrue + \pgf@relevantforpicturesizefalse + \@@_qpoint:n { row - #1 } + \dim_set_eq:NN \l_tmpa_dim \pgf@y + \@@_qpoint:n { col - #2 } + \dim_set_eq:NN \l_tmpb_dim \pgf@x + \@@_qpoint:n { row - \@@_succ:n { \l_@@_last_row_int } } + \dim_set_eq:NN \l_tmpc_dim \pgf@y + \@@_qpoint:n { col - \@@_succ:n { \l_@@_last_col_int } } + \dim_set_eq:NN \l_tmpd_dim \pgf@x % \end{macrocode} % % We construct the node for the block with the name |(#1-#2-block)|. @@ -13042,66 +13126,66 @@ version 2005/12/01 or later. % The function |\@@_pgf_rect_node:nnnnn| takes in as arguments the name of the node % and the four coordinates of two opposite corner points of the rectangle. % \begin{macrocode} - \begin { pgfscope } - \@@_pgf_rect_node:nnnnn - { \@@_env: - #1 - #2 - block } - \l_tmpb_dim \l_tmpa_dim \l_tmpd_dim \l_tmpc_dim - \end { pgfscope } + \begin { pgfscope } + \@@_pgf_rect_node:nnnnn + { \@@_env: - #1 - #2 - block } + \l_tmpb_dim \l_tmpa_dim \l_tmpd_dim \l_tmpc_dim + \end { pgfscope } % \end{macrocode} % % \medskip % We construct the |short| node. % \begin{macrocode} - \dim_set_eq:NN \l_tmpb_dim \c_max_dim - \int_step_inline:nnn \l_@@_first_row_int \g_@@_row_total_int - { + \dim_set_eq:NN \l_tmpb_dim \c_max_dim + \int_step_inline:nnn \l_@@_first_row_int \g_@@_row_total_int + { % \end{macrocode} % We recall that, when a cell is empty, no (normal) node is created in that % cell. That's why we test the existence of the node before using it. % \begin{macrocode} - \cs_if_exist:cT - { pgf @ sh @ ns @ \@@_env: - ##1 - #2 } + \cs_if_exist:cT + { pgf @ sh @ ns @ \@@_env: - ##1 - #2 } + { + \seq_if_in:NnF \g_@@_multicolumn_cells_seq { ##1 - #2 } { - \seq_if_in:NnF \g_@@_multicolumn_cells_seq { ##1 - #2 } - { - \pgfpointanchor { \@@_env: - ##1 - #2 } { west } - \dim_set:Nn \l_tmpb_dim { \dim_min:nn \l_tmpb_dim \pgf@x } - } + \pgfpointanchor { \@@_env: - ##1 - #2 } { west } + \dim_set:Nn \l_tmpb_dim { \dim_min:nn \l_tmpb_dim \pgf@x } } } + } % \end{macrocode} % If all the cells of the column were empty, |\l_tmpb_dim| has still the same % value |\c_max_dim|. In that case, you use for |\l_tmpb_dim| the value of the % position of the vertical rule. % \begin{macrocode} - \dim_compare:nNnT \l_tmpb_dim = \c_max_dim - { - \@@_qpoint:n { col - #2 } - \dim_set_eq:NN \l_tmpb_dim \pgf@x - } - \dim_set:Nn \l_tmpd_dim { - \c_max_dim } - \int_step_inline:nnn \l_@@_first_row_int \g_@@_row_total_int + \dim_compare:nNnT \l_tmpb_dim = \c_max_dim + { + \@@_qpoint:n { col - #2 } + \dim_set_eq:NN \l_tmpb_dim \pgf@x + } + \dim_set:Nn \l_tmpd_dim { - \c_max_dim } + \int_step_inline:nnn \l_@@_first_row_int \g_@@_row_total_int + { + \cs_if_exist:cT + { pgf @ sh @ ns @ \@@_env: - ##1 - \int_use:N \l_@@_last_col_int } { - \cs_if_exist:cT - { pgf @ sh @ ns @ \@@_env: - ##1 - \int_use:N \l_@@_last_col_int } + \seq_if_in:NnF \g_@@_multicolumn_cells_seq { ##1 - #2 } { - \seq_if_in:NnF \g_@@_multicolumn_cells_seq { ##1 - #2 } - { - \pgfpointanchor - { \@@_env: - ##1 - \int_use:N \l_@@_last_col_int } - { east } - \dim_set:Nn \l_tmpd_dim { \dim_max:nn \l_tmpd_dim \pgf@x } - } + \pgfpointanchor + { \@@_env: - ##1 - \int_use:N \l_@@_last_col_int } + { east } + \dim_set:Nn \l_tmpd_dim { \dim_max:nn \l_tmpd_dim \pgf@x } } } - \dim_compare:nNnT \l_tmpd_dim = { - \c_max_dim } - { - \@@_qpoint:n { col - \@@_succ:n { \l_@@_last_col_int } } - \dim_set_eq:NN \l_tmpd_dim \pgf@x - } - \@@_pgf_rect_node:nnnnn - { \@@_env: - #1 - #2 - block - short } - \l_tmpb_dim \l_tmpa_dim \l_tmpd_dim \l_tmpc_dim + } + \dim_compare:nNnT \l_tmpd_dim = { - \c_max_dim } + { + \@@_qpoint:n { col - \@@_succ:n { \l_@@_last_col_int } } + \dim_set_eq:NN \l_tmpd_dim \pgf@x + } + \@@_pgf_rect_node:nnnnn + { \@@_env: - #1 - #2 - block - short } + \l_tmpb_dim \l_tmpa_dim \l_tmpd_dim \l_tmpc_dim % \end{macrocode} % % \medskip @@ -13109,37 +13193,37 @@ version 2005/12/01 or later. % node'' for the block. The function |\@@_pgf_rect_node:nnnnn| takes in as % arguments the name of the node and two \textsc{pgf} points. % \begin{macrocode} - \bool_if:NT \l_@@_medium_nodes_bool - { - \@@_pgf_rect_node:nnn - { \@@_env: - #1 - #2 - block - medium } - { \pgfpointanchor { \@@_env: - #1 - #2 - medium } { north~west } } - { - \pgfpointanchor - { \@@_env: - - \int_use:N \l_@@_last_row_int - - \int_use:N \l_@@_last_col_int - medium - } - { south~east } + \bool_if:NT \l_@@_medium_nodes_bool + { + \@@_pgf_rect_node:nnn + { \@@_env: - #1 - #2 - block - medium } + { \pgfpointanchor { \@@_env: - #1 - #2 - medium } { north~west } } + { + \pgfpointanchor + { \@@_env: + - \int_use:N \l_@@_last_row_int + - \int_use:N \l_@@_last_col_int - medium } - } + { south~east } + } + } % \end{macrocode} % \medskip % Now, we will put the label of the block beginning with the case of a |\Block| % of one row. % \begin{macrocode} - \int_compare:nNnTF { #1 } = { #3 } - { + \int_compare:nNnTF { #1 } = { #3 } + { % \end{macrocode} % We take into account the case of a block of one row in the ``first row'' or % the ``last row''. % \begin{macrocode} - \int_compare:nNnTF { #1 } = 0 - { \l_@@_code_for_first_row_tl } - { - \int_compare:nNnT { #1 } = \l_@@_last_row_int - \l_@@_code_for_last_row_tl - } + \int_compare:nNnTF { #1 } = 0 + { \l_@@_code_for_first_row_tl } + { + \int_compare:nNnT { #1 } = \l_@@_last_row_int + \l_@@_code_for_last_row_tl + } % \end{macrocode} % If the block has only one row, we want the label of the block perfectly % aligned on the baseline of the row. That's why we have constructed a @@ -13150,33 +13234,33 @@ version 2005/12/01 or later. % \end{macrocode} % We retrieve (in |\pgf@x|) the $x$-value of the center of the block. % \begin{macrocode} - \pgfpointanchor - { \@@_env: - #1 - #2 - block - short } + \pgfpointanchor + { \@@_env: - #1 - #2 - block - short } + { + \str_case:Vn \l_@@_pos_of_block_tl { - \str_case:Vn \l_@@_pos_of_block_tl - { - c { center } - l { west } - r { east } - } - } + c { center } + l { west } + r { east } + } + } % \end{macrocode} % We put the label of the block which has been composed in |\l_@@_cell_box|. % \begin{macrocode} - \pgftransformshift { \pgfpoint \pgf@x \l_tmpa_dim } - \pgfset { inner~sep = \c_zero_dim } - \pgfnode - { rectangle } + \pgftransformshift { \pgfpoint \pgf@x \l_tmpa_dim } + \pgfset { inner~sep = \c_zero_dim } + \pgfnode + { rectangle } + { + \str_case:Vn \l_@@_pos_of_block_tl { - \str_case:Vn \l_@@_pos_of_block_tl - { - c { base } - l { base~west } - r { base~east } - } + c { base } + l { base~west } + r { base~east } } - { \box_use_drop:N \l_@@_cell_box } { } { } - } + } + { \box_use_drop:N \l_@@_cell_box } { } { } + } % \end{macrocode} % % \medskip @@ -13184,45 +13268,44 @@ version 2005/12/01 or later. % by using the short node (the label of the block has been composed in % |\l_@@_cell_box|). % \begin{macrocode} - { + { % \end{macrocode} % If we are in the first column, we must put the block as if it was with the key~|r|. % \begin{macrocode} - \int_compare:nNnT { #2 } = 0 - { \tl_set:Nn \l_@@_pos_of_block_tl r } - \bool_if:nT \g_@@_last_col_found_bool - { - \int_compare:nNnT { #2 } = \g_@@_col_total_int - { \tl_set:Nn \l_@@_pos_of_block_tl l } - } - \pgftransformshift - { - \pgfpointanchor - { \@@_env: - #1 - #2 - block - short } - { - \str_case:Vn \l_@@_pos_of_block_tl - { - c { center } - l { west } - r { east } - } - } - } - \pgfset { inner~sep = \c_zero_dim } - \pgfnode - { rectangle } + \int_compare:nNnT { #2 } = 0 + { \tl_set:Nn \l_@@_pos_of_block_tl r } + \bool_if:nT \g_@@_last_col_found_bool + { + \int_compare:nNnT { #2 } = \g_@@_col_total_int + { \tl_set:Nn \l_@@_pos_of_block_tl l } + } + \pgftransformshift + { + \pgfpointanchor + { \@@_env: - #1 - #2 - block - short } { - \str_case:Vn \l_@@_pos_of_block_tl + \str_case:Vn \l_@@_pos_of_block_tl { c { center } l { west } r { east } } } - { \box_use_drop:N \l_@@_cell_box } { } { } - } - \endpgfpicture - } + } + \pgfset { inner~sep = \c_zero_dim } + \pgfnode + { rectangle } + { + \str_case:Vn \l_@@_pos_of_block_tl + { + c { center } + l { west } + r { east } + } + } + { \box_use_drop:N \l_@@_cell_box } { } { } + } + \endpgfpicture \group_end: } % \end{macrocode} @@ -13531,7 +13614,7 @@ version 2005/12/01 or later. % % \medskip % However, in each cell of the environment, the command |\CodeAfter| will be -% linked to the following command |\@@_CodeAfter_i:n| which do \emph{not} begins +% linked to the following command |\@@_CodeAfter_i:n| which do \emph{not} begin % with |\omit| (and thus, the user will be able to use |\CodeAfter| without % error and without the need to prefix by |\omit|. % @@ -13603,12 +13686,12 @@ version 2005/12/01 or later. % \begin{macrocode} \@@_msg_new:nnn { Unknown~option~for~package } { - The~option~'\l_keys_key_tl'~is~unknown. \\ + The~key~'\l_keys_key_str'~is~unknown. \\ If~you~go~on,~it~will~be~ignored. \\ - For~a~list~of~the~available~options,~type~H~. + For~a~list~of~the~available~keys,~type~H~. } { - The~available~options~are~(in~alphabetic~order):~ + The~available~keys~are~(in~alphabetic~order):~ define-L-C-R,~ footnote,~ footnotehyper,~ @@ -13697,35 +13780,15 @@ version 2005/12/01 or later. % \bigskip % \subsection*{Error messages of the package} % -% The following command converts all the elements of a sequence (which are token -% lists) into strings. -% \begin{macrocode} -\cs_new_protected:Npn \@@_convert_to_str_seq:N #1 - { - \seq_clear:N \l_tmpa_seq - \seq_map_inline:Nn #1 - { - \seq_put_left:Nx \l_tmpa_seq { \tl_to_str:n { ##1 } } - } - \seq_set_eq:NN #1 \l_tmpa_seq - } -% \end{macrocode} -% -% The following command creates a sequence of strings (|str|) from a |clist|. % \begin{macrocode} -\cs_new_protected:Npn \@@_set_seq_of_str_from_clist:Nn #1 #2 - { - \seq_set_from_clist:Nn #1 { #2 } - \@@_convert_to_str_seq:N #1 - } -% \end{macrocode} -% -% \begin{macrocode} -\@@_set_seq_of_str_from_clist:Nn \c_@@_types_of_matrix_seq +\seq_new:N \c_@@_types_of_matrix_seq +\seq_set_from_clist:Nn \c_@@_types_of_matrix_seq { NiceMatrix , pNiceMatrix , bNiceMatrix , vNiceMatrix, BNiceMatrix, VNiceMatrix } +\seq_set_map_x:NNn \c_@@_types_of_matrix_seq \c_@@_types_of_matrix_seq + { \tl_to_str:n { #1 } } % \end{macrocode} % % \bigskip @@ -13809,9 +13872,8 @@ version 2005/12/01 or later. \@@_msg_new:nn { 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@jCol.\\ - However,~you~can~go~on. + \g_@@_static_num_of_col_int\ columns~but~you~use~only~\int_use:N \c@jCol.\\ + You~can~go~on~but~the~columns~you~did~not~used~won't~be~created. } % \end{macrocode} % @@ -13853,25 +13915,25 @@ version 2005/12/01 or later. \@@_msg_new:nn { bad~option~for~line-style } { Since~you~haven't~loaded~Tikz,~the~only~value~you~can~give~to~'line-style'~ - is~'standard'.~If~you~go~on,~this~option~will~be~ignored. + is~'standard'.~If~you~go~on,~this~key~will~be~ignored. } % \end{macrocode} % % \begin{macrocode} \@@_msg_new:nn { Unknown~option~for~xdots } { - As~for~now~there~is~only~three~options~available~here:~'color',~'line-style'~ - and~'shorten'~(and~you~try~to~use~'\l_keys_key_tl').~If~you~go~on,~ - this~option~will~be~ignored. + As~for~now~there~is~only~three~key~available~here:~'color',~'line-style'~ + and~'shorten'~(and~you~try~to~use~'\l_keys_key_str').~If~you~go~on,~ + this~key~will~be~ignored. } % \end{macrocode} % % \begin{macrocode} \@@_msg_new:nn { Unknown~option~for~rowcolors } { - As~for~now~there~is~only~one~option~available~here:~'respect-blocks'~ - (and~you~try~to~use~'\l_keys_key_tl').~If~you~go~on,~ - this~option~will~be~ignored. + As~for~now~there~is~only~two~keys~available~here:~'cols'~and~'respect-blocks'~ + (and~you~try~to~use~'\l_keys_key_str').~If~you~go~on,~ + this~key~will~be~ignored. } % \end{macrocode} % @@ -13889,7 +13951,7 @@ version 2005/12/01 or later. \@@_msg_new:nn { ampersand~in~light-syntax } { You~can't~use~an~ampersand~(\token_to_str &)~to~separate~columns~because - ~you~have~used~the~option~'light-syntax'.~This~error~is~fatal. + ~you~have~used~the~key~'light-syntax'.~This~error~is~fatal. } % \end{macrocode} % @@ -13897,8 +13959,8 @@ version 2005/12/01 or later. \@@_msg_new:nn { double-backslash~in~light-syntax } { You~can't~use~\token_to_str:N \\~to~separate~rows~because~you~have~used~ - the~option~'light-syntax'.~You~must~use~the~character~'\l_@@_end_of_row_tl'~ - (set~by~the~option~'end-of-row').~This~error~is~fatal. + the~key~'light-syntax'.~You~must~use~the~character~'\l_@@_end_of_row_tl'~ + (set~by~the~key~'end-of-row').~This~error~is~fatal. } % \end{macrocode} % @@ -13966,7 +14028,7 @@ version 2005/12/01 or later. % \begin{macrocode} \@@_msg_new:nn { last-col~non~empty~for~NiceArray } { - In~the~\@@_full_name_env:,~you~must~use~the~option~ + In~the~\@@_full_name_env:,~you~must~use~the~key~ 'last-col'~without~value.\\ However,~you~can~go~on~for~this~time~ (the~value~'\l_keys_value_tl'~will~be~ignored). @@ -13977,7 +14039,7 @@ version 2005/12/01 or later. % \begin{macrocode} \@@_msg_new:nn { last-col~non~empty~for~NiceMatrixOptions } { - In~\NiceMatrixoptions,~you~must~use~the~option~ + In~\NiceMatrixoptions,~you~must~use~the~key~ 'last-col'~without~value.\\ However,~you~can~go~on~for~this~time~ (the~value~'\l_keys_value_tl'~will~be~ignored). @@ -13986,7 +14048,7 @@ version 2005/12/01 or later. % % % \begin{macrocode} -\@@_msg_new:nn { Block~too~large } +\@@_msg_new:nn { Block~too~large~1 } { You~try~to~draw~a~block~in~the~cell~#1-#2~of~your~matrix~but~the~matrix~is~ too~small~for~that~block. \\ @@ -13994,6 +14056,20 @@ version 2005/12/01 or later. % \end{macrocode} % % \begin{macrocode} +\@@_msg_new:nn { Block~too~large~2 } + { + 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@jCol\ and~that's~why~a~block~ + specified~in~the~cell~#1-#2~can't~be~drawn.~You~should~add~some~ampersands~ + (&)~at~the~end~of~the~first~row~of~your~ + \@@_full_name_env:.\\ + If~you~go~on,this~block~and~maybe~others~will~be~ignored. + } +% \end{macrocode} +% +% +% \begin{macrocode} \@@_msg_new:nn { unknown~column~type } { The~column~type~'#1'~in~your~\@@_full_name_env:\ @@ -14015,9 +14091,9 @@ version 2005/12/01 or later. % \begin{macrocode} \@@_msg_new:nn { bottomule~without~booktabs } { - You~can't~use~the~option~'tabular/bottomrule'~because~you~haven't~ + You~can't~use~the~key~'tabular/bottomrule'~because~you~haven't~ loaded~'booktabs'.\\ - If~you~go~on,~this~option~will~be~ignored. + If~you~go~on,~this~key~will~be~ignored. } % \end{macrocode} % @@ -14059,7 +14135,7 @@ version 2005/12/01 or later. % \begin{macrocode} \@@_msg_new:nn { Bad~value~for~letter~for~dotted~lines } { - The~value~of~key~'\l_keys_key_tl'~must~be~of~length~1.\\ + The~value~of~key~'\l_keys_key_str'~must~be~of~length~1.\\ If~you~go~on,~it~will~be~ignored. } % \end{macrocode} @@ -14068,25 +14144,25 @@ version 2005/12/01 or later. % \begin{macrocode} \@@_msg_new:nnn { Unknown~key~for~Block } { - The~key~'\l_keys_key_tl'~is~unknown~for~the~command~\token_to_str:N + The~key~'\l_keys_key_str'~is~unknown~for~the~command~\token_to_str:N \Block.\\ If~you~go~on,~it~will~be~ignored. \\ For~a~list~of~the~available~keys,~type~H~. } { - The~available~options~are~(in~alphabetic~order):~-,~c,~ - color,~l,~and~r. + The~available~keys~are~(in~alphabetic~order):~-,~c,~draw,~fill,~l,~ + line-width~and~r. } % \end{macrocode} % % \begin{macrocode} \@@_msg_new:nnn { Unknown~key~for~notes } { - The~key~'\l_keys_key_tl'~is~unknown.\\ + The~key~'\l_keys_key_str'~is~unknown.\\ If~you~go~on,~it~will~be~ignored. \\ For~a~list~of~the~available~keys~about~notes,~type~H~. } { - The~available~options~are~(in~alphabetic~order):~ + The~available~keys~are~(in~alphabetic~order):~ bottomrule,~ code-after,~ code-before,~ @@ -14102,13 +14178,13 @@ version 2005/12/01 or later. % \begin{macrocode} \@@_msg_new:nnn { Unknown~key~for~NiceMatrixOptions } { - The~key~'\l_keys_key_tl'~is~unknown~for~the~command~ + The~key~'\l_keys_key_str'~is~unknown~for~the~command~ \token_to_str:N \NiceMatrixOptions. \\ If~you~go~on,~it~will~be~ignored. \\ For~a~list~of~the~*principal*~available~keys,~type~H~. } { - The~available~options~are~(in~alphabetic~order):~ + The~available~keys~are~(in~alphabetic~order):~ allow-duplicate-names,~ cell-space-bottom-limit,~ cell-space-top-limit,~ @@ -14148,13 +14224,13 @@ version 2005/12/01 or later. % \begin{macrocode} \@@_msg_new:nnn { Unknown~option~for~NiceArray } { - The~option~'\l_keys_key_tl'~is~unknown~for~the~environment~ + The~key~'\l_keys_key_str'~is~unknown~for~the~environment~ \{NiceArray\}. \\ If~you~go~on,~it~will~be~ignored. \\ - For~a~list~of~the~*principal*~available~options,~type~H~. + For~a~list~of~the~*principal*~available~keys,~type~H~. } { - The~available~options~are~(in~alphabetic~order):~ + The~available~keys~are~(in~alphabetic~order):~ b,~ baseline,~ c,~ @@ -14202,17 +14278,17 @@ version 2005/12/01 or later. % \medskip % This error message is used for the set of keys |NiceMatrix/NiceMatrix| and % |NiceMatrix/pNiceArray| (but not by |NiceMatrix/NiceArray| because, for this -% set of keys, there is also the options |t|, |c| and~|b|). +% set of keys, there is also the keys |t|, |c| and~|b|). % \begin{macrocode} \@@_msg_new:nnn { Unknown~option~for~NiceMatrix } { - The~option~'\l_keys_key_tl'~is~unknown~for~the~ + The~key~'\l_keys_key_str'~is~unknown~for~the~ \@@_full_name_env:. \\ If~you~go~on,~it~will~be~ignored. \\ - For~a~list~of~the~*principal*~available~options,~type~H~. + For~a~list~of~the~*principal*~available~keys,~type~H~. } { - The~available~options~are~(in~alphabetic~order):~ + The~available~keys~are~(in~alphabetic~order):~ b,~ baseline,~ c,~ @@ -14260,13 +14336,13 @@ version 2005/12/01 or later. % \begin{macrocode} \@@_msg_new:nnn { Unknown~option~for~NiceTabular } { - The~option~'\l_keys_key_tl'~is~unknown~for~the~environment~ + The~key~'\l_keys_key_str'~is~unknown~for~the~environment~ \{NiceTabular\}. \\ If~you~go~on,~it~will~be~ignored. \\ - For~a~list~of~the~*principal*~available~options,~type~H~. + For~a~list~of~the~*principal*~available~keys,~type~H~. } { - The~available~options~are~(in~alphabetic~order):~ + The~available~keys~are~(in~alphabetic~order):~ b,~ baseline,~ c,~ @@ -14317,7 +14393,7 @@ version 2005/12/01 or later. the~same~environment~name~twice.~You~can~go~on,~but,~ maybe,~you~will~have~incorrect~results~especially~ if~you~use~'columns-width=auto'.~If~you~don't~want~to~see~this~ - message~again,~use~the~option~'allow-duplicate-names'~in~ + message~again,~use~the~key~'allow-duplicate-names'~in~ '\token_to_str:N \NiceMatrixOptions'.\\ For~a~list~of~the~names~already~used,~type~H~. \\ } @@ -14330,8 +14406,8 @@ version 2005/12/01 or later. % \begin{macrocode} \@@_msg_new:nn { Option~auto~for~columns-width } { - You~can't~give~the~value~'auto'~to~the~option~'columns-width'~here.~ - If~you~go~on,~the~option~will~be~ignored. + You~can't~give~the~value~'auto'~to~the~key~'columns-width'~here.~ + If~you~go~on,~the~key~will~be~ignored. } % \end{macrocode} % @@ -14590,7 +14666,7 @@ version 2005/12/01 or later. % $i$|-|$j$|-block| and, if the creation of the ``medium nodes'' is required, a % node $i$|-|$j$|-block-medium| is created. % -% If the user try to use more columns than allowed by its environment, an error +% If the user tries to use more columns than allowed by its environment, an error % is raised by nicematrix (instead of a low-level error). % % The package must be loaded with the option |obsolete-environments| if we want @@ -14640,7 +14716,7 @@ version 2005/12/01 or later. % % New environment |{NiceTabular}| % -% Commands to color cells, row and columns with a perfect result in the \textsc{pdf}. +% Commands to color cells, rows and columns with a perfect result in the \textsc{pdf}. % % \subsection*{Changes between versions 4.0 and 4.1} % @@ -14733,6 +14809,15 @@ version 2005/12/01 or later. % % Keys |fill|, |draw| and |line-width| for the command |\Block|. % +% \subsection*{Changes between versions 5.7 and 5.8} +% +% Keys |cols| and |restart| of the command |\rowcolors| in the |code-before|. +% +% Modification of the behaviour of |\\| in the columns of type |p|, |m| or |b| +% (for a behaviour similar to the environments of \pkg{array}). +% +% Better error messages for the command |\Block|. +% % \PrintIndex % % \tableofcontents diff --git a/macros/latex/contrib/nicematrix/nicematrix.pdf b/macros/latex/contrib/nicematrix/nicematrix.pdf index 3f0097097d..ac45e01da6 100644 Binary files a/macros/latex/contrib/nicematrix/nicematrix.pdf and b/macros/latex/contrib/nicematrix/nicematrix.pdf differ -- cgit v1.2.3