summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/nicematrix/nicematrix-code.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib/nicematrix/nicematrix-code.dtx')
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix-code.dtx119
1 files changed, 7 insertions, 112 deletions
diff --git a/macros/latex/contrib/nicematrix/nicematrix-code.dtx b/macros/latex/contrib/nicematrix/nicematrix-code.dtx
index dea9c0ecd7..73cf741334 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.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