[latex3-commits] [git/LaTeX3-latex3-latex3] scan-quark: Replace quarks by scan marks in l3deprecation (4464847d6)

[PhelypeOleinik]

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

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

commit 4464847d60cafc15c4f279a07ee1d2fff845985a
Author: PhelypeOleinik <tex.phelype at gmail.com>
Date:   Fri Mar 20 21:24:15 2020 -0300

    Replace quarks by scan marks in l3deprecation


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

4464847d60cafc15c4f279a07ee1d2fff845985a
 l3kernel/l3deprecation.dtx        | 16 ++++++++++++----
 l3kernel/testfiles/m3quark001.tlg |  3 ++-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/l3kernel/l3deprecation.dtx b/l3kernel/l3deprecation.dtx
index cf9733ef6..756b8827f 100644
--- a/l3kernel/l3deprecation.dtx
+++ b/l3kernel/l3deprecation.dtx
@@ -109,15 +109,23 @@
 %    \end{macrocode}
 % \end{variable}
 %
+% \begin{variable}{\s_@@_mark,\s_@@_stop}
+%   Internal scan marks.
+%    \begin{macrocode}
+\scan_new:N \s_@@_mark
+\scan_new:N \s_@@_stop
+%    \end{macrocode}
+% \end{variable}
+%
 % \begin{macro}[EXP]{\@@_date_compare:nNnTF, \@@_date_compare_aux:w}
 %   Expects |#1| and |#3| to be dates in the format YYYY-MM-DD (but
 %   accepts YYYY or YYYY-MM too, filling in zeros for the missing data).
 %   Compares them using |#2| (one of |<|, |=|, |>|).
 %    \begin{macrocode}
 \cs_new:Npn \@@_date_compare:nNnTF #1#2#3
-  { \@@_date_compare_aux:w #1 -0-0- \q_mark #2 #3 -0-0- \q_stop }
+  { \@@_date_compare_aux:w #1 -0-0- \s_@@_mark #2 #3 -0-0- \s_@@_stop }
 \cs_new:Npn \@@_date_compare_aux:w
-  #1 - #2 - #3 - #4 \q_mark #5 #6 - #7 - #8 - #9 \q_stop
+  #1 - #2 - #3 - #4 \s_@@_mark #5 #6 - #7 - #8 - #9 \s_@@_stop
   {
     \int_compare:nNnTF {#1} = {#6}
       {
@@ -155,7 +163,7 @@
         \exp_args:Nf \@@_date_compare:nNnTF
           {
             \exp_after:wN \@@_minus_six_months:w
-            \ExplLoaderFileDate -0-0- \q_stop
+            \ExplLoaderFileDate -0-0- \s_@@_stop
           } < {#1}
           {
             \bool_set_true:N \l_@@_grace_period_bool
@@ -164,7 +172,7 @@
           { \use_ii:nn }
       }
   }
-\cs_new:Npn \@@_minus_six_months:w #1 - #2 - #3 - #4 \q_stop
+\cs_new:Npn \@@_minus_six_months:w #1 - #2 - #3 - #4 \s_@@_stop
   {
     \int_compare:nNnTF {#2} > 6
       { #1 - \int_eval:n { #2 - 6 } - #3 }
diff --git a/l3kernel/testfiles/m3quark001.tlg b/l3kernel/testfiles/m3quark001.tlg
index ff7afccc7..ff796cdea 100644
--- a/l3kernel/testfiles/m3quark001.tlg
+++ b/l3kernel/testfiles/m3quark001.tlg
@@ -89,7 +89,8 @@ already been used for a scan mark.
 \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__color_stop \s__text_stop \s__bool_mark \s__bool_stop \s__foo .
+\s__color_stop \s__text_stop \s__bool_mark \s__bool_stop \s__deprecation_mark
+\s__deprecation_stop \s__foo .
 ============================================================
 ============================================================
 TEST 14: Use none until s__stop (expect nothing)