l3experimental (18may20)

git-svn-id: svn://tug.org/texlive/trunk@55205 c570f23f-e606-0410-a88d-b1316a301751

9 files changed, 58 insertions, 33 deletions

diff --git a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-boxes.dtx b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-boxes.dtx
index 572b4f2192a..b1c1b8f9bba 100644
--- a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-boxes.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-boxes.dtx
@@ -44,7 +44,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-01-12}
+% \date{Released 2020-05-18}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-layers.dtx b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-layers.dtx
index 53c221d69e2..1711561dc72 100644
--- a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-layers.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-layers.dtx
@@ -44,7 +44,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-01-12}
+% \date{Released 2020-05-18}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-paths.dtx b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-paths.dtx
index 846043faa45..1d79852ddc1 100644
--- a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-paths.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-paths.dtx
@@ -44,7 +44,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-01-12}
+% \date{Released 2020-05-18}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-points.dtx b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-points.dtx
index dccb1fb6772..6874d149ae1 100644
--- a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-points.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-points.dtx
@@ -44,7 +44,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-01-12}
+% \date{Released 2020-05-18}
 %
 % \maketitle
 %
@@ -116,8 +116,8 @@
       {#1}
   }
 \cs_new:Npn \@@_point_process_auxi:nn #1#2
-  { \@@_point_process_auxii:nw {#2} #1 \q_stop }
-\cs_new:Npn \@@_point_process_auxii:nw #1 #2 , #3 \q_stop
+  { \@@_point_process_auxii:nw {#2} #1 \s_@@_stop }
+\cs_new:Npn \@@_point_process_auxii:nw #1 #2 , #3 \s_@@_stop
   { #1 {#2} {#3} }
 \cs_new:Npn \@@_point_process:nnn #1#2#3
   {
@@ -127,8 +127,8 @@
       {#1}
   }
 \cs_new:Npn \@@_point_process_auxiii:nnn #1#2#3
-  { \@@_point_process_auxiv:nw {#3} #1 \q_mark #2 \q_stop }
-\cs_new:Npn \@@_point_process_auxiv:nw #1 #2 , #3 \q_mark #4 , #5 \q_stop
+  { \@@_point_process_auxiv:nw {#3} #1 \s_@@_mark #2 \s_@@_stop }
+\cs_new:Npn \@@_point_process_auxiv:nw #1 #2 , #3 \s_@@_mark #4 , #5 \s_@@_stop
   { #1 {#2} {#3} {#4} {#5} }
 \cs_new:Npn \@@_point_process:nnnn #1#2#3#4
   {
@@ -139,9 +139,9 @@
       {#1}
   }
 \cs_new:Npn \@@_point_process_auxv:nnnn #1#2#3#4
-  { \@@_point_process_auxvi:nw {#4} #1 \q_mark #2 \q_mark #3 \q_stop }
+  { \@@_point_process_auxvi:nw {#4} #1 \s_@@_mark #2 \s_@@_mark #3 \s_@@_stop }
 \cs_new:Npn \@@_point_process_auxvi:nw
-  #1 #2 , #3 \q_mark #4 , #5 \q_mark #6 , #7 \q_stop
+  #1 #2 , #3 \s_@@_mark #4 , #5 \s_@@_mark #6 , #7 \s_@@_stop
   { #1 {#2} {#3} {#4} {#5} {#6} {#7} }
 \cs_new:Npn \@@_point_process:nnnnn #1#2#3#4#5
   {
@@ -155,10 +155,10 @@
 \cs_new:Npn \@@_point_process_auxvii:nnnnn #1#2#3#4#5
   {
     \@@_point_process_auxviii:nw
-      {#5} #1 \q_mark #2 \q_mark #3 \q_mark #4 \q_stop
+      {#5} #1 \s_@@_mark #2 \s_@@_mark #3 \s_@@_mark #4 \s_@@_stop
   }
 \cs_new:Npn \@@_point_process_auxviii:nw
-  #1 #2 , #3 \q_mark #4 , #5 \q_mark #6 , #7 \q_mark #8 , #9 \q_stop
+  #1 #2 , #3 \s_@@_mark #4 , #5 \s_@@_mark #6 , #7 \s_@@_mark #8 , #9 \s_@@_stop
   { #1 {#2} {#3} {#4} {#5} {#6} {#7} {#8} {#9} }
 %    \end{macrocode}
 % \end{macro}
diff --git a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-scopes.dtx b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-scopes.dtx
index 704d80652ff..13592541066 100644
--- a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-scopes.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-scopes.dtx
@@ -44,7 +44,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-01-12}
+% \date{Released 2020-05-18}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-softpath.dtx b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-softpath.dtx
index ce3b8b1ac80..ca1f161df56 100644
--- a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-softpath.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-softpath.dtx
@@ -44,7 +44,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-01-12}
+% \date{Released 2020-05-18}
 %
 % \maketitle
 %
@@ -326,8 +326,8 @@
           \tl_build_get:NN \g_@@_softpath_main_tl \l_@@_softpath_internal_tl
           \exp_after:wN \@@_softpath_round_loop:Nnn
             \l_@@_softpath_internal_tl
-            \q_recursion_tail ? ?
-            \q_recursion_stop
+            \q_@@_recursion_tail ? ?
+            \q_@@_recursion_stop
         \group_end:
       }
     \bool_gset_false:N \g_@@_softpath_corners_bool
@@ -342,7 +342,7 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_softpath_round_loop:Nnn #1#2#3
   {
-    \quark_if_recursion_tail_stop_do:Nn #1 { \@@_softpath_round_end: }
+    \@@_if_recursion_tail_stop_do:Nn #1 { \@@_softpath_round_end: }
     \token_if_eq_meaning:NNTF #1 \@@_softpath_roundpoint_op:nn
       { \@@_softpath_round_action:nn {#2} {#3} }
       {
@@ -505,7 +505,7 @@
 \cs_new:Npn \@@_softpath_round_calc:nnnnnn #1#2#3#4#5#6
   {
     \@@_softpath_round_calc:nnnnw {#3} {#4} {#5} {#6}
-      #1 \q_mark #2 \q_stop
+      #1 \s_@@_mark #2 \s_@@_stop
   }
 \cs_generate_variant:Nn \@@_softpath_round_calc:nnnnnn { fV }
 %    \end{macrocode}
@@ -513,7 +513,7 @@
 %   quadratic Bézier curve.
 %    \begin{macrocode}
 \cs_new:Npn \@@_softpath_round_calc:nnnnw
-  #1#2#3#4 #5 , #6 \q_mark #7 , #8 \q_stop
+  #1#2#3#4 #5 , #6 \s_@@_mark #7 , #8 \s_@@_stop
   {
     {#5} {#6}
     \exp_not:N \@@_softpath_curveto_opi:nn
@@ -556,7 +556,7 @@
                 \exp_not:N \exp_after:wN
                   \exp_not:N \@@_softpath_round_close:w
                   \exp_not:N \l_@@_softpath_curve_end_tl
-                    \exp_not:N \q_stop
+                    \s_@@_stop
               }
             \use:x
               {
@@ -567,7 +567,7 @@
                       \exp_not:N \exp_after:wN
                         \exp_not:N \@@_softpath_round_close:w
                         \exp_not:N \l_@@_softpath_curve_end_tl
-                          \exp_not:N \q_stop
+                          \s_@@_stop
                   }
               }
           }
@@ -576,7 +576,7 @@
           \exp_after:wN \use_none:n \l_@@_softpath_move_tl
       }
   }
-\cs_new:Npn \@@_softpath_round_close:w #1 , #2 \q_stop { {#1} {#2} }
+\cs_new:Npn \@@_softpath_round_close:w #1 , #2 \s_@@_stop { {#1} {#2} }
 %    \end{macrocode}
 %   Tidy up the parts of the path, complete the built token list and put
 %   it back into action. 
diff --git a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-state.dtx b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-state.dtx
index 658982a49b9..74f4f6a0720 100644
--- a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-state.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-state.dtx
@@ -44,7 +44,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-01-12}
+% \date{Released 2020-05-18}
 %
 % \maketitle
 %
@@ -177,17 +177,17 @@
     \@@_color_aux:Vn \l_@@_color_tmp_tl {#1}
   }
 \cs_new_protected:Npn \@@_color_aux:nn #1#2
-  { \@@_color:nw {#2} #1 \q_stop }
+  { \@@_color:nw {#2} #1 \s_@@_stop }
 \cs_generate_variant:Nn \@@_color_aux:nn { V }
-\cs_new_protected:Npn \@@_color:nw #1#2 ~ #3 \q_stop
-  { \use:c { @@_color_ #2 :nw } {#1} #3 \q_stop }
-\cs_new_protected:Npn \@@_color_cmyk:nw #1#2 ~ #3 ~ #4 ~ #5 \q_stop
+\cs_new_protected:Npn \@@_color:nw #1#2 ~ #3 \s_@@_stop
+  { \use:c { @@_color_ #2 :nw } {#1} #3 \s_@@_stop }
+\cs_new_protected:Npn \@@_color_cmyk:nw #1#2 ~ #3 ~ #4 ~ #5 \s_@@_stop
   { \use:c { @@_backend_color_ #1 _cmyk:nnnn } {#2} {#3} {#4} {#5} }
-\cs_new_protected:Npn \@@_color_gray:nw #1#2 \q_stop
+\cs_new_protected:Npn \@@_color_gray:nw #1#2 \s_@@_stop
   { \use:c { @@_backend_color_ #1 _gray:n } {#2} }
-\cs_new_protected:Npn \@@_color_rgb:nw #1#2 ~ #3 ~ #4 \q_stop
+\cs_new_protected:Npn \@@_color_rgb:nw #1#2 ~ #3 ~ #4 \s_@@_stop
   { \use:c { @@_backend_color_ #1 _rgb:nnn } {#2} {#3} {#4} }
-\cs_new_protected:Npn \@@_color_spot:nw #1#2 ~ #3 \q_stop
+\cs_new_protected:Npn \@@_color_spot:nw #1#2 ~ #3 \s_@@_stop
   { \use:c { @@_backend_color_ #1 _spot:nn } {#2} {#3} }
 %    \end{macrocode}
 % \end{macro}
diff --git a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-transforms.dtx b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-transforms.dtx
index bcfed707879..beb6582e0e7 100644
--- a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-transforms.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-transforms.dtx
@@ -44,7 +44,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-01-12}
+% \date{Released 2020-05-18}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw.dtx b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw.dtx
index 0ce74688f42..f485aa69a25 100644
--- a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw.dtx
@@ -110,7 +110,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-01-12}
+% \date{Released 2020-05-18}
 %
 % \maketitle
 %
@@ -1146,7 +1146,7 @@
 %
 %    \begin{macrocode}
 %<*package>
-\ProvidesExplPackage{l3draw}{2020-01-12}{}
+\ProvidesExplPackage{l3draw}{2020-05-18}{}
   {L3 Experimental core drawing support}
 %</package>
 %    \end{macrocode}
@@ -1155,6 +1155,31 @@
 \RequirePackage { l3color }
 %    \end{macrocode}
 %
+% \subsection{Internal auxiliaries}
+%
+% \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{variable}{\q_@@_recursion_tail,\q_@@_recursion_stop}
+%   Internal recursion quarks.
+%    \begin{macrocode}
+\quark_new:N \q_@@_recursion_tail
+\quark_new:N \q_@@_recursion_stop
+%    \end{macrocode}
+% \end{variable}
+%
+% \begin{macro}[EXP]{\@@_if_recursion_tail_stop_do:Nn}
+%   Functions to query recursion quarks.
+%    \begin{macrocode}
+\__kernel_quark_new_test:N \@@_if_recursion_tail_stop_do:Nn
+%    \end{macrocode}
+% \end{macro}
+%
 % Everything else is in the sub-files!
 %
 %    \begin{macrocode}