summaryrefslogtreecommitdiff
path: root/macros/latex/required/l3kernel/l3fparray.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/required/l3kernel/l3fparray.dtx')
-rw-r--r--macros/latex/required/l3kernel/l3fparray.dtx41
1 files changed, 21 insertions, 20 deletions
diff --git a/macros/latex/required/l3kernel/l3fparray.dtx b/macros/latex/required/l3kernel/l3fparray.dtx
index 6ae23fd96d..642e75c659 100644
--- a/macros/latex/required/l3kernel/l3fparray.dtx
+++ b/macros/latex/required/l3kernel/l3fparray.dtx
@@ -2,7 +2,7 @@
%
%% File: l3fparray.dtx
%
-% Copyright (C) 2018-2024 The LaTeX Project
+% Copyright (C) 2018-2025 The LaTeX Project
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2024-12-25}
+% \date{Released 2025-01-18}
%
% \maketitle
%
@@ -266,25 +266,25 @@
\exp_after:wN \@@_array_gset:NNNNww
\exp_after:wN #1
\exp_after:wN #1
- \int_value:w \int_eval:n {#2} \exp_after:wN ;
+ \int_value:w \int_eval:n {#2} \exp_after:wN \@@_sep:
\exp:w \exp_end_continue_f:w \@@_parse:n {#3}
}
\cs_generate_variant:Nn \fparray_gset:Nnn { c }
-\cs_new_protected:Npn \@@_array_gset:NNNNww #1#2#3#4#5 ; #6 ;
+\cs_new_protected:Npn \@@_array_gset:NNNNww #1#2#3#4#5 \@@_sep: #6 \@@_sep:
{
\@@_array_bounds:NNnTF \msg_error:nneee #4 {#5}
{
\exp_after:wN \@@_change_func_type:NNN
- \@@_use_i_until_s:nw #6 ;
+ \@@_use_i_until_s:nw #6 \@@_sep:
\@@_array_gset:w
\@@_array_gset_recover:Nw
- #6 ; {#5} #1 #2 #3
+ #6 \@@_sep: {#5} #1 #2 #3
}
{ }
}
-\cs_new_protected:Npn \@@_array_gset_recover:Nw #1#2 ;
+\cs_new_protected:Npn \@@_array_gset_recover:Nw #1#2 \@@_sep:
{
- \@@_error:nffn { unknown-type } { \tl_to_str:n { #2 ; } } { } { }
+ \@@_error:nffn { unknown-type } { \tl_to_str:n { #2 \@@_sep: } } { } { }
\exp_after:wN #1 \c_nan_fp
}
\cs_new_protected:Npn \@@_array_gset:w \s_@@ \@@_chk:w #1#2
@@ -298,7 +298,7 @@
\s_@@ \@@_chk:w #1 #2
}
\cs_new_protected:Npn \@@_array_gset_normal:w
- \s_@@ \@@_chk:w 1 #1 #2 #3#4#5 ; #6#7#8#9
+ \s_@@ \@@_chk:w 1 #1 #2 #3#4#5 \@@_sep: #6#7#8#9
{
\__kernel_intarray_gset:Nnn #7 {#6} {#2}
\__kernel_intarray_gset:Nnn #8 {#6}
@@ -354,7 +354,7 @@
{
\exp_after:wN \@@_array_item:NwN
\exp_after:wN #1
- \int_value:w \int_eval:n {#2} ;
+ \int_value:w \int_eval:n {#2} \@@_sep:
\@@_to_decimal:w
}
\cs_generate_variant:Nn \fparray_item:Nn { c }
@@ -362,11 +362,11 @@
{
\exp_after:wN \@@_array_item:NwN
\exp_after:wN #1
- \int_value:w \int_eval:n {#2} ;
+ \int_value:w \int_eval:n {#2} \@@_sep:
\@@_to_tl:w
}
\cs_generate_variant:Nn \fparray_item_to_tl:Nn { c }
-\cs_new:Npn \@@_array_item:NwN #1#2 ; #3
+\cs_new:Npn \@@_array_item:NwN #1#2 \@@_sep: #3
{
\@@_array_bounds:NNnTF \msg_expandable_error:nnfff #1 {#2}
{ \exp_after:wN \@@_array_item:NNNnN #1 {#2} #3 }
@@ -375,22 +375,22 @@
\cs_new:Npn \@@_array_item:NNNnN #1#2#3#4
{
\exp_after:wN \@@_array_item:N
- \int_value:w \__kernel_intarray_item:Nn #2 {#4} \exp_after:wN ;
- \int_value:w \__kernel_intarray_item:Nn #3 {#4} \exp_after:wN ;
- \int_value:w \__kernel_intarray_item:Nn #1 {#4} ;
+ \int_value:w \__kernel_intarray_item:Nn #2 {#4} \exp_after:wN \@@_sep:
+ \int_value:w \__kernel_intarray_item:Nn #3 {#4} \exp_after:wN \@@_sep:
+ \int_value:w \__kernel_intarray_item:Nn #1 {#4} \@@_sep:
}
\cs_new:Npn \@@_array_item:N #1
{
\if_meaning:w 0 #1 \exp_after:wN \@@_array_item_special:w \fi:
\@@_array_item:w #1
}
-\cs_new:Npn \@@_array_item:w #1 #2#3#4#5 #6 ; 1 #7 ;
+\cs_new:Npn \@@_array_item:w #1 #2#3#4#5 #6 \@@_sep: 1 #7 \@@_sep:
{
\exp_after:wN \@@_array_item_normal:w
\int_value:w \if_meaning:w #1 1 0 \else: 2 \fi: \exp_stop_f:
- #7 ; {#2#3#4#5} {#6} ;
+ #7 \@@_sep: {#2#3#4#5} {#6} \@@_sep:
}
-\cs_new:Npn \@@_array_item_special:w #1 ; #2 ; #3 ; #4
+\cs_new:Npn \@@_array_item_special:w #1 \@@_sep: #2 \@@_sep: #3 \@@_sep: #4
{
\exp_after:wN #4
\exp:w \exp_end_continue_f:w
@@ -402,8 +402,9 @@
\else: \exp_after:wN \c_minus_inf_fp
\fi:
}
-\cs_new:Npn \@@_array_item_normal:w #1 #2#3#4#5 #6 ; #7 ; #8 ; #9
- { #9 \s_@@ \@@_chk:w 1 #1 {#8} #7 {#2#3#4#5} {#6} ; }
+\cs_new:Npn \@@_array_item_normal:w
+ #1 #2#3#4#5 #6 \@@_sep: #7 \@@_sep: #8 \@@_sep: #9
+ { #9 \s_@@ \@@_chk:w 1 #1 {#8} #7 {#2#3#4#5} {#6} \@@_sep: }
% \end{macrocode}
% \end{macro}
% \end{macro}