diff options
author | Karl Berry <karl@freefriends.org> | 2023-05-25 20:37:34 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-05-25 20:37:34 +0000 |
commit | fc9be1452149628b5de8cb5cc924e10115b523a6 (patch) | |
tree | 4d649370f84f1eef828d8f50fbd4dff9a638a0d8 /Master | |
parent | 99ca1c9e484208d10d4172dfcbcc1ba2dc79d781 (diff) |
nicematrix (25may23)
git-svn-id: svn://tug.org/texlive/trunk@67216 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r-- | Master/texmf-dist/doc/latex/nicematrix/nicematrix-code.pdf | bin | 909639 -> 909512 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/nicematrix/nicematrix-french.pdf | bin | 577804 -> 575208 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 | 571224 -> 592717 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/nicematrix/nicematrix.tex | 4 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/nicematrix/nicematrix-code.dtx | 48 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty | 29 |
7 files changed, 33 insertions, 53 deletions
diff --git a/Master/texmf-dist/doc/latex/nicematrix/nicematrix-code.pdf b/Master/texmf-dist/doc/latex/nicematrix/nicematrix-code.pdf Binary files differindex 6cc99d6835b..923fd4f5536 100644 --- a/Master/texmf-dist/doc/latex/nicematrix/nicematrix-code.pdf +++ b/Master/texmf-dist/doc/latex/nicematrix/nicematrix-code.pdf 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 fcc05694fd7..d7c7d18c980 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 1b5bf2b9df7..b27ce64a4ee 100644 --- a/Master/texmf-dist/doc/latex/nicematrix/nicematrix-french.tex +++ b/Master/texmf-dist/doc/latex/nicematrix/nicematrix-french.tex @@ -1808,7 +1808,10 @@ l'extension \pkg{xcolor} ; rowcolor}, etc.)} \colorbox{yellow!50}{\textbf{Nouveau 6.18}} -une spécification d'opacité selon la forme \texttt{opacity = \textsl{valeur}}. +une spécification d'opacité selon la forme \texttt{opacity = + \textsl{valeur}}.\footnote{Attention : cette fonctionnalité génère des instructions de + transparence dans le \textsc{pdf} résultant et certains lecteurs de + \textsc{pdf} n'acceptent pas la transparence.} \end{itemize} diff --git a/Master/texmf-dist/doc/latex/nicematrix/nicematrix.pdf b/Master/texmf-dist/doc/latex/nicematrix/nicematrix.pdf Binary files differindex 474dac2ee0f..9f3a9dfb70a 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/doc/latex/nicematrix/nicematrix.tex b/Master/texmf-dist/doc/latex/nicematrix/nicematrix.tex index 6cf322afa9e..f09d282e102 100644 --- a/Master/texmf-dist/doc/latex/nicematrix/nicematrix.tex +++ b/Master/texmf-dist/doc/latex/nicematrix/nicematrix.tex @@ -1755,7 +1755,9 @@ by a comma) the extension \pkg{xcolor}; \item \index{opacity (key of commands such as\newline \texttt{\textbackslash rowcolor}, etc.)} \colorbox{yellow!50}{\textbf{New 6.18}}\par\nobreak -a specification of opacity f the form \texttt{opacity = \textsl{value}}. +a specification of opacity of the form \texttt{opacity = + \textsl{value}}.\footnote{Caution : that feature creates instructions of + transparency in the \textsc{pdf} and some \textsc{pdr} don't support such instructions.} \end{itemize} \bigskip diff --git a/Master/texmf-dist/source/latex/nicematrix/nicematrix-code.dtx b/Master/texmf-dist/source/latex/nicematrix/nicematrix-code.dtx index 4c28160949b..93555aa1e51 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.19} -\def\myfiledate{2023/05/15} +\def\myfileversion{6.19a} +\def\myfiledate{2023/05/25} % % %<*batchfile> @@ -1743,7 +1743,10 @@ version 2005/12/01 or later. \seq_map_indexed_inline:Nn \g_@@_notes_seq { \tl_if_eq:nnT { { #1 } { #2 } } { ##2 } - { \int_set:Nn \l_tmpa_int { ##1 } \seq_map_break: } + { + \int_set:Nn \l_tmpa_int { ##1 } + \seq_map_break: + } } \int_compare:nNnF \l_tmpa_int = \c_zero_int { \int_add:Nn \l_tmpa_int \g_@@_notes_caption_int } @@ -1829,31 +1832,20 @@ version 2005/12/01 or later. { \int_gzero:N \c@tabularnote } % \end{macrocode} % Now, we try to detect duplicate notes in the caption. +% Be careful! We must put |\tl_if_in:NnF| and not |\tl_if_in:NnT|! % \begin{macrocode} - \bool_set_false:N \l_tmpa_bool - \seq_map_inline:Nn \g_@@_notes_in_caption_seq - { \@@_if_eq_two_three:nnn ##1 { #2 } } -% \end{macrocode} -% Be careful! We must put |\bool_if:NF| and not |\bool_if:NT|! -% \begin{macrocode} - \bool_if:NF \l_tmpa_bool + \seq_if_in:NnF \g_@@_notes_in_caption_seq { { #1 } { #2 } } { \@@_error:n { Identical~notes~in~caption } } } { % \end{macrocode} % In the following code, we are in the first composition of the caption or at -% the first |\tabularnote| of the second composition. We have -% to see whether the text of our tabular note is among the texts of the -% tabularnotes stored in |\g_@@_notes_in_caption_seq|. For that, we will loop on -% |\g_@@_notes_in_caption_seq| and we will raise |\l_tmpa_bool| if the text is found. +% the first |\tabularnote| of the second composition. % \begin{macrocode} - \bool_set_false:N \l_tmpa_bool - \seq_map_inline:Nn \g_@@_notes_in_caption_seq - { \@@_if_eq_two_three:nnn ##1 { #2 } } - \bool_if:NTF \l_tmpa_bool + \seq_if_in:NnTF \g_@@_notes_in_caption_seq { { #1 } { #2 } } { % \end{macrocode} -% Now, we known that are in the second composition of the caption since we are +% Now, we know that are in the second composition of the caption since we are % reading a tabular note which has yet been read. Now, the value of % |\g_@@_notes_caption_int| won't change anymore: it's the number of uses % \emph{without optional argument} of the command |\tabularnote| in the caption. @@ -1884,16 +1876,6 @@ version 2005/12/01 or later. } % \end{macrocode} % -% \begin{macrocode} -\cs_new_protected:Npn \@@_if_eq_two_three:nnn #1 #2 #3 - { - \tl_if_eq:nnT { #2 } { #3 } - { - \bool_set_true:N \l_tmpa_bool - \seq_map_break: - } - } -% \end{macrocode} % % \begin{macrocode} \cs_new_protected:Npn \@@_count_novalue_first:nn #1 #2 @@ -9218,7 +9200,8 @@ version 2005/12/01 or later. % % In the |\CodeAfter|, the command |\@@_line:nn| will be linked to |\line|. This % command takes two arguments which are the specifications of two cells in the -% array (in the format $i$-$j$) and draws a dotted line between these cells. +% array (in the format $i$-$j$) and draws a dotted line between these cells. In +% fact, if also works with names of blocks. % % \medskip % First, we write a command with the following behaviour: @@ -9284,7 +9267,10 @@ version 2005/12/01 or later. { \@@_error:nnn { unknown~cell~for~line~in~CodeAfter } { #1 } { #2 } } - { \@@_draw_line_ii:nn { #1 } { #2 } } +% \end{macrocode} +% The test of |measuring@| is a security (cf. question 686649 on TeX StackExchange). +% \begin{macrocode} + { \legacy_if:nF { measuring@ } { \@@_draw_line_ii:nn { #1 } { #2 } } } } % \end{macrocode} % diff --git a/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty b/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty index e49a5c7964f..d3e036baeb9 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.19} -\def\myfiledate{2023/05/15} +\def\myfileversion{6.19a} +\def\myfiledate{2023/05/25} \RequirePackage{pgfcore} \usepgfmodule{shapes} \RequirePackage{l3keys2e} @@ -548,7 +548,10 @@ \seq_map_indexed_inline:Nn \g__nicematrix_notes_seq { \tl_if_eq:nnT { { #1 } { #2 } } { ##2 } - { \int_set:Nn \l_tmpa_int { ##1 } \seq_map_break: } + { + \int_set:Nn \l_tmpa_int { ##1 } + \seq_map_break: + } } \int_compare:nNnF \l_tmpa_int = \c_zero_int { \int_add:Nn \l_tmpa_int \g__nicematrix_notes_caption_int } @@ -601,17 +604,11 @@ \int_compare:nNnT \c@tabularnote = \g__nicematrix_notes_caption_int { \int_gzero:N \c@tabularnote } - \bool_set_false:N \l_tmpa_bool - \seq_map_inline:Nn \g__nicematrix_notes_in_caption_seq - { \__nicematrix_if_eq_two_three:nnn ##1 { #2 } } - \bool_if:NF \l_tmpa_bool + \seq_if_in:NnF \g__nicematrix_notes_in_caption_seq { { #1 } { #2 } } { \__nicematrix_error:n { Identical~notes~in~caption } } } { - \bool_set_false:N \l_tmpa_bool - \seq_map_inline:Nn \g__nicematrix_notes_in_caption_seq - { \__nicematrix_if_eq_two_three:nnn ##1 { #2 } } - \bool_if:NTF \l_tmpa_bool + \seq_if_in:NnTF \g__nicematrix_notes_in_caption_seq { { #1 } { #2 } } { \bool_gset_true:N \g__nicematrix_caption_finished_bool \int_gset_eq:NN \g__nicematrix_notes_caption_int \c@tabularnote @@ -633,14 +630,6 @@ \seq_clear:N \l__nicematrix_notes_labels_seq } } -\cs_new_protected:Npn \__nicematrix_if_eq_two_three:nnn #1 #2 #3 - { - \tl_if_eq:nnT { #2 } { #3 } - { - \bool_set_true:N \l_tmpa_bool - \seq_map_break: - } - } \cs_new_protected:Npn \__nicematrix_count_novalue_first:nn #1 #2 { \tl_if_novalue:nT { #1 } { \int_gincr:N \g__nicematrix_notes_caption_int } } \cs_new_protected:Npn \__nicematrix_pgf_rect_node:nnnnn #1 #2 #3 #4 #5 @@ -4898,7 +4887,7 @@ { \__nicematrix_error:nnn { unknown~cell~for~line~in~CodeAfter } { #1 } { #2 } } - { \__nicematrix_draw_line_ii:nn { #1 } { #2 } } + { \legacy_if:nF { measuring@ } { \__nicematrix_draw_line_ii:nn { #1 } { #2 } } } } \hook_gput_code:nnn { begindocument } { . } { |