diff options
author | Karl Berry <karl@freefriends.org> | 2024-01-25 21:22:07 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2024-01-25 21:22:07 +0000 |
commit | 97424294d1f622e17bbdd586cd2b6dcc0083c6c6 (patch) | |
tree | 2587eacb2656399fdb37c4a1dce47c943e97ab8d /Master | |
parent | dd4736c383f7e7930f1f0f0c8bd4c553410fc7a1 (diff) |
nicematrix (25jan24)
git-svn-id: svn://tug.org/texlive/trunk@69588 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r-- | Master/texmf-dist/doc/latex/nicematrix/nicematrix-code.pdf | bin | 973857 -> 968305 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/nicematrix/nicematrix-french.pdf | bin | 596978 -> 597386 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/nicematrix/nicematrix-french.tex | 13 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/nicematrix/nicematrix.pdf | bin | 611795 -> 612085 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/nicematrix/nicematrix.tex | 10 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/nicematrix/nicematrix-code.dtx | 119 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty | 74 |
7 files changed, 25 insertions, 191 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 f05f5fc3110..b31eaa65baa 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 5245e44dce1..47977145025 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 3ba956b397f..149fc5dd330 100644 --- a/Master/texmf-dist/doc/latex/nicematrix/nicematrix-french.tex +++ b/Master/texmf-dist/doc/latex/nicematrix/nicematrix-french.tex @@ -833,7 +833,7 @@ préambule (ce n'est pas le cas avec |\multicolumn|). \begin{center} \fvset{commandchars=\~\#\+} \begin{BVerbatim} -\begin{NiceTabular}{@{}c!{\qquad}ccc~emphase#!{\qquad}+ccc~@{}} +\begin{NiceTabular}{@{}c!{\qquad}ccc~emphase#!{\qquad}+ccc@{}} \toprule Rang & ~emphase#\Block{1-3}{Premier groupe}+ & & & \Block{1-3}{Deuxième groupe} \\ & 1A & 1B & 1C & 2A & 2B & 2C \\ @@ -873,7 +873,7 @@ Voici le même exemple avec la clé |C| pour le premier bloc. \begin{center} \fvset{commandchars=\~\#\+} \begin{BVerbatim} -\begin{NiceTabular}{@{}c!{\qquad}ccc~emphase#!{\qquad}+ccc~@{}} +\begin{NiceTabular}{@{}c!{\qquad}ccc~emphase#!{\qquad}+ccc@{}} \toprule Rang & ~emphase#\Block[C]{1-3}{Premier groupe}+ & & & \Block{1-3}{Deuxième groupe} \\ & 1A & 1B & 1C & 2A & 2B & 2C \\ @@ -2066,7 +2066,9 @@ commande |\columncolor| de \pkg{colortbl}. Sa syntaxe est similaire à celle de son nom à la commande |\rowcolors| de \pkg{colortbl}. Le \emph{s} rappelle qu'il y a deux couleurs. Elle colorie alternativement les rangées avec les deux couleurs à partir de la rangée dont le numéro est donné en premier argument -(obligatoire), comme le fait la commande |\rowcolors| de \pkg{xcolor}. +(obligatoire), comme le fait la commande |\rowcolors| de \pkg{xcolor}. L'un des +deux arguments de couleur peut être vide (et alors aucune couleur n'est +appliquée dans les rangées correspondantes). En fait, le premier argument (obligatoire) peut, plus généralement, contenir une liste d'intervalles correspondant à l'ensemble des rangées sur lesquelles @@ -3624,9 +3626,10 @@ $\begin{bNiceMatrix}[margin,hvlines] \index{Pointillés@\textbf{Pointillés (lignes en ---)}|)} -\subsection{Délimiteurs dans le préambule de l'environnement} +\section{Délimiteurs dans le préambule de l'environnement} \index{blkarray@\pkg{blkarray} (extension)} +\index{delimiteurs@délimiteurs dans les préambules} Pour les environnements à préambule (|{NiceArray}|, |{pNiceArray}|, etc.), il est possible de placer des délimiteurs verticaux directement dans le @@ -4042,7 +4045,7 @@ En dépit de son nom, la commande |\SubMatrix| peut également être utilisée d \smallskip \begin{BVerbatim}[baseline=c] -\begin{NiceTabular}{~@{}ll~@{}} +\begin{NiceTabular}{~LetterAt{}ll~LetterAt{}} \toprule Part A & the first part \\ \Block{2-1}{Part B} & a first sub-part \\ diff --git a/Master/texmf-dist/doc/latex/nicematrix/nicematrix.pdf b/Master/texmf-dist/doc/latex/nicematrix/nicematrix.pdf Binary files differindex e1f5e455dd7..6f728aa977f 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 e1cd2af7428..74f6c7ae152 100644 --- a/Master/texmf-dist/doc/latex/nicematrix/nicematrix.tex +++ b/Master/texmf-dist/doc/latex/nicematrix/nicematrix.tex @@ -1,5 +1,6 @@ % -*- coding: utf-8 ; -*- This file should be compiled with XeLaTeX only -\documentclass[dvipsnames]{article}% dvipsnames is for xcolor (loaded by TikZ, loaded by nicematrix) +\documentclass[dvipsnames]{article}% dvipsnames is for xcolor (loaded by TikZ, + % loaded by nicematrix) ℤ \usepackage{xltxtra} \usepackage{geometry} @@ -2007,7 +2008,8 @@ takes its name from the command |\rowcolors| of \pkg{colortbl}. The \emph{s} emphasizes the fact that there is \emph{two} colors. This command colors alternately the rows of the tabular with the two colors (provided in second and third argument), beginning with the row whose number is given in first -(mandatory) argument. +(mandatory) argument. One of the arguments of color may be empty (no color is +applied in the corresponding rows). In fact, the first (mandatory) argument is, more generally, a comma separated list of intervals describing the rows involved in the action of |\rowcolors| @@ -3542,6 +3544,8 @@ $\begin{bNiceMatrix}[margin,hvlines] \index{blkarray@\pkg{blkarray} (package)} +\index{delimiters@delimiters in the preambles} + \label{delimiters-in-preamble} In the environments with preamble (|{NiceArray}|, |{pNiceArray}|, etc.), it's @@ -3946,7 +3950,7 @@ Despite its name, the command |\SubMatrix| may also be used within a \medskip \begin{BVerbatim}[baseline=c] -\begin{NiceTabular}{~@{}ll~@{}} +\begin{NiceTabular}{~LetterAt{}ll~LetterAt{}} \toprule Part A & the first part \\ \Block{2-1}{Part B} & a first sub-part \\ diff --git a/Master/texmf-dist/source/latex/nicematrix/nicematrix-code.dtx b/Master/texmf-dist/source/latex/nicematrix/nicematrix-code.dtx index dea9c0ecd70..73cf741334a 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.26c} -\def\myfiledate{2024/01/02} +\def\myfileversion{6.26d} +\def\myfiledate{2024/01/25} % % %<*batchfile> @@ -739,104 +739,6 @@ version 2005/12/01 or later. } % \end{macrocode} % -% \bigskip -% Since we will do ourself the expansion of the preamble of the array, we will -% modify |\@mkpream| of \pkg{array} in order to skip the operation of expansion -% done by |\@mkpream|. -% \begin{macrocode} -\cs_set_eq:NN \@@_old_mkpream: \@mkpream -\cs_set_protected:Npn \@@_mkpream: #1 - { -% \end{macrocode} -% The command |\@@_mkpream_colortbl:| will be empty when \pkg{colortbl} is not loaded. -% \begin{macrocode} - \@@_mkpream_colortbl: - \gdef\@preamble{} \@lastchclass 4 \@firstamptrue - \let\@sharp\relax - \def\@startpbox##1{\unexpanded\expandafter{\expandafter - \@startpbox\expandafter{##1}}}\let\@endpbox\relax - \let\do@row@strut\relax - \let\ar@align@mcell\relax - \@temptokena{#1} % \@tempswatrue - % \@whilesw\if@tempswa\fi{\@tempswafalse\the\NC@list}% - \count@\m@ne - \let\the@toks\relax - \prepnext@tok -% \end{macrocode} -% We have slightly modified the code of the original version of |\@mkpream| in -% order to have something compatible with |\ExplSyntaxOn|. -% \begin{macrocode} - \exp_args:NV \tl_map_variable:NNn \@temptokena \@nextchar - {\@testpach - \ifcase \@chclass \@classz \or \@classi \or \@classii - \or \save@decl \or \or \@classv \or \@classvi - \or \@classvii \or \@classviii - \or \@classx - \or \@classx \fi - \@lastchclass\@chclass}% - \ifcase\@lastchclass - \@acol \or - \or - \@acol \or - \@preamerr \thr@@ \or - \@preamerr \tw@ \@addtopreamble\@sharp \or - \or - \else \@preamerr \@ne \fi - \def\the@toks{\the\toks} -% \end{macrocode} -% After an utilisation of the modified version of |\@mkpream|, we come back to -% the original version because there may be occurrences of the classical -% |{array}| in the cells of our array (of \pkg{nicematrix}). -% \begin{macrocode} - \cs_gset_eq:NN \@mkpream \@@_old_mkpream: - } -% \end{macrocode} -% The classes of REVTeX do their own redefinition of |\array| and that's why the -% previous mechanism is not compatible with REVTeX. However, it would probably -% be possible to do something similar for REVTeX... -% \begin{macrocode} -\hook_gput_code:nnn { begindocument } { . } - { - \bool_if:NTF \c_@@_revtex_bool - { \cs_set_eq:NN \@@_redefine_mkpream: \prg_do_nothing: } - { - \IfPackageLoadedTF { arydshln } - { \cs_set_eq:NN \@@_redefine_mkpream: \prg_do_nothing: } - { - \cs_new_protected:Npn \@@_redefine_mkpream: - { \cs_set_eq:NN \@mkpream \@@_mkpream: } - } - } - } -% \end{macrocode} -% -% \bigskip -% \begin{macrocode} -\cs_new_protected:Npn \@@_mkpream_colortbl: { } -\hook_gput_code:nnn { begindocument } { . } - { - \IfPackageLoadedTF { colortbl } - { - \cs_set_protected:Npn \@@_mkpream_colortbl: - { -% \end{macrocode} -% The following lines are a patch added to |\@mkpream| by \pkg{colortbl} (by -% storing the version of |\@mkpream| provided by \pkg{array} in -% |\@mkpreamarray|). Since you do a redefinition of |\@mkpream|, you have to add -% the following lines in our redefinition when \pkg{colortbl} is loaded. -% \begin{macrocode} - \cs_set_eq:NN \CT@setup \relax - \cs_set_eq:NN \CT@color \relax - \cs_set_eq:NN \CT@do@color \relax - \cs_set_eq:NN \color \relax - \cs_set_eq:NN \CT@column@color \relax - \cs_set_eq:NN \CT@row@color \relax - \cs_set_eq:NN \CT@cell@color \relax - } - } - { } - } -% \end{macrocode} % % \bigskip % \section{Parameters} @@ -1825,7 +1727,7 @@ version 2005/12/01 or later. % couple of the form : \texttt{\{\textsl{label}\}\{\textsl{text of the % tabularnote}\}}. The first component is the optional argument (between square % brackets) of the command |\tabularnote| (if the optional argument is not used, -% the value will be the special marker |\c_novalue_tl|). +% the value will be the special marker expressed by |\c_novalue_tl|). % \item During the composition of the caption (value of |\l_@@_caption_tl|), the % tabular notes will be numbered from $1$ to |\g_@@_notes_caption_int| and the % notes themselves will be stored in |\g_@@_notes_in_caption_seq|. The structure @@ -1981,7 +1883,8 @@ version 2005/12/01 or later. % \bigskip % For the version in normal conditions, that is to say not in the |caption|. % |#1| is the optional argument of |\tabularnote| (maybe equal to the special -% marker |\c_novalue_tl|) and |#2| is the mandatory argument of |\tabularnote|. +% marker expressed by |\c_novalue_tl|) and |#2| is the mandatory argument of +% |\tabularnote|. % \begin{macrocode} \cs_new_protected:Npn \@@_tabularnote:nn #1 #2 { @@ -2002,7 +1905,7 @@ version 2005/12/01 or later. % \texttt{\{\textsl{label}\}\{\textsl{text of the tabularnote}\}}. % \end{center} % If the user have used |\tabularnote| without the optional argument, the -% \texttt{\textsl{label}} will be the special marker |\c_novalue_tl|. +% \texttt{\textsl{label}} will be the special marker expressed by |\c_novalue_tl|. % % When we will go through the sequence |\g_@@_notes_seq|, we will count in % |\l_tmpb_int| the notes without explicit label in order to have the @@ -3537,13 +3440,7 @@ version 2005/12/01 or later. % \begin{macrocode} \cs_new_protected:Npn \@@_array: { -% \end{macrocode} -% The following line is only a speed-up: it's a redefinition of |\@mkpream| -% of \pkg{array} in order to speed up the compilation by deleting one line of -% code in |\@mkpream| (the expansion of the preamble). In the classes of REVTeX, -% that command |\@@_redefine_mkpream:| will be nullified (no speed-up). % \begin{macrocode} - \@@_redefine_mkpream: \dim_set:Nn \col@sep { \bool_if:NTF \l_@@_tabular_bool \tabcolsep \arraycolsep } \dim_compare:nNnTF \l_@@_tabular_width_dim = \c_zero_dim @@ -5270,7 +5167,6 @@ version 2005/12/01 or later. % the corresponding key in the optional argument of the specifier). % \begin{macrocode} \str_set_eq:NN \l_@@_hpos_col_str \c_@@_j_str - % \tl_set:Nn \l_tmpa_tl { #1 } \@@_keys_p_column:n { #1 } \@@_make_preamble_ii_iv:nnn { #2 } { minipage } { } } @@ -15118,11 +15014,10 @@ version 2005/12/01 or later. \pgf@y + ( \box_ht:N \strutbox + \extrarowheight ) * \arraystretch } - } % modified 6.13c + } \@@_qpoint:n { row - \l_@@_last_i_tl - base } \dim_set:Nn \l_@@_y_final_dim { \fp_to_dim:n { \pgf@y - ( \box_dp:N \strutbox ) * \arraystretch } } - % modified 6.13c \int_step_inline:nnn \l_@@_first_col_int \g_@@_col_total_int { \cs_if_exist:cT diff --git a/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty b/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty index 8f101bdf920..ea4ffccbb1e 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.26c} -\def\myfiledate{2024/01/02} +\def\myfileversion{6.26d} +\def\myfiledate{2024/01/25} \RequirePackage{pgfcore} \usepgfmodule{shapes} \RequirePackage{l3keys2e} @@ -327,71 +327,6 @@ } #1 } -\cs_set_eq:NN \__nicematrix_old_mkpream: \@mkpream -\cs_set_protected:Npn \__nicematrix_mkpream: #1 - { - \__nicematrix_mkpream_colortbl: - \gdef\@preamble{} \@lastchclass 4 \@firstamptrue - \let\@sharp\relax - \def\@startpbox##1{\unexpanded\expandafter{\expandafter - \@startpbox\expandafter{##1}}}\let\@endpbox\relax - \let\do@row@strut\relax - \let\ar@align@mcell\relax - \@temptokena{#1} % \@tempswatrue - % \@whilesw\if@tempswa\fi{\@tempswafalse\the\NC@list}% - \count@\m@ne - \let\the@toks\relax - \prepnext@tok - \exp_args:NV \tl_map_variable:NNn \@temptokena \@nextchar - {\@testpach - \ifcase \@chclass \@classz \or \@classi \or \@classii - \or \save@decl \or \or \@classv \or \@classvi - \or \@classvii \or \@classviii - \or \@classx - \or \@classx \fi - \@lastchclass\@chclass}% - \ifcase\@lastchclass - \@acol \or - \or - \@acol \or - \@preamerr \thr__nicematrix \or - \@preamerr \tw@ \@addtopreamble\@sharp \or - \or - \else \@preamerr \@ne \fi - \def\the@toks{\the\toks} - \cs_gset_eq:NN \@mkpream \__nicematrix_old_mkpream: - } -\hook_gput_code:nnn { begindocument } { . } - { - \bool_if:NTF \c__nicematrix_revtex_bool - { \cs_set_eq:NN \__nicematrix_redefine_mkpream: \prg_do_nothing: } - { - \IfPackageLoadedTF { arydshln } - { \cs_set_eq:NN \__nicematrix_redefine_mkpream: \prg_do_nothing: } - { - \cs_new_protected:Npn \__nicematrix_redefine_mkpream: - { \cs_set_eq:NN \@mkpream \__nicematrix_mkpream: } - } - } - } -\cs_new_protected:Npn \__nicematrix_mkpream_colortbl: { } -\hook_gput_code:nnn { begindocument } { . } - { - \IfPackageLoadedTF { colortbl } - { - \cs_set_protected:Npn \__nicematrix_mkpream_colortbl: - { - \cs_set_eq:NN \CT@setup \relax - \cs_set_eq:NN \CT@color \relax - \cs_set_eq:NN \CT@do@color \relax - \cs_set_eq:NN \color \relax - \cs_set_eq:NN \CT@column@color \relax - \cs_set_eq:NN \CT@row@color \relax - \cs_set_eq:NN \CT@cell@color \relax - } - } - { } - } \int_new:N \g__nicematrix_env_int \cs_new:Npn \__nicematrix_env: { nm - \int_use:N \g__nicematrix_env_int } \NewExpandableDocumentCommand \NiceMatrixLastEnv { } @@ -1492,7 +1427,6 @@ } \cs_new_protected:Npn \__nicematrix_array: { - \__nicematrix_redefine_mkpream: \dim_set:Nn \col@sep { \bool_if:NTF \l__nicematrix_tabular_bool \tabcolsep \arraycolsep } \dim_compare:nNnTF \l__nicematrix_tabular_width_dim = \c_zero_dim @@ -2401,7 +2335,6 @@ \cs_new_protected:Npn \__nicematrix_make_preamble_ii_iii:nn #1 #2 { \str_set_eq:NN \l__nicematrix_hpos_col_str \c__nicematrix_j_str - % \tl_set:Nn \l_tmpa_tl { #1 } \__nicematrix_keys_p_column:n { #1 } \__nicematrix_make_preamble_ii_iv:nnn { #2 } { minipage } { } } @@ -8436,11 +8369,10 @@ \pgf@y + ( \box_ht:N \strutbox + \extrarowheight ) * \arraystretch } - } % modified 6.13c + } \__nicematrix_qpoint:n { row - \l__nicematrix_last_i_tl - base } \dim_set:Nn \l__nicematrix_y_final_dim { \fp_to_dim:n { \pgf@y - ( \box_dp:N \strutbox ) * \arraystretch } } - % modified 6.13c \int_step_inline:nnn \l__nicematrix_first_col_int \g__nicematrix_col_total_int { \cs_if_exist:cT |