From 8057c647880f05a2624b3d04ab0eb38d5cbf8c18 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Fri, 26 May 2023 03:02:08 +0000 Subject: CTAN sync 202305260302 --- .../latex/contrib/nicematrix/nicematrix-code.dtx | 48 ++++++++------------- .../latex/contrib/nicematrix/nicematrix-code.pdf | Bin 909639 -> 909512 bytes .../latex/contrib/nicematrix/nicematrix-french.pdf | Bin 577804 -> 575208 bytes .../latex/contrib/nicematrix/nicematrix-french.tex | 5 ++- macros/latex/contrib/nicematrix/nicematrix.pdf | Bin 571224 -> 592717 bytes macros/latex/contrib/nicematrix/nicematrix.tex | 4 +- 6 files changed, 24 insertions(+), 33 deletions(-) (limited to 'macros/latex/contrib/nicematrix') diff --git a/macros/latex/contrib/nicematrix/nicematrix-code.dtx b/macros/latex/contrib/nicematrix/nicematrix-code.dtx index 4c28160949..93555aa1e5 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.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/macros/latex/contrib/nicematrix/nicematrix-code.pdf b/macros/latex/contrib/nicematrix/nicematrix-code.pdf index 6cc99d6835..923fd4f553 100644 Binary files a/macros/latex/contrib/nicematrix/nicematrix-code.pdf and b/macros/latex/contrib/nicematrix/nicematrix-code.pdf differ diff --git a/macros/latex/contrib/nicematrix/nicematrix-french.pdf b/macros/latex/contrib/nicematrix/nicematrix-french.pdf index fcc05694fd..d7c7d18c98 100644 Binary files a/macros/latex/contrib/nicematrix/nicematrix-french.pdf and b/macros/latex/contrib/nicematrix/nicematrix-french.pdf differ diff --git a/macros/latex/contrib/nicematrix/nicematrix-french.tex b/macros/latex/contrib/nicematrix/nicematrix-french.tex index 1b5bf2b9df..b27ce64a4e 100644 --- a/macros/latex/contrib/nicematrix/nicematrix-french.tex +++ b/macros/latex/contrib/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/macros/latex/contrib/nicematrix/nicematrix.pdf b/macros/latex/contrib/nicematrix/nicematrix.pdf index 474dac2ee0..9f3a9dfb70 100644 Binary files a/macros/latex/contrib/nicematrix/nicematrix.pdf and b/macros/latex/contrib/nicematrix/nicematrix.pdf differ diff --git a/macros/latex/contrib/nicematrix/nicematrix.tex b/macros/latex/contrib/nicematrix/nicematrix.tex index 6cf322afa9..f09d282e10 100644 --- a/macros/latex/contrib/nicematrix/nicematrix.tex +++ b/macros/latex/contrib/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 -- cgit v1.2.3