summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
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
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')
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3benchmark/l3benchmark.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3cctab/l3cctab.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3color/l3color.sty73
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty53
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3graphics/l3graphics.sty15
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3pdf/l3pdf.sty23
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty26
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3sys-shell/l3sys-shell.sty15
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty2
11 files changed, 116 insertions, 99 deletions
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3benchmark/l3benchmark.sty b/Master/texmf-dist/tex/latex/l3experimental/l3benchmark/l3benchmark.sty
index 5d5864c8cdb..e3131323517 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3benchmark/l3benchmark.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3benchmark/l3benchmark.sty
@@ -20,7 +20,7 @@
%%
%% File: l3benchmark.dtx
\RequirePackage{expl3}
-\ProvidesExplPackage{l3benchmark}{2020-01-12}{}
+\ProvidesExplPackage{l3benchmark}{2020-05-18}{}
{L3 Experimental benchmarking}
\sys_if_engine_luatex:TF
{
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3cctab/l3cctab.sty b/Master/texmf-dist/tex/latex/l3experimental/l3cctab/l3cctab.sty
index 392ef2ba12a..4b1c560d98e 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3cctab/l3cctab.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3cctab/l3cctab.sty
@@ -20,7 +20,7 @@
%%
%% File: l3cctab.dtx
\RequirePackage{expl3}
-\ProvidesExplPackage{l3cctab}{2020-01-12}{}
+\ProvidesExplPackage{l3cctab}{2020-05-18}{}
{L3 Experimental category code tables}
\int_new:N \g__cctab_allocate_int
\int_gset:Nn \g__cctab_allocate_int { -1 }
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3color/l3color.sty b/Master/texmf-dist/tex/latex/l3experimental/l3color/l3color.sty
index 2b56c1dfd57..d7829a472ac 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3color/l3color.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3color/l3color.sty
@@ -20,9 +20,10 @@
%%
%% File: l3color.dtx
\RequirePackage{expl3}
-\ProvidesExplPackage{l3color}{2020-01-12}{}
+\ProvidesExplPackage{l3color}{2020-05-18}{}
{L3 Experimental color support}
\tl_new:N \l__color_internal_tl
+\scan_new:N \s__color_mark
\prg_new_conditional:Npnn \__color_if_defined:n #1 { T, F, TF }
{
\tl_if_exist:cTF { l__color_named_ #1 _tl }
@@ -35,10 +36,10 @@
\__color_extract:NNw
\exp_after:wN \exp_after:wN \exp_after:wN #2
\exp_after:wN \exp_after:wN \exp_after:wN #3
- \cs:w l__color_named_ #1 _tl \cs_end: \q_stop
+ \cs:w l__color_named_ #1 _tl \cs_end: \s__color_stop
}
\cs_generate_variant:Nn \__color_extract:nNN { V }
-\cs_new_protected:Npn \__color_extract:NNw #1#2 #3 ~ #4 \q_stop
+\cs_new_protected:Npn \__color_extract:NNw #1#2 #3 ~ #4 \s__color_stop
{
\tl_set:Nn #1 {#3}
\tl_set:Nn #2 {#4}
@@ -51,16 +52,16 @@
\str_if_eq:nnT {#1} { spot } % TO DO!!!
{ }
\tl_set:Nx #4
- { \use:c { __color_convert_ #1 _ #2 :w } #3 ~ 0 ~ 0 ~ 0 \q_stop }
+ { \use:c { __color_convert_ #1 _ #2 :w } #3 ~ 0 ~ 0 ~ 0 \s__color_stop }
}
\cs_generate_variant:Nn \__color_convert:nnnN { nnV }
-\cs_new:Npn \__color_convert_gray_rgb:w #1 ~ #2 \q_stop
+\cs_new:Npn \__color_convert_gray_rgb:w #1 ~ #2 \s__color_stop
{ #1 ~ #1 ~ #1 }
-\cs_new:Npn \__color_convert_gray_cmyk:w #1 ~ #2 \q_stop
+\cs_new:Npn \__color_convert_gray_cmyk:w #1 ~ #2 \s__color_stop
{ 0 ~ 0 ~ 0 ~ \fp_eval:n { 1 - #1 } }
-\cs_new:Npn \__color_convert_rgb_gray:w #1 ~ #2 ~ #3 ~ #4 \q_stop
+\cs_new:Npn \__color_convert_rgb_gray:w #1 ~ #2 ~ #3 ~ #4 \s__color_stop
{ \fp_eval:n { 0.3 * #1 + 0.59 * #2 + 0.11 * #3 } }
-\cs_new:Npn \__color_convert_rgb_cmyk:w #1 ~ #2 ~ #3 ~ #4 \q_stop
+\cs_new:Npn \__color_convert_rgb_cmyk:w #1 ~ #2 ~ #3 ~ #4 \s__color_stop
{
\exp_args:Nf \__color_convert_rgb_cmyk:nnnn
{ \fp_eval:n { min ( 1 - #1 , 1 - #2 , 1 - #3 ) } } {#1} {#2} {#3}
@@ -72,9 +73,9 @@
\fp_eval:n { min ( 1 , max ( 0 , 1 - #4 - #1 ) ) } \c_space_tl
#1
}
-\cs_new:Npn \__color_convert_cmyk_gray:w #1 ~ #2 ~ #3 ~ #4 ~ #5 \q_stop
+\cs_new:Npn \__color_convert_cmyk_gray:w #1 ~ #2 ~ #3 ~ #4 ~ #5 \s__color_stop
{ \fp_eval:n { 1 - min ( 1 , 0.3 * #1 + 0.59 * #2 + 0.11 * #3 + #4 ) } }
-\cs_new:Npn \__color_convert_cmyk_rgb:w #1 ~ #2 ~ #3 ~ #4 ~ #5 \q_stop
+\cs_new:Npn \__color_convert_cmyk_rgb:w #1 ~ #2 ~ #3 ~ #4 ~ #5 \s__color_stop
{
\fp_eval:n { 1 - min ( 1 , #1 + #4 ) } \c_space_tl
\fp_eval:n { 1 - min ( 1 , #2 + #4 ) } \c_space_tl
@@ -94,10 +95,10 @@
{
\tl_if_exist:cTF { l__color_named_ #1 _tl }
{ \tl_set_eq:Nc #2 { l__color_named_ #1 _tl } }
- { \__color_parse:Nw #2#1 ! \q_stop }
+ { \__color_parse:Nw #2#1 ! \s__color_stop }
\__color_check_model:N #2
}
-\cs_new_protected:Npn \__color_parse:Nw #1#2 ! #3 \q_stop
+\cs_new_protected:Npn \__color_parse:Nw #1#2 ! #3 \s__color_stop
{
\__color_if_defined:nTF {#2}
{
@@ -114,13 +115,13 @@
{
\group_begin:
\__color_extract:nNN {#2} \l__color_model_tl \l__color_value_tl
- \__color_parse_loop:w #3 ! ! ! ! \q_stop
+ \__color_parse_loop:w #3 ! ! ! ! \s__color_stop
\tl_set:Nx \l__color_internal_tl
{ \l__color_model_tl \c_space_tl \l__color_value_tl }
\exp_args:NNNV \group_end:
\tl_set:Nn #1 \l__color_internal_tl
}
-\cs_new_protected:Npn \__color_parse_loop:w #1 ! #2 ! #3 ! #4 ! #5 \q_stop
+\cs_new_protected:Npn \__color_parse_loop:w #1 ! #2 ! #3 ! #4 ! #5 \s__color_stop
{
\bool_lazy_or:nnF
{ \tl_if_blank_p:n {#1} }
@@ -142,7 +143,7 @@
}
}
\tl_if_blank:nF {#3}
- { \__color_parse_loop:w #3 ! #4 ! #5 \q_stop }
+ { \__color_parse_loop:w #3 ! #4 ! #5 \s__color_stop }
\__color_parse_end:
}
\cs_new_protected:Npn \__color_parse_loop:nn #1#2
@@ -195,53 +196,53 @@
\cs_new:Npn \__color_parse_mix:nNnn #1#2#3#4
{
\use:c { __color_parse_mix_ #2 :nw } {#1}
- #3 \q_mark #4 \q_stop
+ #3 \s__color_mark #4 \s__color_stop
}
-\cs_new:Npn \__color_parse_mix_gray:nw #1#2 \q_mark #3 \q_stop
+\cs_new:Npn \__color_parse_mix_gray:nw #1#2 \s__color_mark #3 \s__color_stop
{ \fp_eval:n { #2 * #1 + #3 * ( 1 - #1 ) } }
\cs_new:Npn \__color_parse_mix_rgb:nw
- #1#2 ~ #3 ~ #4 \q_mark #5 ~ #6 ~ #7 \q_stop
+ #1#2 ~ #3 ~ #4 \s__color_mark #5 ~ #6 ~ #7 \s__color_stop
{
\fp_eval:n { #2 * #1 + #5 * ( 1 - #1 ) } \c_space_tl
\fp_eval:n { #3 * #1 + #6 * ( 1 - #1 ) } \c_space_tl
\fp_eval:n { #4 * #1 + #7 * ( 1 - #1 ) }
}
\cs_new:Npn \__color_parse_mix_cmyk:nw
- #1#2 ~ #3 ~ #4 ~ #5 \q_mark #6 ~ #7 ~ #8 ~ #9 \q_stop
+ #1#2 ~ #3 ~ #4 ~ #5 \s__color_mark #6 ~ #7 ~ #8 ~ #9 \s__color_stop
{
\fp_eval:n { #2 * #1 + #6 * ( 1 - #1 ) } \c_space_tl
\fp_eval:n { #3 * #1 + #7 * ( 1 - #1 ) } \c_space_tl
\fp_eval:n { #4 * #1 + #8 * ( 1 - #1 ) } \c_space_tl
\fp_eval:n { #5 * #1 + #9 * ( 1 - #1 ) }
}
-\cs_new:Npn \__color_parse_model_gray:w #1 , #2 \q_stop { \__color_parse_number:n {#1} }
-\cs_new:Npn \__color_parse_model_rgb:w #1 , #2 , #3 , #4 \q_stop
+\cs_new:Npn \__color_parse_model_gray:w #1 , #2 \s__color_stop { \__color_parse_number:n {#1} }
+\cs_new:Npn \__color_parse_model_rgb:w #1 , #2 , #3 , #4 \s__color_stop
{
\__color_parse_number:n {#1} ~
\__color_parse_number:n {#2} ~
\__color_parse_number:n {#3}
}
-\cs_new:Npn \__color_parse_model_cmyk:w #1 , #2 , #3 , #4 , #5 \q_stop
+\cs_new:Npn \__color_parse_model_cmyk:w #1 , #2 , #3 , #4 , #5 \s__color_stop
{
\__color_parse_number:n {#1} ~
\__color_parse_number:n {#2} ~
\__color_parse_number:n {#3} ~
\__color_parse_number:n {#4}
}
-\cs_new:Npn \__color_parse_model_spot:w #1 , #2 \q_stop
- { \__color_parse_spot_aux:w #1 ! 100 ! \q_stop }
-\cs_new:Npn \__color_parse_spot_aux:w #1 ! #2 ! #3 \q_stop
+\cs_new:Npn \__color_parse_model_spot:w #1 , #2 \s__color_stop
+ { \__color_parse_spot_aux:w #1 ! 100 ! \s__color_stop }
+\cs_new:Npn \__color_parse_spot_aux:w #1 ! #2 ! #3 \s__color_stop
{ #1 ~ \fp_eval:n { #2 / 100 } }
\cs_new:Npn \__color_parse_number:n #1
- { \__color_parse_number:w #1 . 0 . \q_stop }
-\cs_new:Npn \__color_parse_number:w #1 . #2 . #3 \q_stop
+ { \__color_parse_number:w #1 . 0 . \s__color_stop }
+\cs_new:Npn \__color_parse_number:w #1 . #2 . #3 \s__color_stop
{ \tl_if_blank:nTF {#1} { 0 } {#1} . #2 }
\tl_new:N \l_color_fixed_model_tl
\cs_new_protected:Npn \__color_check_model:N #1
{
\tl_if_empty:NF \l_color_fixed_model_tl
{
- \exp_after:wN \__color_check_model:w #1 \q_stop
+ \exp_after:wN \__color_check_model:w #1 \s__color_stop
\tl_if_eq:NNF \l__color_model_tl \l_color_fixed_model_tl
{
\__color_convert:VVN \l__color_model_tl \l_color_fixed_model_tl
@@ -251,7 +252,7 @@
{ \l_color_fixed_model_tl \c_space_tl \l__color_value_tl }
}
}
-\cs_new_protected:Npn \__color_check_model:w #1 ~ #2 \q_stop
+\cs_new_protected:Npn \__color_check_model:w #1 ~ #2 \s__color_stop
{
\tl_set:Nn \l__color_model_tl {#1}
\tl_set:Nn \l__color_value_tl {#2}
@@ -276,7 +277,7 @@
\cs_if_exist:cTF { __color_parse_model_ #1 :w }
{
\tl_set:Nx #3
- { #1 ~ \use:c { __color_parse_model_ #1 :w } #2 , 0 , 0 , 0 , 0 \q_stop }
+ { #1 ~ \use:c { __color_parse_model_ #1 :w } #2 , 0 , 0 , 0 , 0 \s__color_stop }
\__color_check_model:N #3
}
{
@@ -331,21 +332,21 @@
{#1}
{
\__color_if_defined:nTF {#1}
- { \exp_last_unbraced:Nv \__color_show:w { l__color_named_ #1 _tl } \q_stop }
+ { \exp_last_unbraced:Nv \__color_show:w { l__color_named_ #1 _tl } \s__color_stop }
{ }
}
{ }
{ }
}
-\cs_new:Npn \__color_show:w #1 ~ #2 \q_stop
+\cs_new:Npn \__color_show:w #1 ~ #2 \s__color_stop
{
\msg_show_item_unbraced:nn { model } {#1}
\exp_args:Nnf \msg_show_item_unbraced:nn { value }
- { \use:c { __color_show_ #1 :w } #2 \q_stop }
+ { \use:c { __color_show_ #1 :w } #2 \s__color_stop }
}
-\cs_new:Npn \__color_show_gray:w #1 \q_stop { #1 }
-\cs_new:Npn \__color_show_rgb:w #1 ~ #2 ~ #3 \q_stop { #1 ,~ #2 ,~ #3 }
-\cs_new:Npn \__color_show_cmyk:w #1 ~ #2 ~ #3 ~ #4 \q_stop { #1 ,~ #2 ,~ #3 ,~ #4 }
+\cs_new:Npn \__color_show_gray:w #1 \s__color_stop { #1 }
+\cs_new:Npn \__color_show_rgb:w #1 ~ #2 ~ #3 \s__color_stop { #1 ,~ #2 ,~ #3 }
+\cs_new:Npn \__color_show_cmyk:w #1 ~ #2 ~ #3 ~ #4 \s__color_stop { #1 ,~ #2 ,~ #3 ,~ #4 }
\__kernel_msg_new:nnnn { color } { invalid-model }
{ Invalid~color~model~'#1'. }
{
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
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3graphics/l3graphics.sty b/Master/texmf-dist/tex/latex/l3experimental/l3graphics/l3graphics.sty
index 5853a577cb5..35752a1defe 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3graphics/l3graphics.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3graphics/l3graphics.sty
@@ -20,10 +20,11 @@
%%
%% File: l3graphics.dtx
\RequirePackage{expl3}
-\ProvidesExplPackage{l3graphics}{2020-01-12}{}
+\ProvidesExplPackage{l3graphics}{2020-05-18}{}
{L3 Experimental graphics inclusion support}
\ior_new:N \l__graphics_tmp_ior
\tl_new:N \l__graphics_tmp_tl
+\scan_new:N \s__graphics_stop
\tl_new:N \l_graphics_decodearray_tl
\tl_new:N \l_graphics_pagebox_tl
\bool_new:N \l_graphics_interpolate_bool
@@ -108,7 +109,7 @@
\ior_str_map_inline:Nn \exp_not:N \l__graphics_tmp_ior
{
\exp_not:N \__graphics_read_bb_auxiii:w
- ##1 ~ \c_colon_str \exp_not:N \q_stop
+ ##1 ~ \c_colon_str \s__graphics_stop
}
}
\exp_not:n
@@ -125,15 +126,15 @@
\use:x
{
\cs_new_protected:Npn \exp_not:N \__graphics_read_bb_auxiii:w
- ##1 \c_colon_str ##2 \exp_not:N \q_stop
+ ##1 \c_colon_str ##2 \s__graphics_stop
{
\exp_not:N \str_if_eq:nnT
{ \c_percent_str \c_percent_str BoundingBox }
{##1}
- { \exp_not:N \__graphics_read_bb_auxiv:w ##2 ( ) \exp_not:N \q_stop }
+ { \exp_not:N \__graphics_read_bb_auxiv:w ##2 ( ) \s__graphics_stop }
}
}
-\cs_new_protected:Npn \__graphics_read_bb_auxiv:w #1 ( #2 ) #3 \q_stop
+\cs_new_protected:Npn \__graphics_read_bb_auxiv:w #1 ( #2 ) #3 \s__graphics_stop
{
\str_if_eq:nnF {#2} { atend }
{
@@ -143,10 +144,10 @@
\char_set_catcode_space:n { 32 }
}
{ \use:n #1 }
- \exp_after:wN \__graphics_read_bb_auxv:w \l__graphics_tmp_tl \q_stop
+ \exp_after:wN \__graphics_read_bb_auxv:w \l__graphics_tmp_tl \s__graphics_stop
}
}
-\cs_new_protected:Npn \__graphics_read_bb_auxv:w #1~#2~#3~#4~#5 \q_stop
+\cs_new_protected:Npn \__graphics_read_bb_auxv:w #1~#2~#3~#4~#5 \s__graphics_stop
{
\dim_set:Nn \l_graphics_llx_dim { #1 bp }
\dim_set:Nn \l_graphics_lly_dim { #2 bp }
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3pdf/l3pdf.sty b/Master/texmf-dist/tex/latex/l3experimental/l3pdf/l3pdf.sty
index 5341cb87805..e60cfed9fbf 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3pdf/l3pdf.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3pdf/l3pdf.sty
@@ -20,8 +20,9 @@
%%
%% File: l3pdf.dtx
\RequirePackage{expl3}
-\ProvidesExplPackage{l3pdf}{2020-01-12}{}
+\ProvidesExplPackage{l3pdf}{2020-05-18}{}
{L3 Experimental core PDF support}
+\scan_new:N \s__pdf_stop
\bool_new:N \g__pdf_init_bool
\cs_if_exist:NT \documentclass
{
@@ -38,6 +39,12 @@
}
\cs_new_protected:Npn \pdf_object_new:nn #1#2
{ \__pdf_backend_object_new:nn {#1} {#2} }
+\prg_new_conditional:Npnn \pdf_object_if_exist:n #1 { p , T , F , TF }
+ {
+ \int_if_exist:cTF { c__pdf_backend_object_ \tl_to_str:n {#1} _int }
+ { \prg_return_true: }
+ { \prg_return_false:}
+ }
\cs_new_protected:Npn \pdf_object_write:nn #1#2
{ \__pdf_backend_object_write:nn {#1} {#2} }
\cs_generate_variant:Nn \pdf_object_write:nn { nx }
@@ -47,8 +54,8 @@
\cs_generate_variant:Nn \pdf_object_now:nn { nx }
\cs_new:Npn \pdf_object_last: { \__pdf_backend_object_last: }
\prg_new_conditional:Npnn \pdf_version_compare:Nn #1#2 { p , T , F , TF }
- { \use:c { __pdf_version_compare_ #1 :w } #2 . . \q_stop }
-\cs_new:cpn { __pdf_version_compare_=:w } #1 . #2 . #3 \q_stop
+ { \use:c { __pdf_version_compare_ #1 :w } #2 . . \s__pdf_stop }
+\cs_new:cpn { __pdf_version_compare_=:w } #1 . #2 . #3 \s__pdf_stop
{
\bool_lazy_and:nnTF
{ \int_compare_p:nNn \__pdf_backend_version_major: = {#1} }
@@ -56,7 +63,7 @@
{ \prg_return_true: }
{ \prg_return_false: }
}
-\cs_new:cpn { __pdf_version_compare_<:w } #1 . #2 . #3 \q_stop
+\cs_new:cpn { __pdf_version_compare_<:w } #1 . #2 . #3 \s__pdf_stop
{
\bool_lazy_or:nnTF
{ \int_compare_p:nNn \__pdf_backend_version_major: < {#1} }
@@ -68,7 +75,7 @@
{ \prg_return_true: }
{ \prg_return_false: }
}
-\cs_new:cpn { __pdf_version_compare_>:w } #1 . #2 . #3 \q_stop
+\cs_new:cpn { __pdf_version_compare_>:w } #1 . #2 . #3 \s__pdf_stop
{
\bool_lazy_or:nnTF
{ \int_compare_p:nNn \__pdf_backend_version_major: > {#1} }
@@ -81,13 +88,13 @@
{ \prg_return_false: }
}
\cs_new_protected:Npn \pdf_version_gset:n #1
- { \__pdf_version_gset:w #1 . . \q_stop }
+ { \__pdf_version_gset:w #1 . . \s__pdf_stop }
\cs_new_protected:Npn \pdf_version_min_gset:n #1
{
\pdf_version_compare:NnT < {#1}
- { \__pdf_version_gset:w #1 . . \q_stop }
+ { \__pdf_version_gset:w #1 . . \s__pdf_stop }
}
-\cs_new_protected:Npn \__pdf_version_gset:w #1 . #2 . #3\q_stop
+\cs_new_protected:Npn \__pdf_version_gset:w #1 . #2 . #3\s__pdf_stop
{
\bool_if:NF \g__pdf_init_bool
{
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty
index 2d974506bf6..90025ff46e5 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty
@@ -20,7 +20,7 @@
%%
%% File: l3str-format.dtx
\RequirePackage{expl3}
-\ProvidesExplPackage{l3str-format}{2020-01-12}{}
+\ProvidesExplPackage{l3str-format}{2020-05-18}{}
{L3 Experimental string formatting}
\cs_generate_variant:Nn \use:nn { nf }
\cs_generate_variant:Nn \use:nnn { fnf }
@@ -30,7 +30,7 @@
\if_int_compare:w 9 < 1 #1 \exp_stop_f:
\prg_return_true: \else: \prg_return_false: \fi:
}
-\cs_new:Npn \__str_format_put:nw #1 #2 \s_stop { #2 \s_stop #1 }
+\cs_new:Npn \__str_format_put:nw #1 #2 \s__str_stop { #2 \s__str_stop #1 }
\cs_generate_variant:Nn \__str_format_put:nw { o , f }
\prg_new_conditional:Npnn \__str_format_if_in:nN #1#2 { TF }
{
@@ -49,7 +49,7 @@
\cs_new:Npn \__str_format_parse:n #1
{
\exp_last_unbraced:Nf \__str_format_parse_auxi:NN
- { \__kernel_str_to_other:n {#1} } \s_stop \s_stop {#1}
+ { \__kernel_str_to_other:n {#1} } \s__str_stop \s__str_stop {#1}
}
\cs_new:Npx \__str_format_parse_auxi:NN #1#2
{
@@ -94,11 +94,11 @@
}
\cs_new:Npn \__str_format_parse_auxvii:nN #1#2
{
- \token_if_eq_meaning:NNTF \s_stop #2
+ \token_if_eq_meaning:NNTF \s__str_stop #2
{ \__str_format_parse_end:nwn { #1 ? } #2 }
{ \__str_format_parse_end:nwn { #1 #2 } }
}
-\cs_new:Npn \__str_format_parse_end:nwn #1 #2 \s_stop \s_stop #3
+\cs_new:Npn \__str_format_parse_end:nwn #1 #2 \s__str_stop \s__str_stop #3
{
\tl_if_empty:nF {#2}
{ \__kernel_msg_expandable_error:nnn { str } { invalid-format } {#3} }
@@ -195,7 +195,7 @@
}
}
\__str_format_tl_s:NNnnNNn
- \s_stop
+ \s__str_stop
}
\cs_new:Npn \__str_format_tl_s:NNnnNNn #1#2#3#4#5#6#7
{
@@ -275,9 +275,9 @@
{ str } { invalid-style-format } {#6} { int }
\__str_format_int:NwnnNNn \use:n
}
- \s_stop {#7}
+ \s__str_stop {#7}
}
-\cs_new:Npn \__str_format_int:NwnnNNn #1#2 \s_stop #3#4#5#6#7
+\cs_new:Npn \__str_format_int:NwnnNNn #1#2 \s__str_stop #3#4#5#6#7
{
\exp_args:Nc \exp_args:Nf
{ __str_format_align_#6:nnnN }
@@ -332,10 +332,10 @@
{ str } { invalid-style-format } {#6} { fp }
\__str_format_fp:wnnnNNn \__str_format_fp_g:nn
}
- \s_stop {#7}
+ \s__str_stop {#7}
}
\cs_new:Npn \__str_format_fp:wnnnNNn
- #1 \s_stop #2 #3 #4 #5#6 #7
+ #1 \s__str_stop #2 #3 #4 #5#6 #7
{
\exp_args:Nc \exp_args:Nf
{ __str_format_align_#6:nnnN }
@@ -377,7 +377,7 @@
{ \prg_replicate:nn { #4 - \c__fp_prec_int + 1 } { 0 } }
\__str_format_put:nw { #1 . #2 }
}
- \use_none:n \s_stop
+ \use_none:n \s__str_stop
}
\cs_new:Npn \__str_format_fp_f:nn #1#2
{
@@ -431,11 +431,11 @@
\cs_new:Npn \__str_format_fp_trim:w #1 e
{
\__str_format_fp_trim_loop:w #1
- ; \__str_format_fp_trim_loop:w 0; \__str_format_fp_trim_dot:w .; \s_stop e
+ ; \__str_format_fp_trim_loop:w 0; \__str_format_fp_trim_dot:w .; \s__str_stop e
}
\cs_new:Npn \__str_format_fp_trim_loop:w #1 0; #2 { #2 #1 ; #2 }
\cs_new:Npn \__str_format_fp_trim_dot:w #1 .; { \__str_format_fp_trim_end:w #1 ; }
-\cs_new:Npn \__str_format_fp_trim_end:w #1 ; #2 \s_stop { #1 }
+\cs_new:Npn \__str_format_fp_trim_end:w #1 ; #2 \s__str_stop { #1 }
\__kernel_msg_new:nnn { str } { invalid-format }
{ Invalid~format~'#1'. }
\__kernel_msg_new:nnn { str } { invalid-align-format }
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3sys-shell/l3sys-shell.sty b/Master/texmf-dist/tex/latex/l3experimental/l3sys-shell/l3sys-shell.sty
index 3bbd279c109..eb2f53c68e9 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3sys-shell/l3sys-shell.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3sys-shell/l3sys-shell.sty
@@ -20,24 +20,27 @@
%%
%% File: l3sys-shell.dtx
\RequirePackage{expl3}
-\ProvidesExplPackage{l3sys-shell}{2020-01-12}{}
+\ProvidesExplPackage{l3sys-shell}{2020-05-18}{}
{L3 Experimental system shell functions}
+\scan_new:N \s__sys_stop
+\quark_new:N \q__sys_nil
+\__kernel_quark_new_conditional:Nn \__sys_quark_if_nil:N { F }
\cs_new:Npn \__sys_path_to_win:n #1
{
- \exp_after:wN \__sys_path_to_win:w \tl_to_str:n {#1} ~ \q_stop
+ \exp_after:wN \__sys_path_to_win:w \tl_to_str:n {#1} ~ \s__sys_stop
}
-\cs_new:Npn \__sys_path_to_win:w #1 ~ #2 \q_stop
+\cs_new:Npn \__sys_path_to_win:w #1 ~ #2 \s__sys_stop
{
- \__sys_path_to_win:N #1 \q_nil
+ \__sys_path_to_win:N #1 \q__sys_nil
\tl_if_empty:nF {#2}
{
\c_space_tl
- \__sys_path_to_win:w #2 \q_stop
+ \__sys_path_to_win:w #2 \s__sys_stop
}
}
\cs_new:Npn \__sys_path_to_win:N #1
{
- \quark_if_nil:NF #1
+ \__sys_quark_if_nil:NF #1
{
\token_if_eq_meaning:NNTF #1 /
{ \c_backslash_str }
diff --git a/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty b/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty
index 92485efab50..e3c873bbf9b 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty
@@ -20,7 +20,7 @@
%%
%% File: xcoffins.dtx
\RequirePackage{xparse}
-\ProvidesExplPackage{xcoffins}{2020-01-12}{}
+\ProvidesExplPackage{xcoffins}{2020-05-18}{}
{L3 Experimental design level coffins}
\keys_define:nn { coffin }
{
diff --git a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
index dbedd8ac3d9..d2811198790 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
@@ -32,7 +32,7 @@
}%
\endinput
}
-\ProvidesExplPackage{l3galley}{2020-01-12}{}
+\ProvidesExplPackage{l3galley}{2020-05-18}{}
{L3 Experimental galley code}
\int_new:N \l__galley_tmp_int
\seq_new:N \g__galley_tmpa_seq
diff --git a/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty b/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty
index e025cc69497..2812635e380 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty
@@ -20,7 +20,7 @@
%%
%% File: xgalley.dtx
\RequirePackage{xparse}
-\ProvidesExplPackage{xgalley}{2020-01-12}{}
+\ProvidesExplPackage{xgalley}{2020-05-18}{}
{L3 Experimental galley}
\RequirePackage{xparse,xtemplate,l3galley}
\clist_new:N \l__galley_tmpa_clist