diff options
author | Karl Berry <karl@freefriends.org> | 2022-10-06 20:01:15 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-10-06 20:01:15 +0000 |
commit | 7ff5adc45baa43bec1c8b45ea8fd61d682e40cd9 (patch) | |
tree | 99af7bb6990b723728872b7f59e53494ffef61ed /Master/texmf-dist | |
parent | ab0876c08a10ca48db6d8521a54a04c6489ea948 (diff) |
nicematrix (6oct22)
git-svn-id: svn://tug.org/texlive/trunk@64640 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r-- | Master/texmf-dist/doc/latex/nicematrix/nicematrix-french.pdf | bin | 511473 -> 511095 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/nicematrix/nicematrix-french.tex | 5 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/nicematrix/nicematrix.pdf | bin | 1325255 -> 1324298 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/nicematrix/nicematrix.dtx | 84 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty | 59 |
5 files changed, 96 insertions, 52 deletions
diff --git a/Master/texmf-dist/doc/latex/nicematrix/nicematrix-french.pdf b/Master/texmf-dist/doc/latex/nicematrix/nicematrix-french.pdf Binary files differindex 0ae8f26c90d..4dfeea879fd 100644 --- a/Master/texmf-dist/doc/latex/nicematrix/nicematrix-french.pdf +++ b/Master/texmf-dist/doc/latex/nicematrix/nicematrix-french.pdf diff --git a/Master/texmf-dist/doc/latex/nicematrix/nicematrix-french.tex b/Master/texmf-dist/doc/latex/nicematrix/nicematrix-french.tex index f7fa1fe561f..352fb51efb3 100644 --- a/Master/texmf-dist/doc/latex/nicematrix/nicematrix-french.tex +++ b/Master/texmf-dist/doc/latex/nicematrix/nicematrix-french.tex @@ -4983,6 +4983,11 @@ doit être chargé avant le |\documentclass|: \end{Verbatim} \medskip +L'extension \pkg{nicematrix} n'est pas parfaitement compatible avec la classe +\cls{ltjarticle}: la détection des coins vides (cf. p.~\pageref{corners}) risque +d'être erronée dans certaines circonstances. + +\medskip L'extension \pkg{nicematrix} n'est pas parfaitement compatible avec l'extension \pkg{arydshln} (parce que cette extension redéfinit de nombreuses commandes internes de \pkg{array}). De toutes manières, dans le cadre de \pkg{nicematrix}, diff --git a/Master/texmf-dist/doc/latex/nicematrix/nicematrix.pdf b/Master/texmf-dist/doc/latex/nicematrix/nicematrix.pdf Binary files differindex d2b0a1ca61c..bae5622a6da 100644 --- a/Master/texmf-dist/doc/latex/nicematrix/nicematrix.pdf +++ b/Master/texmf-dist/doc/latex/nicematrix/nicematrix.pdf diff --git a/Master/texmf-dist/source/latex/nicematrix/nicematrix.dtx b/Master/texmf-dist/source/latex/nicematrix/nicematrix.dtx index 659e7fa56a2..ed200cd9019 100644 --- a/Master/texmf-dist/source/latex/nicematrix/nicematrix.dtx +++ b/Master/texmf-dist/source/latex/nicematrix/nicematrix.dtx @@ -17,8 +17,8 @@ % % \fi % \iffalse -\def\myfileversion{6.13a} -\def\myfiledate{2022/09/17} +\def\myfileversion{6.13b} +\def\myfiledate{2022/10/06} % % %<*batchfile> @@ -4910,6 +4910,11 @@ version 2005/12/01 or later. % \end{Verbatim} % % \bigskip +% The package \pkg{nicematrix} is not fully compatible with the class +% \cls{ltjarticle}: the detection of the empty corners (cf. +% p.~\pageref{corners}) may be wrong. +% +% \bigskip % The package \pkg{nicematrix} is not fully compatible with the package % \pkg{arydshln} (because this package redefines many internal of \pkg{array}). % By any means, in the context of \pkg{nicematrix}, it's recommended to draw @@ -5949,9 +5954,12 @@ version 2005/12/01 or later. % \begin{macrocode} \@@_msg_new:nn { Internal~error } { - A~fatal~internal~error~have~occurred.\\ - If~you~see~this~message,~contact~the~author~of~the~package~'nicematrix'~ - because~this~error~should~not~have~occurred. + Potential~problem~when~using~nicematrix.\\ + The~package~nicematrix~have~detected~a~modification~of~the~ + standard~environment~{array}~(of~the~package~array).~Maybe~you~will~encounter~ + some~slight~problems~when~using~nicematrix.~If~you~don't~want~to~see~ + this~message~again,~load~nicematrix~with:~\token_to_str:N + \usepackage[no-test-for-array]{nicematrix}. } % \end{macrocode} % @@ -5970,7 +5978,7 @@ version 2005/12/01 or later. { \peek_meaning:NTF \ignorespaces { \@@_security_test_i:w } - { \@@_fatal:n { Internal~error } } + { \@@_error:n { Internal~error } } #1 } % \end{macrocode} @@ -5979,7 +5987,7 @@ version 2005/12/01 or later. % \begin{macrocode} \cs_new_protected:Npn \@@_security_test_i:w \ignorespaces #1 { - \peek_meaning:NF \unskip { \@@_fatal:n { Internal~error } } + \peek_meaning:NF \unskip { \@@_error:n { Internal~error } } #1 } % \end{macrocode} @@ -5992,11 +6000,16 @@ version 2005/12/01 or later. \@ifpackageloaded { mdwtab } { \@@_fatal:n { mdwtab~loaded } } { - \hbox_set:Nn \l_tmpa_box + \bool_if:NF \c_@@_no_test_for_array_bool { - \begin { tabular } { c > { \@@_security_test:n } c c } - text & & text - \end { tabular } + \group_begin: + \hbox_set:Nn \l_tmpa_box + { + \begin { tabular } { c > { \@@_security_test:n } c c } + text & & text + \end { tabular } + } + \group_end: } } } @@ -6420,7 +6433,7 @@ version 2005/12/01 or later. \tl_set_rescan:Nno #1 { - \char_set_catcode_other:N > + \char_set_catcode_other:N >_ \char_set_catcode_other:N < } #1 @@ -8428,16 +8441,6 @@ version 2005/12/01 or later. \bool_if:NT \l_@@_small_bool \scriptstyle } % \end{macrocode} -% -% \bigskip -% For unexplained reason, with XeTeX (and not with the other engines), the -% environments of \pkg{nicematrix} were all composed in black and do not take -% into account the color of the encompassing text. As a workaround, you peek the -% color in force at the beginning of the environment and we use it now (in each -% cell of the array). -% \begin{macrocode} - \color { nicematrix } -% \end{macrocode} % % \begin{macrocode} \g_@@_row_style_tl @@ -8657,7 +8660,14 @@ version 2005/12/01 or later. \pgfnode { rectangle } { base } - { \box_use_drop:N \l_@@_cell_box } + { +% \end{macrocode} +% The following instruction |\set@color| has been added on 2022/10/06. It's +% necessary only with XeLaTeX and not with the other engines (we don't know why). +% \begin{macrocode} + \set@color + \box_use_drop:N \l_@@_cell_box + } { \@@_env: - \int_use:N \c@iRow - \int_use:N \c@jCol } { } \str_if_empty:NF \l_@@_name_str @@ -8955,13 +8965,6 @@ version 2005/12/01 or later. \cs_new_protected:Npn \@@_pre_array_ii: { % \end{macrocode} -% For unexplained reason, with XeTeX (and not with the other engines), the -% environments of \pkg{nicematrix} were all composed in black and do not take -% into account the color of the encompassing text. As a workaround, you peek the -% color in force at the beginning of the environment and we will use it in each cell. -% \begin{macrocode} - \xglobal \colorlet { nicematrix } { . } -% \end{macrocode} % The number of letters |X| in the preamble of the array. % \begin{macrocode} \int_gzero:N \g_@@_total_X_weight_int @@ -14459,7 +14462,6 @@ version 2005/12/01 or later. } } % \end{macrocode} -% Enf of |\AddToHook|. % % \medskip % \begin{macrocode} @@ -17670,15 +17672,26 @@ version 2005/12/01 or later. { \seq_put_right:Nn \l_@@_tikz_seq { { #1 } } } { \@@_error:n { tikz~key~without~tikz } } , tikz .value_required:n = true , - fill .tl_set:N = \l_@@_fill_tl , + fill .code:n = + \tl_set_rescan:Nnn + \l_@@_fill_tl + { \char_set_catcode_other:N ! } + { #1 } , fill .value_required:n = true , - draw .tl_set:N = \l_@@_draw_tl , + draw .code:n = + \tl_set_rescan:Nnn + \l_@@_draw_tl + { \char_set_catcode_other:N ! } + { #1 } , draw .default:n = default , rounded-corners .dim_set:N = \l_@@_rounded_corners_dim , rounded-corners .default:n = 4 pt , color .code:n = \@@_color:n { #1 } - \tl_set:Nn \l_@@_draw_tl { #1 } , + \tl_set_rescan:Nnn + \l_@@_draw_tl + { \char_set_catcode_other:N ! } + { #1 } , color .value_required:n = true , borders .clist_set:N = \l_@@_borders_clist , borders .value_required:n = true , @@ -19961,6 +19974,7 @@ version 2005/12/01 or later. footnote,~ footnotehyper,~ messages-for-Overleaf,~ + no-test-for-array,~ renew-dots,~and renew-matrix. } @@ -19977,6 +19991,8 @@ version 2005/12/01 or later. messages-for-Overleaf .bool_set:N = \c_@@_messages_for_Overleaf_bool , footnote .bool_set:N = \c_@@_footnote_bool , footnotehyper .bool_set:N = \c_@@_footnotehyper_bool , + no-test-for-array .bool_set:N = \c_@@_no_test_for_array_bool , + no-test-for-array .default:n = true , unknown .code:n = \@@_error:n { Unknown~key~for~package } } \ProcessKeysOptions { NiceMatrix / Package } diff --git a/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty b/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty index 1a614513716..e160ac5b70c 100644 --- a/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty +++ b/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty @@ -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.13a} -\def\myfiledate{2022/09/17} +\def\myfileversion{6.13b} +\def\myfiledate{2022/10/06} \RequirePackage{pgfcore} \usepgfmodule{shapes} \RequirePackage{l3keys2e} @@ -72,9 +72,12 @@ } \__nicematrix_msg_new:nn { Internal~error } { - A~fatal~internal~error~have~occurred.\\ - If~you~see~this~message,~contact~the~author~of~the~package~'nicematrix'~ - because~this~error~should~not~have~occurred. + Potential~problem~when~using~nicematrix.\\ + The~package~nicematrix~have~detected~a~modification~of~the~ + standard~environment~{array}~(of~the~package~array).~Maybe~you~will~encounter~ + some~slight~problems~when~using~nicematrix.~If~you~don't~want~to~see~ + this~message~again,~load~nicematrix~with:~\token_to_str:N + \usepackage[no-test-for-array]{nicematrix}. } \__nicematrix_msg_new:nn { mdwtab~loaded } { @@ -85,12 +88,12 @@ { \peek_meaning:NTF \ignorespaces { \__nicematrix_security_test_i:w } - { \__nicematrix_fatal:n { Internal~error } } + { \__nicematrix_error:n { Internal~error } } #1 } \cs_new_protected:Npn \__nicematrix_security_test_i:w \ignorespaces #1 { - \peek_meaning:NF \unskip { \__nicematrix_fatal:n { Internal~error } } + \peek_meaning:NF \unskip { \__nicematrix_error:n { Internal~error } } #1 } \hook_gput_code:nnn { begindocument } { . } @@ -98,11 +101,16 @@ \@ifpackageloaded { mdwtab } { \__nicematrix_fatal:n { mdwtab~loaded } } { - \hbox_set:Nn \l_tmpa_box + \bool_if:NF \c__nicematrix_no_test_for_array_bool { - \begin { tabular } { c > { \__nicematrix_security_test:n } c c } - text & & text - \end { tabular } + \group_begin: + \hbox_set:Nn \l_tmpa_box + { + \begin { tabular } { c > { \__nicematrix_security_test:n } c c } + text & & text + \end { tabular } + } + \group_end: } } } @@ -332,7 +340,7 @@ \tl_set_rescan:Nno #1 { - \char_set_catcode_other:N > + \char_set_catcode_other:N >_ \char_set_catcode_other:N < } #1 @@ -1117,7 +1125,6 @@ \c_math_toggle_token \bool_if:NT \l__nicematrix_small_bool \scriptstyle } - \color { nicematrix } \g__nicematrix_row_style_tl \int_compare:nNnTF \c@iRow = 0 { @@ -1246,7 +1253,10 @@ \pgfnode { rectangle } { base } - { \box_use_drop:N \l__nicematrix_cell_box } + { + \set@color + \box_use_drop:N \l__nicematrix_cell_box + } { \__nicematrix_env: - \int_use:N \c@iRow - \int_use:N \c@jCol } { } \str_if_empty:NF \l__nicematrix_name_str @@ -1398,7 +1408,6 @@ } \cs_new_protected:Npn \__nicematrix_pre_array_ii: { - \xglobal \colorlet { nicematrix } { . } \int_gzero:N \g__nicematrix_total_X_weight_int \__nicematrix_expand_clist:N \l__nicematrix_hlines_clist \__nicematrix_expand_clist:N \l__nicematrix_vlines_clist @@ -6522,15 +6531,26 @@ { \seq_put_right:Nn \l__nicematrix_tikz_seq { { #1 } } } { \__nicematrix_error:n { tikz~key~without~tikz } } , tikz .value_required:n = true , - fill .tl_set:N = \l__nicematrix_fill_tl , + fill .code:n = + \tl_set_rescan:Nnn + \l__nicematrix_fill_tl + { \char_set_catcode_other:N ! } + { #1 } , fill .value_required:n = true , - draw .tl_set:N = \l__nicematrix_draw_tl , + draw .code:n = + \tl_set_rescan:Nnn + \l__nicematrix_draw_tl + { \char_set_catcode_other:N ! } + { #1 } , draw .default:n = default , rounded-corners .dim_set:N = \l__nicematrix_rounded_corners_dim , rounded-corners .default:n = 4 pt , color .code:n = \__nicematrix_color:n { #1 } - \tl_set:Nn \l__nicematrix_draw_tl { #1 } , + \tl_set_rescan:Nnn + \l__nicematrix_draw_tl + { \char_set_catcode_other:N ! } + { #1 } , color .value_required:n = true , borders .clist_set:N = \l__nicematrix_borders_clist , borders .value_required:n = true , @@ -8073,6 +8093,7 @@ footnote,~ footnotehyper,~ messages-for-Overleaf,~ + no-test-for-array,~ renew-dots,~and renew-matrix. } @@ -8085,6 +8106,8 @@ messages-for-Overleaf .bool_set:N = \c__nicematrix_messages_for_Overleaf_bool , footnote .bool_set:N = \c__nicematrix_footnote_bool , footnotehyper .bool_set:N = \c__nicematrix_footnotehyper_bool , + no-test-for-array .bool_set:N = \c__nicematrix_no_test_for_array_bool , + no-test-for-array .default:n = true , unknown .code:n = \__nicematrix_error:n { Unknown~key~for~package } } \ProcessKeysOptions { NiceMatrix / Package } |