[latex3-commits] [git/LaTeX3-latex3-latex3] scan-quark: Replace quarks by scan marks in l3color-base (3c3d16e7b)

[PhelypeOleinik]

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

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

commit 3c3d16e7b96b69bea0e16fe64f9038e17bbd8019
Author: PhelypeOleinik <tex.phelype at gmail.com>
Date:   Fri Mar 20 19:35:30 2020 -0300

    Replace quarks by scan marks in l3color-base


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

3c3d16e7b96b69bea0e16fe64f9038e17bbd8019
 l3kernel/l3color-base.dtx         | 21 ++++++++++++++-------
 l3kernel/testfiles/m3quark001.tlg |  3 ++-
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/l3kernel/l3color-base.dtx b/l3kernel/l3color-base.dtx
index b5c9e3918..bc8c74935 100644
--- a/l3kernel/l3color-base.dtx
+++ b/l3kernel/l3color-base.dtx
@@ -147,6 +147,13 @@
 %    \end{macrocode}
 % \end{macro}
 %
+% \begin{variable}{\s_@@_stop}
+%   Internal scan marks.
+%    \begin{macrocode}
+\scan_new:N \s_@@_stop
+%    \end{macrocode}
+% \end{variable}
+%
 % \begin{macro}{\@@_select:n, \@@_select:V}
 % \begin{macro}{\@@_select:w}
 % \begin{macro}
@@ -156,17 +163,17 @@
 %    higher-level experimental material.
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_select:n #1
-  { \@@_select:w #1 \q_stop }
+  { \@@_select:w #1 \s_@@_stop }
 \cs_generate_variant:Nn \@@_select:n { V }
-\cs_new_protected:Npn \@@_select:w #1 ~ #2 \q_stop
-  { \use:c { @@_select_ #1 :w } #2 \q_stop }
-\cs_new_protected:Npn \@@_select_cmyk:w #1 ~ #2 ~ #3 ~ #4 \q_stop
+\cs_new_protected:Npn \@@_select:w #1 ~ #2 \s_@@_stop
+  { \use:c { @@_select_ #1 :w } #2 \s_@@_stop }
+\cs_new_protected:Npn \@@_select_cmyk:w #1 ~ #2 ~ #3 ~ #4 \s_@@_stop
   { \@@_backend_cmyk:nnnn {#1} {#2} {#3} {#4} }
-\cs_new_protected:Npn \@@_select_gray:w #1 \q_stop
+\cs_new_protected:Npn \@@_select_gray:w #1 \s_@@_stop
   { \@@_backend_gray:n {#1} }
-\cs_new_protected:Npn \@@_select_rgb:w #1 ~ #2 ~ #3 \q_stop
+\cs_new_protected:Npn \@@_select_rgb:w #1 ~ #2 ~ #3 \s_@@_stop
   { \@@_backend_rgb:nnn {#1} {#2} {#3} }
-\cs_new_protected:Npn \@@_select_spot:w #1 ~ #2 \q_stop
+\cs_new_protected:Npn \@@_select_spot:w #1 ~ #2 \s_@@_stop
   { \@@_backend_spot:nn {#1} {#2} }
 %    \end{macrocode}
 % \end{macro}
diff --git a/l3kernel/testfiles/m3quark001.tlg b/l3kernel/testfiles/m3quark001.tlg
index 96c95335e..5f3323c99 100644
--- a/l3kernel/testfiles/m3quark001.tlg
+++ b/l3kernel/testfiles/m3quark001.tlg
@@ -88,7 +88,8 @@ already been used for a scan mark.
 \s__skip_stop \s__keyval_nil \s__keyval_mark \s__keyval_stop \s__keyval_tail
 \s__keys_stop \s__fp \s__fp_expr_mark \s__fp_expr_stop \s__fp_mark \s__fp_stop
 \s__fp_invalid \s__fp_underflow \s__fp_overflow \s__fp_division \s__fp_exact
-\s__fp_tuple \s__sort_mark \s__sort_stop \s__sort_scan_stop \s__tl \s__foo .
+\s__fp_tuple \s__sort_mark \s__sort_stop \s__sort_scan_stop \s__tl
+\s__color_stop \s__foo .
 ============================================================
 ============================================================
 TEST 14: Use none until s__stop (expect nothing)