[latex3-commits] [git/LaTeX3-latex3-latex3] master: changed quarks to scan marks (cda029d39)
Joseph Wright
joseph.wright at morningstar2.co.uk
Tue Mar 3 17:59:10 CET 2020
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/cda029d39353e14b5982c482cf496de43ee7f8a5
>---------------------------------------------------------------
commit cda029d39353e14b5982c482cf496de43ee7f8a5
Author: Jonathan Spratte <jspratte at yahoo.de>
Date: Thu Feb 20 23:39:13 2020 +0100
changed quarks to scan marks
>---------------------------------------------------------------
cda029d39353e14b5982c482cf496de43ee7f8a5
l3kernel/l3keys.dtx | 116 ++++++++++++++++++++++++++--------------------------
1 file changed, 58 insertions(+), 58 deletions(-)
diff --git a/l3kernel/l3keys.dtx b/l3kernel/l3keys.dtx
index 009846154..c97845395 100644
--- a/l3kernel/l3keys.dtx
+++ b/l3kernel/l3keys.dtx
@@ -951,12 +951,12 @@
%<@@=keyval>
% \end{macrocode}
%
-% \begin{variable}{\q_@@_nil,\q_@@_mark,\q_@@_stop,\q_@@_tail}
+% \begin{variable}{\s_@@_nil,\s_@@_mark,\s_@@_stop,\s_@@_tail}
% \begin{macrocode}
-\quark_new:N \q_@@_nil
-\quark_new:N \q_@@_mark
-\quark_new:N \q_@@_stop
-\quark_new:N \q_@@_tail
+\scan_new:N \s_@@_nil
+\scan_new:N \s_@@_mark
+\scan_new:N \s_@@_stop
+\scan_new:N \s_@@_tail
% \end{macrocode}
% \end{variable}
%
@@ -980,7 +980,7 @@
% \begin{macrocode}
\cs_new:Npn \keyval_parse:NNn ##1 ##2 ##3
{
- \@@_loop_active:NNw ##1 ##2 \q_@@_mark ##3 #1 \q_@@_tail #1
+ \@@_loop_active:NNw ##1 ##2 \s_@@_mark ##3 #1 \s_@@_tail #1
}
% \end{macrocode}
% \end{macro}
@@ -996,9 +996,9 @@
\cs_new:Npn \@@_loop_active:NNw ##1 ##2 ##3 #1
{
\@@_if_recursion_tail:w ##3
- \@@_end_loop_active:w \q_@@_mark \q_@@_tail
- \@@_loop_other:NNw ##1 ##2 ##3 , \q_@@_tail ,
- \@@_loop_active:NNw ##1 ##2 \q_@@_mark
+ \@@_end_loop_active:w \s_@@_mark \s_@@_tail
+ \@@_loop_other:NNw ##1 ##2 ##3 , \s_@@_tail ,
+ \@@_loop_active:NNw ##1 ##2 \s_@@_mark
}
% \end{macrocode}
% \end{macro}
@@ -1013,26 +1013,26 @@
\cs_new:Npn \@@_loop_other:NNw ##1 ##2 ##3 ,
{
\@@_if_recursion_tail:w ##3
- \@@_end_loop_other:w \q_@@_mark \q_@@_tail
- \@@_if_has_equal_other:w ##3 = \q_@@_stop
- \@@_has_false:w \q_@@_mark \q_@@_stop \use_i:nn
+ \@@_end_loop_other:w \s_@@_mark \s_@@_tail
+ \@@_if_has_equal_other:w ##3 = \s_@@_stop
+ \@@_has_false:w \s_@@_mark \s_@@_stop \use_i:nn
{
- \@@_if_has_equal_active:w ##3 #2 \q_@@_stop
- \@@_has_false:w \q_@@_mark \q_@@_stop \use_i:nn
+ \@@_if_has_equal_active:w ##3 #2 \s_@@_stop
+ \@@_has_false:w \s_@@_mark \s_@@_stop \use_i:nn
\@@_misplaced_equal_error:
- { \@@_split_other:wN ##3 = \q_@@_stop ##2 }
+ { \@@_split_other:wN ##3 = \s_@@_stop ##2 }
}
{
- \@@_if_has_equal_active:w ##3 #2 \q_@@_stop
- \@@_has_false:w \q_@@_mark \q_@@_stop \use_i:nn
- { \@@_split_active:wN ##3 #2 \q_@@_stop ##2 }
+ \@@_if_has_equal_active:w ##3 #2 \s_@@_stop
+ \@@_has_false:w \s_@@_mark \s_@@_stop \use_i:nn
+ { \@@_split_active:wN ##3 #2 \s_@@_stop ##2 }
{
- \@@_if_blank:w ##3 \q_@@_nil \q_@@_stop
- \@@_blank_true:w \q_@@_mark \q_@@_stop \use:n
+ \@@_if_blank:w ##3 \s_@@_nil \s_@@_stop
+ \@@_blank_true:w \s_@@_mark \s_@@_stop \use:n
{ \@@_trim:nN { ##3 } \@@_key:nN ##1 }
}
}
- \@@_loop_other:NNw ##1 ##2 \q_@@_mark
+ \@@_loop_other:NNw ##1 ##2 \s_@@_mark
}
% \end{macrocode}
% \end{macro}
@@ -1046,12 +1046,12 @@
% \begin{macrocode}
\cs_new:Npn \@@_split_active:wN ##1 #2
{
- \@@_trim:nN { ##1 } \@@_split_active_aux:nwN \q_@@_mark
+ \@@_trim:nN { ##1 } \@@_split_active_aux:nwN \s_@@_mark
}
- \cs_new:Npn \@@_split_active_aux:nwN ##1 ##2 #2 ##3 \q_@@_stop
+ \cs_new:Npn \@@_split_active_aux:nwN ##1 ##2 #2 ##3 \s_@@_stop
{
- \@@_if_empty:w \q_@@_mark ##3 \q_@@_stop
- \@@_has_false:w \q_@@_mark \q_@@_stop \use_i:nn
+ \@@_if_empty:w \s_@@_mark ##3 \s_@@_stop
+ \@@_has_false:w \s_@@_mark \s_@@_stop \use_i:nn
{ \@@_misplaced_equal_error: \use_none:n }
{ \@@_trim:nN { ##2 } \@@_key_val:nnN { ##1 } }
}
@@ -1064,7 +1064,7 @@
% \begin{macrocode}
\cs_new:Npn \@@_if_has_equal_active:w ##1 #2
{
- \@@_if_empty:w \q_@@_mark
+ \@@_if_empty:w \s_@@_mark
}
% \end{macrocode}
% \end{macro}
@@ -1087,16 +1087,16 @@
% faster.
% \begin{macrocode}
\cs_new:Npn \@@_end_loop_active:w
- \q_@@_mark \q_@@_tail
- \@@_loop_other:NNw #1 , \q_@@_tail ,
- \@@_loop_active:NNw #2 \q_@@_mark
+ \s_@@_mark \s_@@_tail
+ \@@_loop_other:NNw #1 , \s_@@_tail ,
+ \@@_loop_active:NNw #2 \s_@@_mark
{}
\cs_new:Npn \@@_end_loop_other:w
- \q_@@_mark \q_@@_tail
- \@@_if_has_equal_other:w #1 = \q_@@_stop
- \@@_has_false:w \q_@@_mark \q_@@_stop \use_i:nn
+ \s_@@_mark \s_@@_tail
+ \@@_if_has_equal_other:w #1 = \s_@@_stop
+ \@@_has_false:w \s_@@_mark \s_@@_stop \use_i:nn
#2
- \@@_loop_other:NNw #3 \q_@@_mark
+ \@@_loop_other:NNw #3 \s_@@_mark
{}
% \end{macrocode}
% \end{macro}
@@ -1107,12 +1107,12 @@
% \begin{macrocode}
\cs_new:Npn \@@_split_other:wN #1 =
{
- \@@_trim:nN { #1 } \@@_split_other_aux:nwN \q_@@_mark
+ \@@_trim:nN { #1 } \@@_split_other_aux:nwN \s_@@_mark
}
- \cs_new:Npn \@@_split_other_aux:nwN #1 #2 = #3 \q_@@_stop
+ \cs_new:Npn \@@_split_other_aux:nwN #1 #2 = #3 \s_@@_stop
{
- \@@_if_empty:w \q_@@_mark #3 \q_@@_stop
- \@@_has_false:w \q_@@_mark \q_@@_stop \use_i:nn
+ \@@_if_empty:w \s_@@_mark #3 \s_@@_stop
+ \@@_has_false:w \s_@@_mark \s_@@_stop \use_i:nn
{ \@@_misplaced_equal_error: \use_none:n }
{ \@@_trim:nN { #2 } \@@_key_val:nnN { #1 } }
}
@@ -1139,8 +1139,8 @@
% \begin{macrocode}
\cs_new:Npn \@@_key_val:nnN #1 #2 #3
{
- \@@_if_empty:w \q_@@_mark #2 \q_@@_stop
- \@@_empty_key:w \q_@@_mark \q_@@_stop
+ \@@_if_empty:w \s_@@_mark #2 \s_@@_stop
+ \@@_empty_key:w \s_@@_mark \s_@@_stop
\exp_not:n { #3 { #2 } { #1 } }
}
% \end{macrocode}
@@ -1152,9 +1152,9 @@
% with an arbitrary token following the argument. Each of these utilize the
% fact that the argument will contain a leading \cs{q_mark}.
% \begin{macrocode}
-\cs_new:Npn \@@_if_empty:w #1 \q_@@_mark \q_@@_stop {}
-\cs_new:Npn \@@_if_blank:w \q_@@_mark #1 { \@@_if_empty:w \q_@@_mark }
-\cs_new:Npn \@@_if_recursion_tail:w #1 \q_@@_mark \q_@@_tail {}
+\cs_new:Npn \@@_if_empty:w #1 \s_@@_mark \s_@@_stop {}
+\cs_new:Npn \@@_if_blank:w \s_@@_mark #1 { \@@_if_empty:w \s_@@_mark }
+\cs_new:Npn \@@_if_recursion_tail:w #1 \s_@@_mark \s_@@_tail {}
% \end{macrocode}
% \end{macro}
%
@@ -1162,9 +1162,9 @@
% These macros will be called if the tests above didn't gobble them, they
% execute the branching.
% \begin{macrocode}
-\cs_new:Npn \@@_has_false:w \q_@@_mark \q_@@_stop \use_i:nn #1 #2 { #2 }
-\cs_new:Npn \@@_blank_true:w \q_@@_mark \q_@@_stop \use:n #1 {}
-\cs_new:Npn \@@_empty_key:w \q_@@_mark \q_@@_stop \exp_not:n #1
+\cs_new:Npn \@@_has_false:w \s_@@_mark \s_@@_stop \use_i:nn #1 #2 { #2 }
+\cs_new:Npn \@@_blank_true:w \s_@@_mark \s_@@_stop \use:n #1 {}
+\cs_new:Npn \@@_empty_key:w \s_@@_mark \s_@@_stop \exp_not:n #1
{
\@@_misplaced_equal_error:
}
@@ -1176,7 +1176,7 @@
% \begin{macrocode}
\cs_new:Npn \@@_if_has_equal_other:w #1 =
{
- \@@_if_empty:w \q_@@_mark
+ \@@_if_empty:w \s_@@_mark
}
% \end{macrocode}
% \end{macro}
@@ -1214,37 +1214,37 @@
{
\@@_trim_auxi:w
##1
- \q_@@_nil
- \q_@@_mark #1 {}
- \q_@@_mark \@@_trim_auxii:w
+ \s_@@_nil
+ \s_@@_mark #1 {}
+ \s_@@_mark \@@_trim_auxii:w
\@@_trim_auxiii:w
- #1 \q_@@_nil
+ #1 \s_@@_nil
\@@_trim_auxiv:w
- \q_@@_stop
+ \s_@@_stop
}
- \cs_new:Npn \@@_trim_auxi:w ##1 \q_@@_mark #1 ##2 \q_@@_mark ##3
+ \cs_new:Npn \@@_trim_auxi:w ##1 \s_@@_mark #1 ##2 \s_@@_mark ##3
{
##3
\@@_trim_auxi:w
- \q_@@_mark
+ \s_@@_mark
##2
- \q_@@_mark #1 {##1}
+ \s_@@_mark #1 {##1}
}
- \cs_new:Npn \@@_trim_auxii:w \@@_trim_auxi:w \q_@@_mark \q_@@_mark ##1
+ \cs_new:Npn \@@_trim_auxii:w \@@_trim_auxi:w \s_@@_mark \s_@@_mark ##1
{
\@@_trim_auxiii:w
##1
}
- \cs_new:Npn \@@_trim_auxiii:w ##1 #1 \q_@@_nil ##2
+ \cs_new:Npn \@@_trim_auxiii:w ##1 #1 \s_@@_nil ##2
{
##2
- ##1 \q_@@_nil
+ ##1 \s_@@_nil
\@@_trim_auxiii:w
}
% \end{macrocode}
% This is the one macro which differs from the original definition.
% \begin{macrocode}
- \cs_new:Npn \@@_trim_auxiv:w \q_@@_mark ##1 \q_@@_nil ##2 \q_@@_stop ##3
+ \cs_new:Npn \@@_trim_auxiv:w \s_@@_mark ##1 \s_@@_nil ##2 \s_@@_stop ##3
{
##3 { ##1 }
}
More information about the latex3-commits
mailing list.