texlive[69126] Master/texmf-dist: nicematrix (14dec23)
commits+karl at tug.org
commits+karl at tug.org
Thu Dec 14 21:59:41 CET 2023
Revision: 69126
https://tug.org/svn/texlive?view=revision&revision=69126
Author: karl
Date: 2023-12-14 21:59:40 +0100 (Thu, 14 Dec 2023)
Log Message:
-----------
nicematrix (14dec23)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/nicematrix/nicematrix-french.pdf
trunk/Master/texmf-dist/doc/latex/nicematrix/nicematrix-french.tex
trunk/Master/texmf-dist/doc/latex/nicematrix/nicematrix.pdf
trunk/Master/texmf-dist/doc/latex/nicematrix/nicematrix.tex
trunk/Master/texmf-dist/source/latex/nicematrix/nicematrix-code.dtx
trunk/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty
Removed Paths:
-------------
trunk/Master/texmf-dist/doc/latex/nicematrix/nicematrix-code.pdf
Deleted: trunk/Master/texmf-dist/doc/latex/nicematrix/nicematrix-code.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/nicematrix/nicematrix-french.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/nicematrix/nicematrix-french.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/nicematrix/nicematrix-french.tex 2023-12-14 20:59:16 UTC (rev 69125)
+++ trunk/Master/texmf-dist/doc/latex/nicematrix/nicematrix-french.tex 2023-12-14 20:59:40 UTC (rev 69126)
@@ -6669,7 +6669,8 @@
light-syntax,
last-col, code-for-last-col = \color{blue}\scriptstyle,
vlines = 5 ,
- matrix/columns-type = r
+ matrix/columns-type = r ,
+ no-cell-nodes
}
\setlength{\extrarowheight}{1mm}
@@ -6711,7 +6712,8 @@
light-syntax,
last-col, code-for-last-col = \color{blue}\scriptstyle,
vlines = 5 ,
- matrix/columns-type = r
+ matrix/columns-type = r ,
+ no-cell-nodes
}
\setlength{\extrarowheight}{1mm}
@@ -6764,7 +6766,8 @@
light-syntax,
last-col, code-for-last-col = \color{blue}\scriptstyle,
vlines = 5 ,
- matrix/columns-type = r
+ matrix/columns-type = r ,
+ no-cell-nodes
}
\setlength{\extrarowheight}{1mm}
@@ -6786,7 +6789,8 @@
light-syntax,
last-col, code-for-last-col = \color{blue}\scriptstyle,
vlines = 5 ,
- matrix/columns-type = r
+ matrix/columns-type = r ,
+ no-cell-nodes
}
\setlength{\extrarowheight}{1mm}
@@ -6859,7 +6863,7 @@
\begin{scope}
\setlength{\extrarowheight}{1mm}
\[\begin{NiceMatrix}%
- [ r, last-col=6, code-for-last-col = \scriptstyle \color{blue} ]
+ [ r, last-col=6, code-for-last-col = \scriptstyle \color{blue}]
12 & -8 & 7 & 5 & 3 \\
3 & -18 & 12 & 1 & 4 \\
-3 & -46 & 29 &-2 &-15 \\
Modified: trunk/Master/texmf-dist/doc/latex/nicematrix/nicematrix.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/nicematrix/nicematrix.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/nicematrix/nicematrix.tex 2023-12-14 20:59:16 UTC (rev 69125)
+++ trunk/Master/texmf-dist/doc/latex/nicematrix/nicematrix.tex 2023-12-14 20:59:40 UTC (rev 69126)
@@ -6536,7 +6536,8 @@
light-syntax,
last-col, code-for-last-col = \color{blue}\scriptstyle,
vlines = 5 ,
- matrix/columns-type = r
+ matrix/columns-type = r ,
+ no-cell-nodes
}
\setlength{\extrarowheight}{1mm}
@@ -6578,7 +6579,8 @@
light-syntax,
last-col, code-for-last-col = \color{blue}\scriptstyle,
vlines = 5 ,
- matrix/columns-type = r
+ matrix/columns-type = r ,
+ no-cell-nodes
}
\setlength{\extrarowheight}{1mm}
@@ -6631,7 +6633,8 @@
light-syntax,
last-col, code-for-last-col = \color{blue}\scriptstyle,
vlines = 5 ,
- matrix/columns-type = r
+ matrix/columns-type = r ,
+ no-cell-nodes
}
\setlength{\extrarowheight}{1mm}
@@ -6653,7 +6656,8 @@
light-syntax,
last-col, code-for-last-col = \color{blue}\scriptstyle,
vlines = 5 ,
- matrix/columns-type = r
+ matrix/columns-type = r ,
+ no-cell-nodes
}
\setlength{\extrarowheight}{1mm}
Modified: trunk/Master/texmf-dist/source/latex/nicematrix/nicematrix-code.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/nicematrix/nicematrix-code.dtx 2023-12-14 20:59:16 UTC (rev 69125)
+++ trunk/Master/texmf-dist/source/latex/nicematrix/nicematrix-code.dtx 2023-12-14 20:59:40 UTC (rev 69126)
@@ -17,8 +17,8 @@
%
% \fi
% \iffalse
-\def\myfileversion{6.26a}
-\def\myfiledate{2023/12/04}
+\def\myfileversion{6.26b}
+\def\myfiledate{2023/12/13}
%
%
%<*batchfile>
@@ -1186,6 +1186,11 @@
\tl_new:N \g_@@_com_or_env_str
\tl_gset:Nn \g_@@_com_or_env_str { environment }
% \end{macrocode}
+%
+% \bigskip
+% \begin{macrocode}
+\bool_new:N \l_@@_bold_row_style_bool
+% \end{macrocode}
%
% \bigskip
% The following command will be able to reconstruct the full name of the current
@@ -2556,6 +2561,10 @@
% \begin{macrocode}
\keys_define:nn { NiceMatrix / Global }
{
+ no-cell-nodes .code:n =
+ \cs_set_protected:Npn \@@_node_for_cell:
+ { \box_use_drop:N \l_@@_cell_box } ,
+ no-cell-nodes .value_forbidden:n = true ,
rounded-corners .dim_set:N = \l_@@_tab_rounded_corners_dim ,
rounded-corners .default:n = 4 pt ,
custom-line .code:n = \@@_custom_line:n { #1 } ,
@@ -3318,8 +3327,7 @@
\bool_if:NTF \g_@@_empty_cell_bool
{ \box_use_drop:N \l_@@_cell_box }
{
- \bool_if:NTF
- \g_@@_not_empty_cell_bool
+ \bool_if:NTF \g_@@_not_empty_cell_bool
\@@_node_for_cell:
{
\dim_compare:nNnTF { \box_wd:N \l_@@_cell_box } > \c_zero_dim
@@ -3364,10 +3372,7 @@
}
% \end{macrocode}
%
-%
% \bigskip
-% The following command creates the \textsc{pgf} name of the node with, of
-% course, |\l_@@_cell_box| as the content.
% \begin{macrocode}
\pgfset
{
@@ -3377,6 +3382,12 @@
minimum~width = \c_zero_dim
}
}
+% \end{macrocode}
+%
+% \bigskip
+% The following command creates the \textsc{pgf} name of the node with, of
+% course, |\l_@@_cell_box| as the content.
+% \begin{macrocode}
\cs_new_protected:Npn \@@_node_for_cell:
{
\pgfpicture
@@ -7092,11 +7103,11 @@
% The two following lines have been added on 2021-12-15 to solve a bug
% mentionned by Joao Luis Soares by mail.
% \begin{macrocode}
- \int_compare:nNnT \g_@@_col_total_int = \c_one_int
+ \int_if_zero:nT \g_@@_col_total_int
{ \skip_gset:Nn \g_tmpa_skip { 0 pt~plus 1 fill } }
\skip_horizontal:N \g_tmpa_skip
\int_gincr:N \g_tmpa_int
- \bool_lazy_any:nT
+ \bool_lazy_any:nF % modified 2023/12/13
{
\g_@@_delims_bool
\l_@@_tabular_bool
@@ -10061,9 +10072,8 @@
} ,
color .tl_set:N = \l_@@_color_tl ,
color .value_required:n = true ,
- bold .bool_set:N = \l_tmpa_bool ,
+ bold .bool_set:N = \l_@@_bold_row_style_bool ,
bold .default:n = true ,
- bold .initial:n = false ,
nb-rows .code:n =
\str_if_eq:nnTF { #1 } { * }
{ \int_set:Nn \l_@@_key_nb_rows_int { 500 } }
@@ -10076,6 +10086,7 @@
}
% \end{macrocode}
%
+%
% \bigskip
% \begin{macrocode}
\NewDocumentCommand \@@_RowStyle:n { O { } m }
@@ -10083,7 +10094,7 @@
\group_begin:
\tl_clear:N \l_tmpa_tl % value of \rowcolor
\tl_clear:N \l_@@_color_tl
- \int_set:Nn \l_@@_key_nb_rows_int 1
+ \int_set_eq:NN \l_@@_key_nb_rows_int \c_one_int
\keys_set:nn { NiceMatrix / RowStyle } { #1 }
% \end{macrocode}
% If the key |rowcolor| has been used.
@@ -10165,9 +10176,9 @@
}
}
% \end{macrocode}
-% |\l_tmpa_bool| is the value of the key |bold|.
+% |\l_@@_bold_row_style_bool| is the value of the key |bold|.
% \begin{macrocode}
- \bool_if:NT \l_tmpa_bool
+ \bool_if:NT \l_@@_bold_row_style_bool
{
\@@_put_in_row_style:n
{
@@ -13604,8 +13615,11 @@
{
\bool_lazy_and:nnTF
\l_@@_preamble_bool
- { \int_compare_p:nNnF \l_@@_last_col_int > \g_@@_static_num_of_col_int }
{
+ \int_compare_p:n
+ { \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 }
\@@_msg_redirect_name:nn { columns~not~used } { none }
Modified: trunk/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty 2023-12-14 20:59:16 UTC (rev 69125)
+++ trunk/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty 2023-12-14 20:59:40 UTC (rev 69126)
@@ -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{6.26a}
-\def\myfiledate{2023/12/04}
+\def\myfileversion{6.26b}
+\def\myfiledate{2023/12/13}
\RequirePackage{pgfcore}
\usepgfmodule{shapes}
\RequirePackage{l3keys2e}
@@ -456,6 +456,7 @@
\str_new:N \g__nicematrix_name_env_str
\tl_new:N \g__nicematrix_com_or_env_str
\tl_gset:Nn \g__nicematrix_com_or_env_str { environment }
+\bool_new:N \l__nicematrix_bold_row_style_bool
\cs_new:Npn \__nicematrix_full_name_env:
{
\str_if_eq:VnTF \g__nicematrix_com_or_env_str { command }
@@ -895,6 +896,10 @@
}
\keys_define:nn { NiceMatrix / Global }
{
+ no-cell-nodes .code:n =
+ \cs_set_protected:Npn \__nicematrix_node_for_cell:
+ { \box_use_drop:N \l__nicematrix_cell_box } ,
+ no-cell-nodes .value_forbidden:n = true ,
rounded-corners .dim_set:N = \l__nicematrix_tab_rounded_corners_dim ,
rounded-corners .default:n = 4 pt ,
custom-line .code:n = \__nicematrix_custom_line:n { #1 } ,
@@ -1376,8 +1381,7 @@
\bool_if:NTF \g__nicematrix_empty_cell_bool
{ \box_use_drop:N \l__nicematrix_cell_box }
{
- \bool_if:NTF
- \g__nicematrix_not_empty_cell_bool
+ \bool_if:NTF \g__nicematrix_not_empty_cell_bool
\__nicematrix_node_for_cell:
{
\dim_compare:nNnTF { \box_wd:N \l__nicematrix_cell_box } > \c_zero_dim
@@ -3473,11 +3477,11 @@
}
&
\omit
- \int_compare:nNnT \g__nicematrix_col_total_int = \c_one_int
+ \int_if_zero:nT \g__nicematrix_col_total_int
{ \skip_gset:Nn \g_tmpa_skip { 0 pt~plus 1 fill } }
\skip_horizontal:N \g_tmpa_skip
\int_gincr:N \g_tmpa_int
- \bool_lazy_any:nT
+ \bool_lazy_any:nF % modified 2023/12/13
{
\g__nicematrix_delims_bool
\l__nicematrix_tabular_bool
@@ -5350,9 +5354,8 @@
} ,
color .tl_set:N = \l__nicematrix_color_tl ,
color .value_required:n = true ,
- bold .bool_set:N = \l_tmpa_bool ,
+ bold .bool_set:N = \l__nicematrix_bold_row_style_bool ,
bold .default:n = true ,
- bold .initial:n = false ,
nb-rows .code:n =
\str_if_eq:nnTF { #1 } { * }
{ \int_set:Nn \l__nicematrix_key_nb_rows_int { 500 } }
@@ -5368,7 +5371,7 @@
\group_begin:
\tl_clear:N \l_tmpa_tl % value of \rowcolor
\tl_clear:N \l__nicematrix_color_tl
- \int_set:Nn \l__nicematrix_key_nb_rows_int 1
+ \int_set_eq:NN \l__nicematrix_key_nb_rows_int \c_one_int
\keys_set:nn { NiceMatrix / RowStyle } { #1 }
\tl_if_empty:NF \l_tmpa_tl
{
@@ -5427,7 +5430,7 @@
\__nicematrix_color:n { \l__nicematrix_color_tl }
}
}
- \bool_if:NT \l_tmpa_bool
+ \bool_if:NT \l__nicematrix_bold_row_style_bool
{
\__nicematrix_put_in_row_style:n
{
@@ -7456,8 +7459,11 @@
{
\bool_lazy_and:nnTF
\l__nicematrix_preamble_bool
- { \int_compare_p:nNnF \l__nicematrix_last_col_int > \g__nicematrix_static_num_of_col_int }
{
+ \int_compare_p:n
+ { \l__nicematrix_last_col_int <= \g__nicematrix_static_num_of_col_int }
+ }
+ {
\msg_error:nnnn { nicematrix } { Block~too~large~2 } { #1 } { #2 }
\__nicematrix_msg_redirect_name:nn { Block~too~large~2 } { none }
\__nicematrix_msg_redirect_name:nn { columns~not~used } { none }
More information about the tex-live-commits
mailing list.