[latex3-commits] [git/LaTeX3-latex3-latex3] scan-quark: Rename kernel quark functions (4494e1eb7)
PhelypeOleinik
tex.phelype at gmail.com
Wed Apr 29 03:31:36 CEST 2020
Repository : https://github.com/latex3/latex3
On branch : scan-quark
Link : https://github.com/latex3/latex3/commit/4494e1eb7aaaf41ce5978eb32e9afe40dffeb6df
>---------------------------------------------------------------
commit 4494e1eb7aaaf41ce5978eb32e9afe40dffeb6df
Author: PhelypeOleinik <tex.phelype at gmail.com>
Date: Tue Apr 28 22:31:36 2020 -0300
Rename kernel quark functions
\__kernel_quark_test_generate:N -> \__kernel_quark_new_test:N and \__kernel_quark_conditional_generate:Nn -> \__kernel_quark_new_conditional:Nn to match other command-defining functions.
>---------------------------------------------------------------
4494e1eb7aaaf41ce5978eb32e9afe40dffeb6df
l3kernel/l3clist.dtx | 4 +-
l3kernel/l3debug.dtx | 2 +-
l3kernel/l3file.dtx | 6 +-
l3kernel/l3int.dtx | 4 +-
l3kernel/l3kernel-functions.dtx | 16 ++--
l3kernel/l3keys.dtx | 6 +-
l3kernel/l3prg.dtx | 2 +-
l3kernel/l3prop.dtx | 2 +-
l3kernel/l3quark.dtx | 156 +++++++++++++++++++-------------------
l3kernel/l3regex.dtx | 2 +-
l3kernel/l3str.dtx | 4 +-
l3kernel/l3text-purify.dtx | 2 +-
l3kernel/l3text.dtx | 4 +-
l3kernel/l3tl.dtx | 4 +-
l3kernel/l3token.dtx | 2 +-
l3kernel/testfiles/m3quark002.lvt | 16 ++--
16 files changed, 116 insertions(+), 116 deletions(-)
diff --git a/l3kernel/l3clist.dtx b/l3kernel/l3clist.dtx
index 142ffa89d..9ac5a134a 100644
--- a/l3kernel/l3clist.dtx
+++ b/l3kernel/l3clist.dtx
@@ -814,8 +814,8 @@
% \begin{macro}[EXP]{\@@_if_recursion_tail_break:nN,\@@_if_recursion_tail_stop:n}
% Functions to query recursion quarks.
% \begin{macrocode}
-\__kernel_quark_test_generate:N \@@_if_recursion_tail_break:nN
-\__kernel_quark_test_generate:N \@@_if_recursion_tail_stop:n
+\__kernel_quark_new_test:N \@@_if_recursion_tail_break:nN
+\__kernel_quark_new_test:N \@@_if_recursion_tail_stop:n
% \end{macrocode}
% \end{macro}
%
diff --git a/l3kernel/l3debug.dtx b/l3kernel/l3debug.dtx
index 53c1803a1..c7a97e400 100644
--- a/l3kernel/l3debug.dtx
+++ b/l3kernel/l3debug.dtx
@@ -158,7 +158,7 @@
% \begin{macrocode}
\cs_new:Npn \@@_use_none_delimit_by_q_recursion_stop:w
#1 \q_@@_recursion_stop { }
-\__kernel_quark_test_generate:N \@@_if_recursion_tail_stop:N
+\__kernel_quark_new_test:N \@@_if_recursion_tail_stop:N
% \end{macrocode}
% \end{macro}
%
diff --git a/l3kernel/l3file.dtx b/l3kernel/l3file.dtx
index 198298ae2..65f9c8bf7 100644
--- a/l3kernel/l3file.dtx
+++ b/l3kernel/l3file.dtx
@@ -2432,7 +2432,7 @@
% \begin{macro}[pTF]{\@@_quark_if_nil:n}
% Branching quark conditional.
% \begin{macrocode}
-\__kernel_quark_conditional_generate:Nn \@@_quark_if_nil:n { TF }
+\__kernel_quark_new_conditional:Nn \@@_quark_if_nil:n { TF }
% \end{macrocode}
% \end{macro}
%
@@ -2450,8 +2450,8 @@
% }
% Functions to query recursion quarks.
% \begin{macrocode}
-\__kernel_quark_test_generate:N \@@_if_recursion_tail_stop:N
-\__kernel_quark_test_generate:N \@@_if_recursion_tail_stop_do:nn
+\__kernel_quark_new_test:N \@@_if_recursion_tail_stop:N
+\__kernel_quark_new_test:N \@@_if_recursion_tail_stop_do:nn
% \end{macrocode}
% \end{macro}
%
diff --git a/l3kernel/l3int.dtx b/l3kernel/l3int.dtx
index 3902b0702..68876db8f 100644
--- a/l3kernel/l3int.dtx
+++ b/l3kernel/l3int.dtx
@@ -1079,8 +1079,8 @@
% \begin{macro}[EXP]{\@@_if_recursion_tail_stop_do:Nn,\@@_if_recursion_tail_stop:N}
% Functions to query quarks.
% \begin{macrocode}
-\__kernel_quark_test_generate:N \@@_if_recursion_tail_stop_do:Nn
-\__kernel_quark_test_generate:N \@@_if_recursion_tail_stop:N
+\__kernel_quark_new_test:N \@@_if_recursion_tail_stop_do:Nn
+\__kernel_quark_new_test:N \@@_if_recursion_tail_stop:N
% \end{macrocode}
% \end{macro}
%
diff --git a/l3kernel/l3kernel-functions.dtx b/l3kernel/l3kernel-functions.dtx
index 8b736e369..b7ec13807 100644
--- a/l3kernel/l3kernel-functions.dtx
+++ b/l3kernel/l3kernel-functions.dtx
@@ -329,9 +329,9 @@
% and variable mappings.
% \end{variable}
%
-% \begin{function}{\__kernel_quark_test_generate:N}
+% \begin{function}{\__kernel_quark_new_test:N}
% \begin{syntax}
-% \cs{__kernel_quark_test_generate:N} \cs[no-index]{\meta{name}:\meta{arg spec}}
+% \cs{__kernel_quark_new_test:N} \cs[no-index]{\meta{name}:\meta{arg spec}}
% \end{syntax}
% Defines a quark-test function \cs[no-index]{\meta{name}:\meta{arg spec}}
% which tests if its argument is \cs[no-index]{q\meta{namespace}_recursion_tail},
@@ -346,7 +346,7 @@
% in the definition of auxiliaries (for example |__module|), obtained
% for instance as |@@| when using \pkg{l3docstrip}.
%
-% \cs{__kernel_quark_test_generate:N} can define $6$ different
+% \cs{__kernel_quark_new_test:N} can define $6$ different
% types of quark-test functions. Which one is defined depends on
% the \meta{arg spec} of the given function:
% \begin{description}
@@ -383,15 +383,15 @@
% Any other signature, as well as a function without signature
% are errors, and in such case the definition is aborted.
%
-% \cs{__kernel_quark_test_generate:N} does \emph{not} define
+% \cs{__kernel_quark_new_test:N} does \emph{not} define
% the \cs[no-index]{q\meta{namespace}_recursion_tail} and
% \cs[no-index]{q\meta{namespace}_recursion_stop}.
% They should be manually defined with \cs{quark_new:N}.
% \end{function}
%
-% \begin{function}{\__kernel_quark_conditional_generate:Nn}
+% \begin{function}{\__kernel_quark_new_conditional:Nn}
% \begin{syntax}
-% \cs{__kernel_quark_conditional_generate:Nn} \cs[no-index]{\meta{name}:\meta{arg spec}} \Arg{conditions}
+% \cs{__kernel_quark_new_conditional:Nn} \cs[no-index]{\meta{name}:\meta{arg spec}} \Arg{conditions}
% \end{syntax}
% Defines a quark conditional \cs[no-index]{\meta{name}:\meta{arg spec}}
% which tests if its argument is the \cs[no-index]{\meta{test-quark}},
@@ -415,7 +415,7 @@
% \meta{namespace} should be the name space to be used internally
% in the definition of auxiliaries (for example |__module|).
%
-% \cs{__kernel_quark_conditional_generate:Nn} can define $2$ different
+% \cs{__kernel_quark_new_conditional:Nn} can define $2$ different
% types of quark-test functions. Which one is defined depends on
% the \meta{arg spec} of the given function:
% \begin{description}
@@ -432,7 +432,7 @@
% Any other signature, as well as a function without signature
% are errors, and in such case the definition is aborted.
%
-% \cs{__kernel_quark_conditional_generate:Nn} does \emph{not} define
+% \cs{__kernel_quark_new_conditional:Nn} does \emph{not} define
% the \cs[no-index]{\meta{test-quark}}.
% It~should be manually defined with \cs{quark_new:N}.
% \end{function}
diff --git a/l3kernel/l3keys.dtx b/l3kernel/l3keys.dtx
index 648282cc8..8c5c2c5da 100644
--- a/l3kernel/l3keys.dtx
+++ b/l3kernel/l3keys.dtx
@@ -1416,8 +1416,8 @@
% \begin{macro}[pTF]{\@@_quark_if_nil:n}
% Branching quark conditional.
% \begin{macrocode}
-\__kernel_quark_conditional_generate:Nn \@@_quark_if_nil:n { TF }
-\__kernel_quark_conditional_generate:Nn \@@_quark_if_no_value:N { TF }
+\__kernel_quark_new_conditional:Nn \@@_quark_if_nil:n { TF }
+\__kernel_quark_new_conditional:Nn \@@_quark_if_no_value:N { TF }
% \end{macrocode}
% \end{macro}
%
@@ -1432,7 +1432,7 @@
% \begin{macro}[EXP]{\@@_if_recursion_tail_stop:n}
% Functions to query recursion quarks.
% \begin{macrocode}
-\__kernel_quark_test_generate:N \@@_if_recursion_tail_stop:n
+\__kernel_quark_new_test:N \@@_if_recursion_tail_stop:n
% \end{macrocode}
% \end{macro}
%
diff --git a/l3kernel/l3prg.dtx b/l3kernel/l3prg.dtx
index 6756e0570..54a38d0f9 100644
--- a/l3kernel/l3prg.dtx
+++ b/l3kernel/l3prg.dtx
@@ -938,7 +938,7 @@
% \begin{macro}[EXP]{\@@_if_recursion_tail_stop_do:nn}
% Functions to query recursion quarks.
% \begin{macrocode}
-\__kernel_quark_test_generate:N \@@_if_recursion_tail_stop_do:nn
+\__kernel_quark_new_test:N \@@_if_recursion_tail_stop_do:nn
% \end{macrocode}
% \end{macro}
%
diff --git a/l3kernel/l3prop.dtx b/l3kernel/l3prop.dtx
index 5249910e8..ab65ee614 100644
--- a/l3kernel/l3prop.dtx
+++ b/l3kernel/l3prop.dtx
@@ -639,7 +639,7 @@
% \begin{macro}[EXP]{\@@_if_recursion_tail_stop:o}
% Functions to query recursion quarks.
% \begin{macrocode}
-\__kernel_quark_test_generate:N \@@_if_recursion_tail_stop:n
+\__kernel_quark_new_test:N \@@_if_recursion_tail_stop:n
\cs_generate_variant:Nn \@@_if_recursion_tail_stop:n { o }
% \end{macrocode}
% \end{macro}
diff --git a/l3kernel/l3quark.dtx b/l3kernel/l3quark.dtx
index e6d451aeb..fd461e2d2 100644
--- a/l3kernel/l3quark.dtx
+++ b/l3kernel/l3quark.dtx
@@ -590,8 +590,8 @@
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\__kernel_quark_test_generate:N}
-% The function \cs{__kernel_quark_test_generate:N} defines |#1| in a
+% \begin{macro}{\__kernel_quark_new_test:N}
+% The function \cs{__kernel_quark_new_test:N} defines |#1| in a
% similar way as
% \cs[no-index]{quark_if_recursion_tail_stop(_do):(N|n)(n)}. using
% \cs[no-index]{q\meta{namespace}_recursion_tail} as the test quark
@@ -612,8 +612,8 @@
% \end{description}
% Any other signature causes an error, as does a function without signature.
%
-% \begin{macro}{\__kernel_quark_conditional_generate:Nn}
-% Similar to \cs{__kernel_quark_test_generate:N}, but defines
+% \begin{macro}{\__kernel_quark_new_conditional:Nn}
+% Similar to \cs{__kernel_quark_new_test:N}, but defines
% quark branching conditionals like \cs{quark_if_nil:nTF}
% using |#2| as the test quark, |#3| as the name-space to define
% auxiliaries, and |#4| is the list of conditional variants to define.
@@ -625,49 +625,49 @@
% \end{description}
% Any other signature causes an error, as does a function without signature.
%
-% \begin{macro}{\@@_test_generate:NNNn, \@@_test_generate:Nccn,
-% \@@_test_generate_aux:nnNNnNnn, \@@_test_generate_choose:nNnNnn}
+% \begin{macro}{\@@_new_test:NNNn, \@@_new_test:Nccn,
+% \@@_new_test_aux:nnNNnNnn, \@@_new_test_choose:nNnNnn}
% \begin{macrocode}
-\cs_new_protected:Npn \__kernel_quark_test_generate:N #1
- { \@@_test_generate_aux:Nx #1 { __ \@@_get_module_name:N #1 } }
-\cs_new_protected:Npn \@@_test_generate_aux:Nn #1 #2
+\cs_new_protected:Npn \__kernel_quark_new_test:N #1
+ { \@@_new_test_aux:Nx #1 { __ \@@_get_module_name:N #1 } }
+\cs_new_protected:Npn \@@_new_test_aux:Nn #1 #2
{
- \@@_test_generate:Nccn #1
+ \@@_new_test:Nccn #1
{ q #2 _recursion_tail } { q #2 _recursion_stop } {#2}
}
-\cs_generate_variant:Nn \@@_test_generate_aux:Nn { Nx }
-\cs_new_protected:Npn \@@_test_generate:NNNn #1
+\cs_generate_variant:Nn \@@_new_test_aux:Nn { Nx }
+\cs_new_protected:Npn \@@_new_test:NNNn #1
{
- \exp_last_unbraced:Nf \@@_test_generate_aux:nnNNnNnn
+ \exp_last_unbraced:Nf \@@_new_test_aux:nnNNnNnn
{ \cs_split_function:N #1 }
#1 { test }
}
-\cs_generate_variant:Nn \@@_test_generate:NNNn { Ncc }
-\cs_new_protected:Npn \__kernel_quark_conditional_generate:Nn #1
+\cs_generate_variant:Nn \@@_new_test:NNNn { Ncc }
+\cs_new_protected:Npn \__kernel_quark_new_conditional:Nn #1
{
- \@@_conditional_generate:Nxxn #1
+ \@@_new_conditional:Nxxn #1
{ \@@_get_quark_name:N #1 }
{ __ \@@_get_module_name:N #1 }
}
-\cs_new_protected:Npn \@@_conditional_generate:Nnnn #1
+\cs_new_protected:Npn \@@_new_conditional:Nnnn #1
{
- \exp_last_unbraced:Nf \@@_test_generate_aux:nnNNnNnn
+ \exp_last_unbraced:Nf \@@_new_test_aux:nnNNnNnn
{ \cs_split_function:N #1 }
#1 { conditional }
}
-\cs_generate_variant:Nn \@@_conditional_generate:Nnnn { Nxx }
-\cs_new_protected:Npn \@@_test_generate_aux:nnNNnNnn #1 #2 #3 #4
+\cs_generate_variant:Nn \@@_new_conditional:Nnnn { Nxx }
+\cs_new_protected:Npn \@@_new_test_aux:nnNNnNnn #1 #2 #3 #4
{
\reverse_if:N \if_bool:N #3
\__kernel_msg_error:nnx { kernel } { missing-colon }
{ \token_to_str:N #4 }
\exp_after:wN \use_none:nnnnnnn
\fi:
- \@@_test_generate_choose:nNnNnn {#2} #4
+ \@@_new_test_choose:nNnNnn {#2} #4
}
-\cs_new_protected:Npn \@@_test_generate_choose:nNnNnn #1 #2 #3
+\cs_new_protected:Npn \@@_new_test_choose:nNnNnn #1 #2 #3
{
- \cs_if_exist_use:cTF { @@_#3_generate_#1:Nnnn } { #2 }
+ \cs_if_exist_use:cTF { @@_new_#3_#1:Nnnn } { #2 }
{
\__kernel_msg_error:nnxx { kernel } { invalid-quark-function }
{ \token_to_str:N #2 } {#1}
@@ -680,65 +680,65 @@
% \end{macro}
%
% \begin{macro}{
-% \@@_test_generate_n:Nnnn, \@@_test_generate_nn:Nnnn,
-% \@@_test_generate_N:Nnnn, \@@_test_generate_Nn:Nnnn,
-% \@@_test_generate_NN:Nnnn, \@@_test_generate_NN:Nnnn,
+% \@@_new_test_n:Nnnn, \@@_new_test_nn:Nnnn,
+% \@@_new_test_N:Nnnn, \@@_new_test_Nn:Nnnn,
+% \@@_new_test_NN:Nnnn, \@@_new_test_NN:Nnnn,
% }
% These macros implement the six possibilities mentioned above, passing
-% the right arguments to \cs{@@_test_generate_aux_do:nNNnnnnN},
+% the right arguments to \cs{@@_new_test_aux_do:nNNnnnnN},
% which defines some auxiliaries, and then to
-% \cs{@@_test_generate_define_tl:nNNNNn} (|:n(n)| variants) or to
-% \cs{@@_test_generate_define_ifx:nNNNNn} (|:N(n)|) which define the
+% \cs{@@_new_test_define_tl:nNNNNn} (|:n(n)| variants) or to
+% \cs{@@_new_test_define_ifx:nNNNNn} (|:N(n)|) which define the
% main conditionals.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_test_generate_n:Nnnn #1 #2 #3 #4
+\cs_new_protected:Npn \@@_new_test_n:Nnnn #1 #2 #3 #4
{
- \@@_test_generate_aux_do:nNNnnnnN {#4} #2 #3 { none } { } { } { }
- \@@_test_generate_define_tl:nNNNNn #1 { }
+ \@@_new_test_aux_do:nNNnnnnN {#4} #2 #3 { none } { } { } { }
+ \@@_new_test_define_tl:nNNNNn #1 { }
}
-\cs_new_protected:Npn \@@_test_generate_nn:Nnnn #1 #2 #3 #4
+\cs_new_protected:Npn \@@_new_test_nn:Nnnn #1 #2 #3 #4
{
- \@@_test_generate_aux_do:nNNnnnnN {#4} #2 #3 { i } { n } {##1} {##2}
- \@@_test_generate_define_tl:nNNNNn #1 { \use_none:n }
+ \@@_new_test_aux_do:nNNnnnnN {#4} #2 #3 { i } { n } {##1} {##2}
+ \@@_new_test_define_tl:nNNNNn #1 { \use_none:n }
}
-\cs_new_protected:Npn \@@_test_generate_nN:Nnnn #1 #2 #3 #4
+\cs_new_protected:Npn \@@_new_test_nN:Nnnn #1 #2 #3 #4
{
- \@@_test_generate_aux_do:nNNnnnnN {#4} #2 #3 { i } { n } {##1} {##2}
- \@@_test_generate_define_break_tl:nNNNNn #1 { }
+ \@@_new_test_aux_do:nNNnnnnN {#4} #2 #3 { i } { n } {##1} {##2}
+ \@@_new_test_define_break_tl:nNNNNn #1 { }
}
-\cs_new_protected:Npn \@@_test_generate_N:Nnnn #1 #2 #3 #4
+\cs_new_protected:Npn \@@_new_test_N:Nnnn #1 #2 #3 #4
{
- \@@_test_generate_aux_do:nNNnnnnN {#4} #2 #3 { none } { } { } { }
- \@@_test_generate_define_ifx:nNNNNn #1 { }
+ \@@_new_test_aux_do:nNNnnnnN {#4} #2 #3 { none } { } { } { }
+ \@@_new_test_define_ifx:nNNNNn #1 { }
}
-\cs_new_protected:Npn \@@_test_generate_Nn:Nnnn #1 #2 #3 #4
+\cs_new_protected:Npn \@@_new_test_Nn:Nnnn #1 #2 #3 #4
{
- \@@_test_generate_aux_do:nNNnnnnN {#4} #2 #3 { i } { n } {##1} {##2}
- \@@_test_generate_define_ifx:nNNNNn #1 { \use_none:n }
+ \@@_new_test_aux_do:nNNnnnnN {#4} #2 #3 { i } { n } {##1} {##2}
+ \@@_new_test_define_ifx:nNNNNn #1 { \use_none:n }
}
-\cs_new_protected:Npn \@@_test_generate_NN:Nnnn #1 #2 #3 #4
+\cs_new_protected:Npn \@@_new_test_NN:Nnnn #1 #2 #3 #4
{
- \@@_test_generate_aux_do:nNNnnnnN {#4} #2 #3 { i } { n } {##1} {##2}
- \@@_test_generate_define_break_ifx:nNNNNn #1 { }
+ \@@_new_test_aux_do:nNNnnnnN {#4} #2 #3 { i } { n } {##1} {##2}
+ \@@_new_test_define_break_ifx:nNNNNn #1 { }
}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{
-% \@@_test_generate_aux_do:nNNnnnnN,
+% \@@_new_test_aux_do:nNNnnnnN,
% \@@_test_define_aux:NNNNnnN
% }
-% \cs{@@_test_generate_aux_do:nNNnnnnN} makes the control sequence names
+% \cs{@@_new_test_aux_do:nNNnnnnN} makes the control sequence names
% which will be used by \cs{@@_test_define_aux:NNNNnnN}, and then later
-% by \cs{@@_test_generate_define_tl:nNNNNn} or
-% \cs{@@_test_generate_define_ifx:nNNNNn}. The control sequences defined
+% by \cs{@@_new_test_define_tl:nNNNNn} or
+% \cs{@@_new_test_define_ifx:nNNNNn}. The control sequences defined
% here are analogous to \cs{@@_if_recursion_tail:w} and to
% \cs[no-index]{use_(none|i)_delimit_by_q_recursion_stop:(|n)w}.
%
% The name is composed by the name-space and the name of the quarks.
-% Suppose \cs{__kernel_quark_test_generate:N} was used with:
+% Suppose \cs{__kernel_quark_new_test:N} was used with:
% \begin{verbatim}
-% \__kernel_quark_test_generate:N \__test_quark_tail:n
+% \__kernel_quark_new_test:N \__test_quark_tail:n
% \end{verbatim}
% then the first auxiliary will be \cs[no-index]{__test_quark_recursion_tail:w},
% and the second one will be
@@ -747,7 +747,7 @@
% Note that the actual quarks are \emph{not} defined here. They should
% be defined separately using \cs{quark_new:N}.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_test_generate_aux_do:nNNnnnnN #1 #2 #3 #4 #5
+\cs_new_protected:Npn \@@_new_test_aux_do:nNNnnnnN #1 #2 #3 #4 #5
{
\exp_args:Ncc \@@_test_define_aux:NNNNnnN
{ #1 _quark_recursion_tail:w }
@@ -764,17 +764,17 @@
% \end{macro}
%
% \begin{macro}{
-% \@@_test_generate_define_tl:nNNNNn,
-% \@@_test_generate_define_ifx:nNNNNn
+% \@@_new_test_define_tl:nNNNNn,
+% \@@_new_test_define_ifx:nNNNNn
% }
% \begin{macro}{
-% \@@_test_generate_define_break_tl:nNNNNn,
-% \@@_test_generate_define_break_ifx:nNNNNn
+% \@@_new_test_define_break_tl:nNNNNn,
+% \@@_new_test_define_break_ifx:nNNNNn
% }
% Finally, these two macros define the main conditional function using
% what's been set up before.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_test_generate_define_tl:nNNNNn #1 #2 #3 #4 #5 #6
+\cs_new_protected:Npn \@@_new_test_define_tl:nNNNNn #1 #2 #3 #4 #5 #6
{
\cs_new:Npn #5 #1
{
@@ -783,7 +783,7 @@
{#3} {#6}
}
}
-\cs_new_protected:Npn \@@_test_generate_define_ifx:nNNNNn #1 #2 #3 #4 #5 #6
+\cs_new_protected:Npn \@@_new_test_define_ifx:nNNNNn #1 #2 #3 #4 #5 #6
{
\cs_new:Npx #5 #1
{
@@ -794,47 +794,47 @@
\exp_not:N \fi:
}
}
-\cs_new_protected:Npn \@@_test_generate_define_break_tl:nNNNNn #1 #2 #3
- { \@@_test_generate_define_tl:nNNNNn {##1##2} #2 {##2} }
-\cs_new_protected:Npn \@@_test_generate_define_break_ifx:nNNNNn #1 #2 #3
- { \@@_test_generate_define_ifx:nNNNNn {##1##2} #2 {##2} }
+\cs_new_protected:Npn \@@_new_test_define_break_tl:nNNNNn #1 #2 #3
+ { \@@_new_test_define_tl:nNNNNn {##1##2} #2 {##2} }
+\cs_new_protected:Npn \@@_new_test_define_break_ifx:nNNNNn #1 #2 #3
+ { \@@_new_test_define_ifx:nNNNNn {##1##2} #2 {##2} }
% \end{macrocode}
% \end{macro}
% \end{macro}
%
% \begin{macro}{
-% \@@_conditional_generate_n:Nnnn,
-% \@@_conditional_generate_N:Nnnn,
+% \@@_new_conditional_n:Nnnn,
+% \@@_new_conditional_N:Nnnn,
% }
% These macros implement the two possibilities for branching quark
% conditionals, passing
-% the right arguments to \cs{@@_conditional_generate_aux_do:nn},
+% the right arguments to \cs{@@_new_conditional_aux_do:nn},
% which defines some auxiliaries, and then to
-% \cs{@@_conditional_generate_define:nNNNNn} which defines the
+% \cs{@@_new_conditional_define:nNNNNn} which defines the
% main conditionals.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_conditional_generate_n:Nnnn #1 #2 #3
+\cs_new_protected:Npn \@@_new_conditional_n:Nnnn #1 #2 #3
{
- \@@_conditional_generate_aux_do:nn {#3} {#2}
- \@@_conditional_generate_define:nNNNNn #1 \use_i:nn
+ \@@_new_conditional_aux_do:nn {#3} {#2}
+ \@@_new_conditional_define:nNNNNn #1 \use_i:nn
}
-\cs_new_protected:Npn \@@_conditional_generate_N:Nnnn #1 #2 #3
+\cs_new_protected:Npn \@@_new_conditional_N:Nnnn #1 #2 #3
{
- \@@_conditional_generate_aux_do:nn {#3} {#2}
- \@@_conditional_generate_define:nNNNNn #1 \use_ii:nn
+ \@@_new_conditional_aux_do:nn {#3} {#2}
+ \@@_new_conditional_define:nNNNNn #1 \use_ii:nn
}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{
-% \@@_conditional_generate_aux_do:nn,
+% \@@_new_conditional_aux_do:nn,
% \@@_conditional_define_aux:NN,
-% \@@_conditional_generate_define:nNNNNn
+% \@@_new_conditional_define:nNNNNn
% }
% Similar to the previous macros, but branching conditionals only require
% one auxiliary, so we take a shortcut.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_conditional_generate_aux_do:nn #1 #2
+\cs_new_protected:Npn \@@_new_conditional_aux_do:nn #1 #2
{
\exp_args:Ncc \@@_conditional_define_aux:NN
{ #1 _if_quark_ #2 :w } { q #1 _ #2 }
@@ -844,7 +844,7 @@
\cs_gset:Npn #1 ##1 #2 ##2 ? ##3 ?! { ##1 ##2 }
#3 {##1} #1 #2
}
-\cs_new_protected:Npn \@@_conditional_generate_define:nNNNNn #1 #2 #3 #4 #5 #6
+\cs_new_protected:Npn \@@_new_conditional_define:nNNNNn #1 #2 #3 #4 #5 #6
{
\exp_args:Nno \use:n { \prg_new_conditional:Npnn #4 #1 {#6} }
{
diff --git a/l3kernel/l3regex.dtx b/l3kernel/l3regex.dtx
index 609462e77..78d28a58e 100644
--- a/l3kernel/l3regex.dtx
+++ b/l3kernel/l3regex.dtx
@@ -1137,7 +1137,7 @@
% \begin{macro}[pTF]{\@@_quark_if_nil:n}
% Branching quark conditional.
% \begin{macrocode}
-\__kernel_quark_conditional_generate:Nn \@@_quark_if_nil:N { F }
+\__kernel_quark_new_conditional:Nn \@@_quark_if_nil:N { F }
% \end{macrocode}
% \end{macro}
%
diff --git a/l3kernel/l3str.dtx b/l3kernel/l3str.dtx
index 8ad56105d..e5b1aabf2 100644
--- a/l3kernel/l3str.dtx
+++ b/l3kernel/l3str.dtx
@@ -897,8 +897,8 @@
% }
% Functions to query recursion quarks.
% \begin{macrocode}
-\__kernel_quark_test_generate:N \@@_if_recursion_tail_break:NN
-\__kernel_quark_test_generate:N \@@_if_recursion_tail_stop_do:Nn
+\__kernel_quark_new_test:N \@@_if_recursion_tail_break:NN
+\__kernel_quark_new_test:N \@@_if_recursion_tail_stop_do:Nn
% \end{macrocode}
% \end{macro}
%
diff --git a/l3kernel/l3text-purify.dtx b/l3kernel/l3text-purify.dtx
index 029017f8a..b56ae7314 100644
--- a/l3kernel/l3text-purify.dtx
+++ b/l3kernel/l3text-purify.dtx
@@ -68,7 +68,7 @@
% \begin{macro}[EXP]{\@@_if_recursion_tail_stop:N}
% Functions to query recursion quarks.
% \begin{macrocode}
-\__kernel_quark_test_generate:N \@@_if_recursion_tail_stop:N
+\__kernel_quark_new_test:N \@@_if_recursion_tail_stop:N
% \end{macrocode}
% \end{macro}
%
diff --git a/l3kernel/l3text.dtx b/l3kernel/l3text.dtx
index 0b9f2de5e..5bf442137 100644
--- a/l3kernel/l3text.dtx
+++ b/l3kernel/l3text.dtx
@@ -271,7 +271,7 @@
% \begin{macro}[pTF]{\@@_quark_if_nil:n}
% Branching quark conditional.
% \begin{macrocode}
-\__kernel_quark_conditional_generate:Nn \@@_quark_if_nil:n { TF }
+\__kernel_quark_new_conditional:Nn \@@_quark_if_nil:n { TF }
% \end{macrocode}
% \end{macro}
%
@@ -294,7 +294,7 @@
% \begin{macro}[EXP]{\@@_if_recursion_tail_stop_do:Nn}
% Functions to query recursion quarks.
% \begin{macrocode}
-\__kernel_quark_test_generate:N \@@_if_recursion_tail_stop_do:Nn
+\__kernel_quark_new_test:N \@@_if_recursion_tail_stop_do:Nn
% \end{macrocode}
% \end{macro}
%
diff --git a/l3kernel/l3tl.dtx b/l3kernel/l3tl.dtx
index 702c49af7..c0211f165 100644
--- a/l3kernel/l3tl.dtx
+++ b/l3kernel/l3tl.dtx
@@ -1528,8 +1528,8 @@
% \begin{macro}[pTF]{\@@_if_recursion_tail_stop:n}
% Functions to query recursion quarks.
% \begin{macrocode}
-\__kernel_quark_test_generate:N \@@_if_recursion_tail_break:nN
-\__kernel_quark_conditional_generate:Nn \@@_quark_if_nil:n { TF }
+\__kernel_quark_new_test:N \@@_if_recursion_tail_break:nN
+\__kernel_quark_new_conditional:Nn \@@_quark_if_nil:n { TF }
% \end{macrocode}
% \end{macro}
% \end{macro}
diff --git a/l3kernel/l3token.dtx b/l3kernel/l3token.dtx
index e7221ca22..5aba29dde 100644
--- a/l3kernel/l3token.dtx
+++ b/l3kernel/l3token.dtx
@@ -1120,7 +1120,7 @@
% \begin{macro}[pTF]{\@@_quark_if_no_value:N}
% Functions to query recursion quarks.
% \begin{macrocode}
-\__kernel_quark_conditional_generate:Nn \@@_quark_if_no_value:N { TF }
+\__kernel_quark_new_conditional:Nn \@@_quark_if_no_value:N { TF }
% \end{macrocode}
% \end{macro}
%
diff --git a/l3kernel/testfiles/m3quark002.lvt b/l3kernel/testfiles/m3quark002.lvt
index ad2dff14e..7523a607b 100644
--- a/l3kernel/testfiles/m3quark002.lvt
+++ b/l3kernel/testfiles/m3quark002.lvt
@@ -19,37 +19,37 @@
\quark_new:N \q__test_recursion_stop
\TEST{New~private~quark~functions~(:n)}{
- \__kernel_quark_test_generate:N
+ \__kernel_quark_new_test:N
\__test_quark_if_recursion_tail_stop:n
\cs_log:N \__test_quark_if_recursion_tail_stop:n
}
\TEST{New~private~quark~functions~(:nn)}{
- \__kernel_quark_test_generate:N
+ \__kernel_quark_new_test:N
\__test_quark_if_recursion_tail_stop_do:nn
\cs_log:N \__test_quark_if_recursion_tail_stop_do:nn
}
\TEST{New~private~quark~functions~(:N)}{
- \__kernel_quark_test_generate:N
+ \__kernel_quark_new_test:N
\__test_quark_if_recursion_tail_stop:N
\cs_log:N \__test_quark_if_recursion_tail_stop:N
}
\TEST{New~private~quark~functions~(:Nn)}{
- \__kernel_quark_test_generate:N
+ \__kernel_quark_new_test:N
\__test_quark_if_recursion_tail_stop_do:Nn
\cs_log:N \__test_quark_if_recursion_tail_stop_do:Nn
}
\TEST{New~private~quark~functions~(:nN)}{
- \__kernel_quark_test_generate:N
+ \__kernel_quark_new_test:N
\__test_quark_if_recursion_tail_break:nN
\cs_log:N \__test_quark_if_recursion_tail_break:nN
}
\TEST{New~private~quark~functions~(:NN)}{
- \__kernel_quark_test_generate:N
+ \__kernel_quark_new_test:N
\__test_quark_if_recursion_tail_break:NN
\cs_log:N \__test_quark_if_recursion_tail_break:NN
}
@@ -86,9 +86,9 @@
}
\TEST{Invalid~signatures~(expect~errors)}{
- \__kernel_quark_test_generate:N
+ \__kernel_quark_new_test:N
\__test_quark_if_recursion_tail_break:nnn
- \__kernel_quark_test_generate:N
+ \__kernel_quark_new_test:N
\__test_quark_if_recursion_tail_break
}
More information about the latex3-commits
mailing list.