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.dtx47
1 files changed, 33 insertions, 14 deletions
diff --git a/macros/latex/contrib/nicematrix/nicematrix-code.dtx b/macros/latex/contrib/nicematrix/nicematrix-code.dtx
index 73cf741334..6503a47298 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.26d}
-\def\myfiledate{2024/01/25}
+\def\myfileversion{6.27}
+\def\myfiledate{2024/02/13}
%
%
%<*batchfile>
@@ -50,8 +50,8 @@ version 2005/12/01 or later.
%<*driver>
\documentclass[dvipsnames]{l3doc}% dvipsnames is for xcolor (loaded by Tikz)
\VerbatimFootnotes
-\usepackage{xltxtra}
-\usepackage[xetex]{geometry}
+
+\usepackage[luatex]{geometry}
\geometry{left=2.8cm,right=2.8cm,top=2.5cm,bottom=2.5cm,papersize={21cm,29.7cm}}
\usepackage{tikz}
@@ -61,7 +61,7 @@ version 2005/12/01 or later.
\NewDocumentEnvironment {scope} {} {} {}
\def\interitem{\vspace{7mm plus 2 mm minus 3mm}}
-\fvset{commandchars=\~\#\@,formatcom=\color{gray}}
+\fvset{formatcom=\color{gray}}
\usepackage{upquote}
@@ -2232,9 +2232,12 @@ version 2005/12/01 or later.
% \end{macrocode}
%
% \bigskip
-% The boolean |\l_@@_light_syntax_bool| corresponds to the option |light-syntax|.
+% The boolean |\l_@@_light_syntax_bool| corresponds to the option |light-syntax|
+% and the boolean |\l_@@_light_syntax_expanded_bool| correspond to the the
+% option |light-syntax-expanded|.
% \begin{macrocode}
\bool_new:N \l_@@_light_syntax_bool
+\bool_new:N \l_@@_light_syntax_expanded_bool
% \end{macrocode}
%
% \bigskip
@@ -2499,8 +2502,14 @@ version 2005/12/01 or later.
} ,
cell-space-limits .value_required:n = true ,
xdots .code:n = \keys_set:nn { NiceMatrix / xdots } { #1 } ,
- light-syntax .bool_set:N = \l_@@_light_syntax_bool ,
- light-syntax .default:n = true ,
+ light-syntax .code:n =
+ \bool_set_true:N \l_@@_light_syntax_bool
+ \bool_set_false:N \l_@@_light_syntax_expanded_bool ,
+ light-syntax .value_forbidden:n = true ,
+ light-syntax-expanded .code:n =
+ \bool_set_true:N \l_@@_light_syntax_bool
+ \bool_set_true:N \l_@@_light_syntax_expanded_bool ,
+ light-syntax-expanded .value_forbidden:n = true ,
end-of-row .tl_set:N = \l_@@_end_of_row_tl ,
end-of-row .value_required:n = true ,
first-col .code:n = \int_zero:N \l_@@_first_col_int ,
@@ -3759,7 +3768,7 @@ version 2005/12/01 or later.
\cs_set_eq:NN \Hdotsfor \@@_Hdotsfor:
\cs_set_eq:NN \Vdotsfor \@@_Vdotsfor:
\cs_set_eq:NN \Block \@@_Block:
- \cs_set_eq:NN \rotate \@@_rotate:
+ \cs_set_eq:NN \rotate \@@_rotate:
\cs_set_eq:NN \OnlyMainNiceMatrix \@@_OnlyMainNiceMatrix:n
\cs_set_eq:NN \dotfill \@@_dotfill:
\cs_set_eq:NN \CodeAfter \@@_CodeAfter:
@@ -6740,7 +6749,10 @@ version 2005/12/01 or later.
% We rescan the character of end of line in order to have the correct catcode.
% \begin{macrocode}
\tl_set_rescan:Nno \l_@@_end_of_row_tl { } \l_@@_end_of_row_tl
- \seq_set_split:NVn \l_@@_rows_seq \l_@@_end_of_row_tl { #1 }
+ \bool_if:NTF \l_@@_light_syntax_expanded_bool
+ \seq_set_split:Nee
+ \seq_set_split:NVn
+ \l_@@_rows_seq \l_@@_end_of_row_tl { #1 }
% \end{macrocode}
% We delete the last row if it is empty.
% \begin{macrocode}
@@ -9941,7 +9953,7 @@ version 2005/12/01 or later.
% |#1| is the first row \emph{after} the scope of the instructions in |#2|
% \begin{macrocode}
\cs_new:Npn \@@_if_row_less_than:nn #1 #2
- { \int_compare:nNnT \c@iRow < { #1 } { #2 } }
+ { \int_compare:nNnT { \c@iRow } < { #1 } { #2 } }
% \end{macrocode}
%
% \bigskip
@@ -9958,7 +9970,11 @@ version 2005/12/01 or later.
\exp_not:N
\@@_if_row_less_than:nn
{ \int_eval:n { \c@iRow + \l_@@_key_nb_rows_int } }
- { \exp_not:n { #1 } }
+% \end{macrocode}
+% The |\scan_stop:| is mandatory (for ex. for the case where |\rotate| is used
+% in the argument of |\RowStyle|).
+% \begin{macrocode}
+ { \exp_not:n { #1 } \scan_stop: }
}
}
\cs_generate_variant:Nn \@@_put_in_row_style:n { e }
@@ -9987,7 +10003,6 @@ version 2005/12/01 or later.
nb-rows .value_required:n = true ,
rowcolor .tl_set:N = \l_tmpa_tl ,
rowcolor .value_required:n = true ,
- rowcolor .initial:n = ,
unknown .code:n = \@@_error:n { Unknown~key~for~RowStyle }
}
% \end{macrocode}
@@ -9998,7 +10013,7 @@ version 2005/12/01 or later.
\NewDocumentCommand \@@_RowStyle:n { O { } m }
{
\group_begin:
- \tl_clear:N \l_tmpa_tl % value of \rowcolor
+ \tl_clear:N \l_tmpa_tl
\tl_clear:N \l_@@_color_tl
\int_set_eq:NN \l_@@_key_nb_rows_int \c_one_int
\dim_zero:N \l_tmpa_dim
@@ -17060,6 +17075,7 @@ version 2005/12/01 or later.
last-row,~
left-margin,~
light-syntax,~
+ light-syntax-expanded,~
matrix/columns-type,~
no-cell-nodes,~
notes~(several~subkeys),~
@@ -17119,6 +17135,7 @@ version 2005/12/01 or later.
last-row,~
left-margin,~
light-syntax,~
+ light-syntax-expanded,~
name,~
no-cell-nodes,~
nullify-dots,~
@@ -17184,6 +17201,7 @@ version 2005/12/01 or later.
last-row,~
left-margin,~
light-syntax,~
+ light-syntax-expanded,~
name,~
no-cell-nodes,~
nullify-dots,~
@@ -17247,6 +17265,7 @@ version 2005/12/01 or later.
last-row,~
left-margin,~
light-syntax,~
+ light-syntax-expanded,~
name,~
no-cell-nodes,~
notes~(several~subkeys),~