[latex3-commits] [git/LaTeX3-latex3-latex3] filename-sanitize: Internals don't need to be \__kernel_... (adc3551b9)
PhelypeOleinik
phelype.oleinik at latex-project.org
Sat Apr 17 23:19:47 CEST 2021
Repository : https://github.com/latex3/latex3
On branch : filename-sanitize
Link : https://github.com/latex3/latex3/commit/adc3551b948ed3b43f96fb4037113dc9720f4a5a
>---------------------------------------------------------------
commit adc3551b948ed3b43f96fb4037113dc9720f4a5a
Author: PhelypeOleinik <phelype.oleinik at latex-project.org>
Date: Sat Apr 17 18:19:47 2021 -0300
Internals don't need to be \__kernel_...
>---------------------------------------------------------------
adc3551b948ed3b43f96fb4037113dc9720f4a5a
l3kernel/l3file.dtx | 74 ++++++++++++++++++++++++++---------------------------
1 file changed, 37 insertions(+), 37 deletions(-)
diff --git a/l3kernel/l3file.dtx b/l3kernel/l3file.dtx
index 479f72ea2..92ed0715e 100644
--- a/l3kernel/l3file.dtx
+++ b/l3kernel/l3file.dtx
@@ -2426,17 +2426,25 @@
% \end{macro}
%
% \begin{macro}[EXP]{\__kernel_file_name_sanitize:n}
-% \begin{macro}[EXP]{\__kernel_file_name_expand_loop:w}
-% \begin{macro}[EXP]{\__kernel_file_name_expand_N_type:Nw}
-% \begin{macro}[EXP]{\__kernel_file_name_expand_group:nw}
-% \begin{macro}[EXP]{\__kernel_file_name_expand_space:w}
-% \begin{macro}[EXP]{\__kernel_file_name_strip_quotes:n}
-% \begin{macro}[EXP]{\__kernel_file_name_strip_quotes:nnnw}
-% \begin{macro}[EXP]{\__kernel_file_name_strip_quotes:nnn}
-% \begin{macro}[EXP]{\__kernel_file_name_trim_spaces:n}
-% \begin{macro}[EXP]{\__kernel_file_name_trim_spaces:nw}
-% \begin{macro}[EXP]{\__kernel_file_name_trim_spaces_aux:n}
-% \begin{macro}[EXP]{\__kernel_file_name_trim_spaces_aux:w}
+% \begin{macro}[EXP]{
+% \@@_name_expand:n,
+% \@@_name_expand_cleanup:Nw,
+% \@@_name_expand_cleanup:w,
+% \@@_name_expand_end:,
+% \@@_name_expand_error:Nw,
+% \@@_name_expand_error_aux:Nw,
+% }
+% \begin{macro}[EXP]{
+% \@@_name_strip_quotes:n,
+% \@@_name_strip_quotes:nnnw,
+% \@@_name_strip_quotes:nnn,
+% }
+% \begin{macro}[EXP]{
+% \@@_name_trim_spaces:n,
+% \@@_name_trim_spaces:nw,
+% \@@_name_trim_spaces_aux:n,
+% \@@_name_trim_spaces_aux:w,
+% }
% Expanding the file name uses a \tn{csname}-based approach, and
% relies on active characters (for example from UTF-8 characters)
% being properly set up to expand to a expansion-safe version using
@@ -2445,9 +2453,9 @@
% \begin{macrocode}
\cs_new:Npn \__kernel_file_name_sanitize:n #1
{
- \exp_args:Ne \__kernel_file_name_trim_spaces:n
+ \exp_args:Ne \@@_name_trim_spaces:n
{
- \exp_args:Ne \__kernel_file_name_strip_quotes:n
+ \exp_args:Ne \@@_name_strip_quotes:n
{ \@@_name_expand:n {#1} }
}
}
@@ -2516,18 +2524,18 @@
% Quoting file name uses basically the same approach as for
% \texttt{luaquotejobname}: count the |"| tokens and remove them.
% \begin{macrocode}
-\cs_new:Npn \__kernel_file_name_strip_quotes:n #1
+\cs_new:Npn \@@_name_strip_quotes:n #1
{
- \__kernel_file_name_strip_quotes:nnnw {#1} { 0 } { }
+ \@@_name_strip_quotes:nnnw {#1} { 0 } { }
#1 " \q_@@_recursion_tail " \q_@@_recursion_stop
}
-\cs_new:Npn \__kernel_file_name_strip_quotes:nnnw #1#2#3#4 "
+\cs_new:Npn \@@_name_strip_quotes:nnnw #1#2#3#4 "
{
\@@_if_recursion_tail_stop_do:nn {#4}
- { \__kernel_file_name_strip_quotes:nnn {#1} {#2} {#3} }
- \__kernel_file_name_strip_quotes:nnnw {#1} { #2 + 1 } { #3#4 }
+ { \@@_name_strip_quotes:nnn {#1} {#2} {#3} }
+ \@@_name_strip_quotes:nnnw {#1} { #2 + 1 } { #3#4 }
}
-\cs_new:Npn \__kernel_file_name_strip_quotes:nnn #1#2#3
+\cs_new:Npn \@@_name_strip_quotes:nnn #1#2#3
{
\int_if_even:nT {#2}
{
@@ -2543,40 +2551,32 @@
% the standard trimming function but deliberately prevent any spaces being
% removed at the end.
% \begin{macrocode}
-\cs_new:Npn \__kernel_file_name_trim_spaces:n #1
- { \__kernel_file_name_trim_spaces:nw {#1} #1 . \q_@@_nil . \s_@@_stop }
-\cs_new:Npn \__kernel_file_name_trim_spaces:nw #1#2 . #3 . #4 \s_@@_stop
+\cs_new:Npn \@@_name_trim_spaces:n #1
+ { \@@_name_trim_spaces:nw {#1} #1 . \q_@@_nil . \s_@@_stop }
+\cs_new:Npn \@@_name_trim_spaces:nw #1#2 . #3 . #4 \s_@@_stop
{
\@@_quark_if_nil:nTF {#3}
{
- \exp_args:Ne \__kernel_file_name_trim_spaces_aux:n
+ \exp_args:Ne \@@_name_trim_spaces_aux:n
{ \tl_trim_spaces:n { #1 \s_@@_stop } }
}
{ \tl_trim_spaces:n {#1} }
}
-\cs_new:Npn \__kernel_file_name_trim_spaces_aux:n #1
- { \__kernel_file_name_trim_spaces_aux:w #1 }
-\cs_new:Npn \__kernel_file_name_trim_spaces_aux:w #1 \s_@@_stop {#1}
+\cs_new:Npn \@@_name_trim_spaces_aux:n #1
+ { \@@_name_trim_spaces_aux:w #1 }
+\cs_new:Npn \@@_name_trim_spaces_aux:w #1 \s_@@_stop {#1}
% \end{macrocode}
% \end{macro}
% \end{macro}
% \end{macro}
% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
%
% \begin{macro}[EXP]{\__kernel_file_name_quote:n}
-% \begin{macro}[EXP]{\__kernel_file_name_quote:nw}
+% \begin{macro}[EXP]{\@@_name_quote:nw}
% \begin{macrocode}
\cs_new:Npn \__kernel_file_name_quote:n #1
- { \__kernel_file_name_quote:nw {#1} #1 ~ \q_@@_nil \s_@@_stop }
-\cs_new:Npn \__kernel_file_name_quote:nw #1 #2 ~ #3 \s_@@_stop
+ { \@@_name_quote:nw {#1} #1 ~ \q_@@_nil \s_@@_stop }
+\cs_new:Npn \@@_name_quote:nw #1 #2 ~ #3 \s_@@_stop
{
\@@_quark_if_nil:nTF {#3}
{ #1 }
More information about the latex3-commits
mailing list.