summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-05-18 20:40:47 +0000
committerKarl Berry <karl@freefriends.org>2020-05-18 20:40:47 +0000
commit64ff205837dfa8fa805e4e3edde437799e630463 (patch)
tree6b66498a143a61c319744301dc0e974fb73d2884 /Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty
parent2820c5a1c2503809a033a87ae1b070a03c753dba (diff)
l3experimental (18may20)
git-svn-id: svn://tug.org/texlive/trunk@55205 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty')
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty53
1 files changed, 29 insertions, 24 deletions
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty b/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty
index b29c727f902..2939b76fb99 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty
@@ -28,9 +28,14 @@
%%
%% File: l3draw.dtx
\RequirePackage{expl3}
-\ProvidesExplPackage{l3draw}{2020-01-12}{}
+\ProvidesExplPackage{l3draw}{2020-05-18}{}
{L3 Experimental core drawing support}
\RequirePackage { l3color }
+\scan_new:N \s__draw_mark
+\scan_new:N \s__draw_stop
+\quark_new:N \q__draw_recursion_tail
+\quark_new:N \q__draw_recursion_stop
+\__kernel_quark_new_test:N \__draw_if_recursion_tail_stop_do:Nn
%% File: l3draw-boxes.dtx
\box_new:N \l__draw_tmp_box
\cs_new_protected:Npn \draw_box_use:N #1
@@ -804,8 +809,8 @@
{#1}
}
\cs_new:Npn \__draw_point_process_auxi:nn #1#2
- { \__draw_point_process_auxii:nw {#2} #1 \q_stop }
-\cs_new:Npn \__draw_point_process_auxii:nw #1 #2 , #3 \q_stop
+ { \__draw_point_process_auxii:nw {#2} #1 \s__draw_stop }
+\cs_new:Npn \__draw_point_process_auxii:nw #1 #2 , #3 \s__draw_stop
{ #1 {#2} {#3} }
\cs_new:Npn \__draw_point_process:nnn #1#2#3
{
@@ -815,8 +820,8 @@
{#1}
}
\cs_new:Npn \__draw_point_process_auxiii:nnn #1#2#3
- { \__draw_point_process_auxiv:nw {#3} #1 \q_mark #2 \q_stop }
-\cs_new:Npn \__draw_point_process_auxiv:nw #1 #2 , #3 \q_mark #4 , #5 \q_stop
+ { \__draw_point_process_auxiv:nw {#3} #1 \s__draw_mark #2 \s__draw_stop }
+\cs_new:Npn \__draw_point_process_auxiv:nw #1 #2 , #3 \s__draw_mark #4 , #5 \s__draw_stop
{ #1 {#2} {#3} {#4} {#5} }
\cs_new:Npn \__draw_point_process:nnnn #1#2#3#4
{
@@ -827,9 +832,9 @@
{#1}
}
\cs_new:Npn \__draw_point_process_auxv:nnnn #1#2#3#4
- { \__draw_point_process_auxvi:nw {#4} #1 \q_mark #2 \q_mark #3 \q_stop }
+ { \__draw_point_process_auxvi:nw {#4} #1 \s__draw_mark #2 \s__draw_mark #3 \s__draw_stop }
\cs_new:Npn \__draw_point_process_auxvi:nw
- #1 #2 , #3 \q_mark #4 , #5 \q_mark #6 , #7 \q_stop
+ #1 #2 , #3 \s__draw_mark #4 , #5 \s__draw_mark #6 , #7 \s__draw_stop
{ #1 {#2} {#3} {#4} {#5} {#6} {#7} }
\cs_new:Npn \__draw_point_process:nnnnn #1#2#3#4#5
{
@@ -843,10 +848,10 @@
\cs_new:Npn \__draw_point_process_auxvii:nnnnn #1#2#3#4#5
{
\__draw_point_process_auxviii:nw
- {#5} #1 \q_mark #2 \q_mark #3 \q_mark #4 \q_stop
+ {#5} #1 \s__draw_mark #2 \s__draw_mark #3 \s__draw_mark #4 \s__draw_stop
}
\cs_new:Npn \__draw_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__draw_mark #4 , #5 \s__draw_mark #6 , #7 \s__draw_mark #8 , #9 \s__draw_stop
{ #1 {#2} {#3} {#4} {#5} {#6} {#7} {#8} {#9} }
\cs_new:Npn \__draw_point_to_dim:n #1
{ \__draw_point_to_dim_aux:f { \fp_eval:n {#1} } }
@@ -1439,15 +1444,15 @@
\tl_build_get:NN \g__draw_softpath_main_tl \l__draw_softpath_internal_tl
\exp_after:wN \__draw_softpath_round_loop:Nnn
\l__draw_softpath_internal_tl
- \q_recursion_tail ? ?
- \q_recursion_stop
+ \q__draw_recursion_tail ? ?
+ \q__draw_recursion_stop
\group_end:
}
\bool_gset_false:N \g__draw_softpath_corners_bool
}
\cs_new_protected:Npn \__draw_softpath_round_loop:Nnn #1#2#3
{
- \quark_if_recursion_tail_stop_do:Nn #1 { \__draw_softpath_round_end: }
+ \__draw_if_recursion_tail_stop_do:Nn #1 { \__draw_softpath_round_end: }
\token_if_eq_meaning:NNTF #1 \__draw_softpath_roundpoint_op:nn
{ \__draw_softpath_round_action:nn {#2} {#3} }
{
@@ -1577,11 +1582,11 @@
\cs_new:Npn \__draw_softpath_round_calc:nnnnnn #1#2#3#4#5#6
{
\__draw_softpath_round_calc:nnnnw {#3} {#4} {#5} {#6}
- #1 \q_mark #2 \q_stop
+ #1 \s__draw_mark #2 \s__draw_stop
}
\cs_generate_variant:Nn \__draw_softpath_round_calc:nnnnnn { fV }
\cs_new:Npn \__draw_softpath_round_calc:nnnnw
- #1#2#3#4 #5 , #6 \q_mark #7 , #8 \q_stop
+ #1#2#3#4 #5 , #6 \s__draw_mark #7 , #8 \s__draw_stop
{
{#5} {#6}
\exp_not:N \__draw_softpath_curveto_opi:nn
@@ -1617,7 +1622,7 @@
\exp_not:N \exp_after:wN
\exp_not:N \__draw_softpath_round_close:w
\exp_not:N \l__draw_softpath_curve_end_tl
- \exp_not:N \q_stop
+ \s__draw_stop
}
\use:x
{
@@ -1628,7 +1633,7 @@
\exp_not:N \exp_after:wN
\exp_not:N \__draw_softpath_round_close:w
\exp_not:N \l__draw_softpath_curve_end_tl
- \exp_not:N \q_stop
+ \s__draw_stop
}
}
}
@@ -1637,7 +1642,7 @@
\exp_after:wN \use_none:n \l__draw_softpath_move_tl
}
}
-\cs_new:Npn \__draw_softpath_round_close:w #1 , #2 \q_stop { {#1} {#2} }
+\cs_new:Npn \__draw_softpath_round_close:w #1 , #2 \s__draw_stop { {#1} {#2} }
\cs_new_protected:Npn \__draw_softpath_round_end:
{
\tl_put_right:No \l__draw_softpath_main_tl
@@ -1693,17 +1698,17 @@
\__draw_color_aux:Vn \l__draw_color_tmp_tl {#1}
}
\cs_new_protected:Npn \__draw_color_aux:nn #1#2
- { \__draw_color:nw {#2} #1 \q_stop }
+ { \__draw_color:nw {#2} #1 \s__draw_stop }
\cs_generate_variant:Nn \__draw_color_aux:nn { V }
-\cs_new_protected:Npn \__draw_color:nw #1#2 ~ #3 \q_stop
- { \use:c { __draw_color_ #2 :nw } {#1} #3 \q_stop }
-\cs_new_protected:Npn \__draw_color_cmyk:nw #1#2 ~ #3 ~ #4 ~ #5 \q_stop
+\cs_new_protected:Npn \__draw_color:nw #1#2 ~ #3 \s__draw_stop
+ { \use:c { __draw_color_ #2 :nw } {#1} #3 \s__draw_stop }
+\cs_new_protected:Npn \__draw_color_cmyk:nw #1#2 ~ #3 ~ #4 ~ #5 \s__draw_stop
{ \use:c { __draw_backend_color_ #1 _cmyk:nnnn } {#2} {#3} {#4} {#5} }
-\cs_new_protected:Npn \__draw_color_gray:nw #1#2 \q_stop
+\cs_new_protected:Npn \__draw_color_gray:nw #1#2 \s__draw_stop
{ \use:c { __draw_backend_color_ #1 _gray:n } {#2} }
-\cs_new_protected:Npn \__draw_color_rgb:nw #1#2 ~ #3 ~ #4 \q_stop
+\cs_new_protected:Npn \__draw_color_rgb:nw #1#2 ~ #3 ~ #4 \s__draw_stop
{ \use:c { __draw_backend_color_ #1 _rgb:nnn } {#2} {#3} {#4} }
-\cs_new_protected:Npn \__draw_color_spot:nw #1#2 ~ #3 \q_stop
+\cs_new_protected:Npn \__draw_color_spot:nw #1#2 ~ #3 \s__draw_stop
{ \use:c { __draw_backend_color_ #1 _spot:nn } {#2} {#3} }
%% File: l3draw-transforms.dtx
\bool_new:N \l__draw_matrix_active_bool