summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/nicematrix
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-12-14 03:02:23 +0000
committerNorbert Preining <norbert@preining.info>2023-12-14 03:02:23 +0000
commit08c9c5238d01d9b5949ae48f659d06da1665734a (patch)
tree63b543e4ccfe2e5d2a5dc0620477baa22b40b358 /macros/latex/contrib/nicematrix
parentf914c275329785103a123c35a5d1e5db321c7adf (diff)
CTAN sync 202312140302
Diffstat (limited to 'macros/latex/contrib/nicematrix')
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix-code.dtx44
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix-code.pdfbin972770 -> 0 bytes
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix-french.pdfbin598788 -> 596600 bytes
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix-french.tex14
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix.pdfbin614351 -> 612159 bytes
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix.tex12
6 files changed, 46 insertions, 24 deletions
diff --git a/macros/latex/contrib/nicematrix/nicematrix-code.dtx b/macros/latex/contrib/nicematrix/nicematrix-code.dtx
index 3683787bcf..cfb0eb00d0 100644
--- a/macros/latex/contrib/nicematrix/nicematrix-code.dtx
+++ b/macros/latex/contrib/nicematrix/nicematrix-code.dtx
@@ -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 @@ version 2005/12/01 or later.
\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 @@ version 2005/12/01 or later.
% \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 @@ version 2005/12/01 or later.
\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 @@ version 2005/12/01 or later.
}
% \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 @@ version 2005/12/01 or later.
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 @@ version 2005/12/01 or later.
% 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 @@ version 2005/12/01 or later.
} ,
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 @@ version 2005/12/01 or later.
}
% \end{macrocode}
%
+%
% \bigskip
% \begin{macrocode}
\NewDocumentCommand \@@_RowStyle:n { O { } m }
@@ -10083,7 +10094,7 @@ version 2005/12/01 or later.
\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 @@ version 2005/12/01 or later.
}
}
% \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,7 +13615,10 @@ version 2005/12/01 or later.
{
\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 }
diff --git a/macros/latex/contrib/nicematrix/nicematrix-code.pdf b/macros/latex/contrib/nicematrix/nicematrix-code.pdf
deleted file mode 100644
index d35a38c358..0000000000
--- a/macros/latex/contrib/nicematrix/nicematrix-code.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/nicematrix/nicematrix-french.pdf b/macros/latex/contrib/nicematrix/nicematrix-french.pdf
index a2a0d2e235..456c820b75 100644
--- a/macros/latex/contrib/nicematrix/nicematrix-french.pdf
+++ b/macros/latex/contrib/nicematrix/nicematrix-french.pdf
Binary files differ
diff --git a/macros/latex/contrib/nicematrix/nicematrix-french.tex b/macros/latex/contrib/nicematrix/nicematrix-french.tex
index d11b8c8d1c..64ac62e240 100644
--- a/macros/latex/contrib/nicematrix/nicematrix-french.tex
+++ b/macros/latex/contrib/nicematrix/nicematrix-french.tex
@@ -6669,7 +6669,8 @@ avec l'environnement |{NiceMatrixBlock}| et l'option |auto-columns-width|.
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 @@ avec l'environnement |{NiceMatrixBlock}| et l'option |auto-columns-width|.
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 @@ avec leur largeur maximale grâce à la clé booléenne |delimiters/max-width|.
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 @@ avec leur largeur maximale grâce à la clé booléenne |delimiters/max-width|.
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 @@ Bien sûr, ce tableau ne pourra pas être coupé par un saut de page.
\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 \\
diff --git a/macros/latex/contrib/nicematrix/nicematrix.pdf b/macros/latex/contrib/nicematrix/nicematrix.pdf
index 144a5986d0..cc1afcb859 100644
--- a/macros/latex/contrib/nicematrix/nicematrix.pdf
+++ b/macros/latex/contrib/nicematrix/nicematrix.pdf
Binary files differ
diff --git a/macros/latex/contrib/nicematrix/nicematrix.tex b/macros/latex/contrib/nicematrix/nicematrix.tex
index 71ab7c036d..10dd6c789a 100644
--- a/macros/latex/contrib/nicematrix/nicematrix.tex
+++ b/macros/latex/contrib/nicematrix/nicematrix.tex
@@ -6536,7 +6536,8 @@ with the environment |{NiceMatrixBlock}| and its option |auto-columns-width|.
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 @@ with the environment |{NiceMatrixBlock}| and its option |auto-columns-width|.
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 @@ composed with the maximal width, thanks to the boolean key
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 @@ composed with the maximal width, thanks to the boolean key
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}