[latex3-commits] [latex3/latex3] fp-func: Add \use:ee, etc. (6c80e6d69)
github at latex-project.org
github at latex-project.org
Wed Jul 5 10:59:46 CEST 2023
Repository : https://github.com/latex3/latex3
On branch : fp-func
Link : https://github.com/latex3/latex3/commit/6c80e6d69bb9aeb323371d5095ea1d5b2b10a4ba
>---------------------------------------------------------------
commit 6c80e6d69bb9aeb323371d5095ea1d5b2b10a4ba
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Wed Jul 5 09:59:46 2023 +0100
Add \use:ee, etc.
Rather than use \use:ff, as we now require
\expanded this seems clearer.
>---------------------------------------------------------------
6c80e6d69bb9aeb323371d5095ea1d5b2b10a4ba
l3kernel/CHANGELOG.md | 3 +++
l3kernel/l3basics.dtx | 34 ++++++++++++++++++++++++++++++++--
l3trial/l3fp-extras/l3fp-symbolic.dtx | 15 ++++-----------
3 files changed, 39 insertions(+), 13 deletions(-)
diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
index 68e4090e0..33764ea54 100644
--- a/l3kernel/CHANGELOG.md
+++ b/l3kernel/CHANGELOG.md
@@ -7,6 +7,9 @@ this project uses date-based 'snapshot' version identifiers.
## [Unreleased]
+### Added
+- `\use:ee`, `\use:eee`, etc. up to `\use:eeeeeeeee`
+
## [2023-06-30]
### Added
diff --git a/l3kernel/l3basics.dtx b/l3kernel/l3basics.dtx
index e87c03936..73a3106c1 100644
--- a/l3kernel/l3basics.dtx
+++ b/l3kernel/l3basics.dtx
@@ -1021,7 +1021,18 @@
% \end{texnote}
% \end{function}
%
-% \begin{function}[EXP, added = 2018-06-18]{\use:e}
+% \begin{function}[EXP, added = 2018-06-18, updated = 2023-07-05]
+% {
+% \use:e ,
+% \use:ee ,
+% \use:eee ,
+% \use:eeee ,
+% \use:eeeee ,
+% \use:eeeeee ,
+% \use:eeeeeee ,
+% \use:eeeeeeee ,
+% \use:eeeeeeeee
+% }
% \begin{syntax}
% \cs{use:e} \Arg{expandable tokens}
% \end{syntax}
@@ -1610,9 +1621,28 @@
%<@@=use>
% \end{macrocode}
%
-% \begin{macro}[EXP]{\use:e}
+% \begin{macro}[EXP]
+% {
+% \use:e,
+% \use:ee,
+% \use:eee,
+% \use:eeee,
+% \use:eeeee,
+% \use:eeeeee,
+% \use:eeeeeee,
+% \use:eeeeeeee,
+% \use:eeeeeeeee
+% }
% \begin{macrocode}
\cs_set:Npn \use:e #1 { \tex_expanded:D {#1} }
+\cs_set:Npn \use:ee #1#2 { \tex_expanded:D {#1#2} }
+\cs_set:Npn \use:eee #1#2#3 { \tex_expanded:D {#1#2#3} }
+\cs_set:Npn \use:eeee #1#2#3#4 { \tex_expanded:D {#1#2#3#4} }
+\cs_set:Npn \use:eeeee #1#2#3#4#5 { \tex_expanded:D {#1#2#3#4#5} }
+\cs_set:Npn \use:eeeeee #1#2#3#4#5#6 { \tex_expanded:D {#1#2#3#4#5#6} }
+\cs_set:Npn \use:eeeeeee #1#2#3#4#5#6#7 { \tex_expanded:D {#1#2#3#4#5#6#7} }
+\cs_set:Npn \use:eeeeeeee #1#2#3#4#5#6#7#8 { \tex_expanded:D {#1#2#3#4#5#6#7} }
+\cs_set:Npn \use:eeeeeeeee #1#2#3#4#5#6#7#8#9 { \tex_expanded:D {#1#2#3#4#5#6#7#8#9} }
% \end{macrocode}
% \end{macro}
%
diff --git a/l3trial/l3fp-extras/l3fp-symbolic.dtx b/l3trial/l3fp-extras/l3fp-symbolic.dtx
index 568f9ece2..18c03567f 100644
--- a/l3trial/l3fp-extras/l3fp-symbolic.dtx
+++ b/l3trial/l3fp-extras/l3fp-symbolic.dtx
@@ -74,13 +74,6 @@
% \end{macrocode}
% \end{variable}
%
-% \begin{macro}[EXP]{\use:ff}
-% A useful variant.
-% \begin{macrocode}
-\cs_generate_variant:Nn \use:nn { ff }
-% \end{macrocode}
-% \end{macro}
-%
% \subsection{Building blocks for expressions}
%
% Every symbolic expression has the form \cs{s_@@_symbolic}
@@ -445,23 +438,23 @@
}
\cs_new:Npn \@@_symbolic_unary_to_tl:NNw #1#2 , #3 @
{
- \use:ff
+ \use:ee
{ \@@_symbolic_cs_arg_to_fn:NN #1#2 }
{ \exp_last_unbraced:Nf ( { \@@_to_tl_dispatch:w #3 } ) }
}
\cs_new:Npn \@@_symbolic_binary_to_tl:Nww #1, #2; #3; @
{
- \use:ff
+ \use:ee
{ \exp_last_unbraced:Nf ( { \@@_to_tl_dispatch:w #2; } ) }
{
- \use:ff
+ \use:ee
{ \@@_types_cs_to_op:N #1 }
{ \exp_last_unbraced:Nf ( { \@@_to_tl_dispatch:w #3; } ) }
}
}
\cs_new:Npn \@@_symbolic_function_to_tl:Nw #1, #2@
{
- \use:ff { \@@_types_cs_to_op:N #1 }
+ \use:ee { \@@_types_cs_to_op:N #1 }
{ \exp_last_unbraced:Nf ( { \@@_array_to_clist:n {#2} } ) }
}
% \end{macrocode}
More information about the latex3-commits
mailing list.