[latex3-commits] [git/LaTeX3-latex3-latex3] main: Use the @@ notation instead of __module in a few places (35c508eb9)
Bruno Le Floch
blflatex at gmail.com
Sat May 15 14:48:15 CEST 2021
Repository : https://github.com/latex3/latex3
On branch : main
Link : https://github.com/latex3/latex3/commit/35c508eb93b7126ca0e86e1bfc4a2a3c6d6bcb96
>---------------------------------------------------------------
commit 35c508eb93b7126ca0e86e1bfc4a2a3c6d6bcb96
Author: Bruno Le Floch <blflatex at gmail.com>
Date: Sat May 15 14:48:15 2021 +0200
Use the @@ notation instead of __module in a few places
>---------------------------------------------------------------
35c508eb93b7126ca0e86e1bfc4a2a3c6d6bcb96
l3kernel/l3debug.dtx | 15 +++++++--------
l3kernel/l3keys.dtx | 14 +++++++-------
l3kernel/l3msg.dtx | 2 +-
3 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/l3kernel/l3debug.dtx b/l3kernel/l3debug.dtx
index b7eb9d021..319fa7aa2 100644
--- a/l3kernel/l3debug.dtx
+++ b/l3kernel/l3debug.dtx
@@ -491,7 +491,7 @@
% \cs{clist_concat:NNN}''.
%
% Instead of changing \emph{the} definition of the macros, we'll
-% create a copy of such macros, say, |__debug_clist_concat:NNN| which
+% create a copy of such macros, say, \cs[no-index]{@@_clist_concat:NNN} which
% will be defined as
% |<debug code with #1, #2 and #3>\clist_concat:NNN#1#2#3|. For that
% we need to identify the signature of every function and build the
@@ -569,8 +569,7 @@
\__kernel_msg_new:nnn { debug } { bad-arg-type }
{ Wrong~argument~type~#1. }
% \end{macrocode}
-% The macro below is a modifiec copy of
-% |\__cs_generate_variant_loop_base:N| to get the base form of an
+% The macro below gets the base form of an
% argument type given a variant. It serves only to differentiate
% arguments which should be braced from ones which shouldn't. If all
% were to be braced this would be unnecessary. I moved the |n| and |N|
@@ -647,7 +646,7 @@
\tex_endlinechar:D -1 \scan_stop:
\tl_map_inline:nn {#3}
{
- \cs_if_exist:cTF { __debug_ \cs_to_str:N ##1 }
+ \cs_if_exist:cTF { @@_ \cs_to_str:N ##1 }
{ \@@_add_to_debug_code:Nnn }
{ \@@_setup_debug_code:Nnn }
##1 {#1} {#2}
@@ -656,7 +655,7 @@
}
\cs_set_protected:Npn \@@_setup_debug_code:Nnn #1#2#3
{
- \cs_gset_eq:cN { __debug_ \cs_to_str:N #1 } #1
+ \cs_gset_eq:cN { @@_ \cs_to_str:N #1 } #1
\@@_generate_parameter_list:NNN #1 \l_@@_tmpa_tl \l_@@_tmpb_tl
\exp_args:Nx \tex_scantokens:D
{
@@ -665,7 +664,7 @@
\tl_use:N \l_@@_tmpa_tl
{
\tl_to_str:n {#2}
- \exp_not:c { __debug_ \cs_to_str:N #1 }
+ \exp_not:c { @@_ \cs_to_str:N #1 }
\tl_use:N \l_@@_tmpb_tl
\tl_to_str:n {#3}
}
@@ -678,7 +677,7 @@
\cs_set:Npn \exp_not:N \@@_tmp:w
####1 \tl_to_str:n { macro: }
####2 \tl_to_str:n { -> }
- ####3 \c_backslash_str \tl_to_str:n { __debug_ }
+ ####3 \c_backslash_str \tl_to_str:n { @@_ }
\cs_to_str:N #1
####4 \s_@@_stop
{
@@ -688,7 +687,7 @@
\tex_def:D \exp_not:N #1 ####2
{
####3 \tl_to_str:n {#2}
- \c_backslash_str __debug_ \cs_to_str:N #1
+ \c_backslash_str @@_ \cs_to_str:N #1
####4 \tl_to_str:n {#3}
}
}
diff --git a/l3kernel/l3keys.dtx b/l3kernel/l3keys.dtx
index b363eb288..880d4f88a 100644
--- a/l3kernel/l3keys.dtx
+++ b/l3kernel/l3keys.dtx
@@ -1666,14 +1666,14 @@
% Searching for a property means finding the last |.| in the input,
% and storing the text before and after it. Everything is turned into
% strings, so there is no problem using an \texttt{x}-type expansion. Since
-% |\__keys_trim_spaces:n| will turn its argument into a string anyway, this
+% \cs{@@_trim_spaces:n} will turn its argument into a string anyway, this
% function uses \cs{cs_set_nopar:Npx} instead of \cs{tl_set:Nx} to gain some
% speed.
% \begin{macrocode}
\cs_new_protected:Npn \@@_property_find:n #1
{
- \cs_set_nopar:Npx \l__keys_property_str { \__keys_trim_spaces:n { #1 } }
- \exp_after:wN \@@_property_find_auxi:w \l__keys_property_str
+ \cs_set_nopar:Npx \l_@@_property_str { \@@_trim_spaces:n { #1 } }
+ \exp_after:wN \@@_property_find_auxi:w \l_@@_property_str
\s_@@_nil \@@_property_find_auxii:w
. \s_@@_nil \@@_property_find_err:w
}
@@ -1686,7 +1686,7 @@
\@@_property_find_err:w
{
\cs_set_nopar:Npx \l_keys_path_str
- { \str_if_empty:NF \l__keys_module_str { \l__keys_module_str / } #1 }
+ { \str_if_empty:NF \l_@@_module_str { \l_@@_module_str / } #1 }
\@@_property_find_auxi:w #2 \s_@@_nil \@@_property_find_auxiii:w . \s_@@_nil
\@@_property_find_auxiv:w
}
@@ -1699,15 +1699,15 @@
#1 \s_@@_nil \@@_property_find_auxiii:w
\s_@@_mark \s_@@_nil \@@_property_find_auxiv:w
{
- \cs_set_nopar:Npx \l__keys_property_str { . #1 }
+ \cs_set_nopar:Npx \l_@@_property_str { . #1 }
\cs_set_nopar:Npx \l_keys_path_str
- { \exp_after:wN \__keys_trim_spaces:n \exp_after:wN { \l_keys_path_str } }
+ { \exp_after:wN \@@_trim_spaces:n \exp_after:wN { \l_keys_path_str } }
\tl_set_eq:NN \l_keys_path_tl \l_keys_path_str
}
\cs_new_protected:Npn \@@_property_find_err:w
#1 \s_@@_nil #2 \@@_property_find_err:w
{
- \str_clear:N \l__keys_property_str
+ \str_clear:N \l_@@_property_str
\__kernel_msg_error:nnn { keys } { no-property } {#1}
}
% \end{macrocode}
diff --git a/l3kernel/l3msg.dtx b/l3kernel/l3msg.dtx
index 648aae441..20ddc21cd 100644
--- a/l3kernel/l3msg.dtx
+++ b/l3kernel/l3msg.dtx
@@ -1991,7 +1991,7 @@
\__kernel_msg_new:nnnn { quark } { invalid-function }
{ Quark~test~function~'#1'~is~invalid. }
{
- \c__msg_coding_error_text_tl
+ \c_@@_coding_error_text_tl
LaTeX~has~been~asked~to~create~quark~test~function~'#1'~
\tl_if_empty:nTF {#2}
{ but~that~name~ }
More information about the latex3-commits
mailing list.