[latex3-commits] [git/LaTeX3-latex3-latex3] scan-quark: Propagate changes (8109576..4494e1e) to l3experimental and l3packages (e1cd8c86b)

[PhelypeOleinik]

Repository : https://github.com/latex3/latex3
On branch  : scan-quark
Link       : https://github.com/latex3/latex3/commit/e1cd8c86b1d07f8feb0b835915f8d3ee131c6e58

>---------------------------------------------------------------

commit e1cd8c86b1d07f8feb0b835915f8d3ee131c6e58
Author: PhelypeOleinik <tex.phelype at gmail.com>
Date:   Wed Apr 29 00:10:16 2020 -0300

    Propagate changes (8109576..4494e1e) to l3experimental and l3packages


>---------------------------------------------------------------

e1cd8c86b1d07f8feb0b835915f8d3ee131c6e58
 l3experimental/l3draw/l3draw.dtx                        | 2 +-
 l3experimental/l3sys-shell/l3sys-shell.dtx              | 7 +++----
 l3experimental/l3sys-shell/testfiles/m3sys-shell001.tlg | 2 +-
 l3packages/xtemplate/xtemplate.dtx                      | 7 +++----
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/l3experimental/l3draw/l3draw.dtx b/l3experimental/l3draw/l3draw.dtx
index 32d6b138f..f112e4b2b 100644
--- a/l3experimental/l3draw/l3draw.dtx
+++ b/l3experimental/l3draw/l3draw.dtx
@@ -1176,7 +1176,7 @@
 % \begin{macro}[EXP]{\@@_if_recursion_tail_stop_do:Nn}
 %   Functions to query recursion quarks.
 %    \begin{macrocode}
-\__kernel_quark_test_generate:Nn \@@_if_recursion_tail_stop_do:Nn { @@ }
+\__kernel_quark_new_test:N \@@_if_recursion_tail_stop_do:Nn
 %    \end{macrocode}
 % \end{macro}
 %
diff --git a/l3experimental/l3sys-shell/l3sys-shell.dtx b/l3experimental/l3sys-shell/l3sys-shell.dtx
index af21194c1..571b348de 100644
--- a/l3experimental/l3sys-shell/l3sys-shell.dtx
+++ b/l3experimental/l3sys-shell/l3sys-shell.dtx
@@ -155,11 +155,10 @@
 %    \end{macrocode}
 % \end{variable}
 %
-% \begin{macro}[pTF]{\@@_if_nil:n}
+% \begin{macro}[pTF]{\@@_quark_if_nil:n}
 %   Branching quark conditional.
 %    \begin{macrocode}
-\__kernel_quark_conditional_generate:NNnn \@@_if_nil:N
-  \q_@@_nil { @@ } { F }
+\__kernel_quark_new_conditional:Nn \@@_quark_if_nil:N { F }
 %    \end{macrocode}
 % \end{macro}
 %
@@ -183,7 +182,7 @@
   }
 \cs_new:Npn \@@_path_to_win:N #1
   {
-    \@@_if_nil:NF #1
+    \@@_quark_if_nil:NF #1
       {
         \token_if_eq_meaning:NNTF #1 /
           { \c_backslash_str }
diff --git a/l3experimental/l3sys-shell/testfiles/m3sys-shell001.tlg b/l3experimental/l3sys-shell/testfiles/m3sys-shell001.tlg
index fca580fd5..99b7fe79f 100644
--- a/l3experimental/l3sys-shell/testfiles/m3sys-shell001.tlg
+++ b/l3experimental/l3sys-shell/testfiles/m3sys-shell001.tlg
@@ -5,7 +5,7 @@ Author: Joseph Wright
 Package: l3sys-shell ....-..-.. L3 Experimental system shell functions
 Defining \s__sys_stop on line ...
 Defining \q__sys_nil on line ...
-Defining \__sys_if_nil:NF on line ...
+Defining \__sys_quark_if_nil:NF on line ...
 Defining \__sys_path_to_win:n on line ...
 Defining \__sys_path_to_win:w on line ...
 Defining \__sys_path_to_win:N on line ...
diff --git a/l3packages/xtemplate/xtemplate.dtx b/l3packages/xtemplate/xtemplate.dtx
index 0fc0e1239..8d7bcc14a 100644
--- a/l3packages/xtemplate/xtemplate.dtx
+++ b/l3packages/xtemplate/xtemplate.dtx
@@ -873,11 +873,10 @@
 %    \end{macrocode}
 % \end{variable}
 %
-% \begin{macro}[pTF]{\@@_if_nil:n}
+% \begin{macro}[pTF]{\@@_quark_if_nil:n}
 %   Branching quark conditional.
 %    \begin{macrocode}
-\__kernel_quark_conditional_generate:NNnn \@@_if_nil:N
-  \q_@@_nil { @@ } { F }
+\__kernel_quark_new_conditional:Nn \@@_quark_if_nil:N { F }
 %    \end{macrocode}
 % \end{macro}
 %
@@ -2409,7 +2408,7 @@
   }
 \cs_new_protected:Npn \@@_key_to_value_auxii:w #1 global #2#3 \s_@@_stop
   {
-    \@@_if_nil:NF #2
+    \@@_quark_if_nil:NF #2
       { \tl_set:Nn \l_@@_value_tl {#2} }
   }
 %    \end{macrocode}