diff options
author | Karl Berry <karl@freefriends.org> | 2023-12-14 20:59:40 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-12-14 20:59:40 +0000 |
commit | 8d7899449dfb47580681a285db2e7e97bc368ea7 (patch) | |
tree | efb611f8c45ef3e1b634732b186747b3c08b80c3 /Master/texmf-dist/source | |
parent | 5e1c61181600bd8b4bb6a8e0542e419f100070d5 (diff) |
nicematrix (14dec23)
git-svn-id: svn://tug.org/texlive/trunk@69126 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r-- | Master/texmf-dist/source/latex/nicematrix/nicematrix-code.dtx | 44 |
1 files changed, 29 insertions, 15 deletions
diff --git a/Master/texmf-dist/source/latex/nicematrix/nicematrix-code.dtx b/Master/texmf-dist/source/latex/nicematrix/nicematrix-code.dtx index 3683787bcf0..cfb0eb00d01 100644 --- a/Master/texmf-dist/source/latex/nicematrix/nicematrix-code.dtx +++ b/Master/texmf-dist/source/latex/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 } |