l3 (18jun20)

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

11 files changed, 61 insertions, 66 deletions

diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3benchmark/l3benchmark.sty b/Master/texmf-dist/tex/latex/l3experimental/l3benchmark/l3benchmark.sty
index 460e957494e..8cfd64a9f3c 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-06-03}{}
+\ProvidesExplPackage{l3benchmark}{2020-06-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 fb13a807d29..05010d629cf 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-06-03}{}
+\ProvidesExplPackage{l3cctab}{2020-06-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 86ebda3e33e..5020a57c4dd 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3color/l3color.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3color/l3color.sty
@@ -20,7 +20,7 @@
 %% 
 %% File: l3color.dtx
 \RequirePackage{expl3}
-\ProvidesExplPackage{l3color}{2020-06-03}{}
+\ProvidesExplPackage{l3color}{2020-06-18}{}
   {L3 Experimental color support}
 \tl_new:N \l__color_internal_tl
 \scan_new:N \s__color_mark
@@ -33,13 +33,13 @@
 \cs_new_protected:Npn \__color_extract:nNN #1#2#3
   {
     \exp_after:wN \exp_after:wN \exp_after:wN
-      \__color_extract:NNw
+      \__color_extract:NNnn
       \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: \s__color_stop
+        \cs:w l__color_named_ #1 _tl \cs_end:
   }
 \cs_generate_variant:Nn \__color_extract:nNN { V }
-\cs_new_protected:Npn \__color_extract:NNw #1#2 #3 ~ #4 \s__color_stop
+\cs_new_protected:Npn \__color_extract:NNnn #1#2#3#4
   {
     \tl_set:Nn #1 {#3}
     \tl_set:Nn #2 {#4}
@@ -117,7 +117,7 @@
       \__color_extract:nNN {#2} \l__color_model_tl \l__color_value_tl
       \__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 }
+        { { \l__color_model_tl } { \l__color_value_tl } }
     \exp_args:NNNV \group_end:
     \tl_set:Nn #1 \l__color_internal_tl
   }
@@ -216,26 +216,30 @@
     \fp_eval:n { #5 * #1 + #9 * ( 1 - #1 ) }
   }
 \cs_new:Npn \__color_parse_model_gray:w #1 , #2 \s__color_stop
-  { gray ~ \__color_parse_number:n {#1} }
+  { { gray } { \__color_parse_number:n {#1} } }
 \cs_new:Npn \__color_parse_model_rgb:w #1 , #2 , #3 , #4 \s__color_stop
   {
-    rgb ~
-    \__color_parse_number:n {#1} ~
-    \__color_parse_number:n {#2} ~
-    \__color_parse_number:n {#3}
+    { rgb }
+    {
+      \__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 \s__color_stop
   {
-    cmyk ~
-    \__color_parse_number:n {#1} ~
-    \__color_parse_number:n {#2} ~
-    \__color_parse_number:n {#3} ~
-    \__color_parse_number:n {#4}
+    { cmyk }
+    {
+      \__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 \s__color_stop
   {
-    spot ~
-    \__color_parse_spot_aux:w #1 ! 100 ! \s__color_stop
+    { spot }
+    { \__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 } }
@@ -250,9 +254,11 @@
   }
 \cs_new:Npn \__color_parse_model_hsb:nnn #1#2#3
   {
-    rgb ~
-    \exp_args:Ne \__color_parse_model_hsb_aux:nnn
-      { \fp_eval:n { 6 * #1 } } {#2} {#3}
+    { rgb }
+    {
+      \exp_args:Ne \__color_parse_model_hsb_aux:nnn
+        { \fp_eval:n { 6 * #1 } } {#2} {#3}
+    }
   }
 \cs_new:Npn \__color_parse_model_hsb_aux:nnn #1#2#3
   {
@@ -292,34 +298,38 @@
   { \__color_parse_model_HTML_aux:w #1 0 0 0 0 0 0 \s__color_stop }
 \cs_new:Npn \__color_parse_model_HTML_aux:w #1#2#3#4#5#6#7 \s__color_stop
   {
-    rgb ~
-    \fp_eval:n { round(\int_from_hex:n {#1#2} / 255,5) } ~
-    \fp_eval:n { round(\int_from_hex:n {#3#4} / 255,5) } ~
-    \fp_eval:n { round(\int_from_hex:n {#5#6} / 255,5) }
+    { rgb }
+    {
+      \fp_eval:n { round(\int_from_hex:n {#1#2} / 255,5) } ~
+      \fp_eval:n { round(\int_from_hex:n {#3#4} / 255,5) } ~
+      \fp_eval:n { round(\int_from_hex:n {#5#6} / 255,5) }
+    }
   }
 \cs_new:Npn \__color_parse_model_RGB:w #1 , #2 , #3 , #4 \s__color_stop
   {
-    rgb ~
-    \fp_eval:n { round(#1 / 255,5) } ~
-    \fp_eval:n { round(#2 / 255,5) } ~
-    \fp_eval:n { round(#3 / 255,5) }
+    { rgb }
+    {
+      \fp_eval:n { round(#1 / 255,5) } ~
+      \fp_eval:n { round(#2 / 255,5) } ~
+      \fp_eval:n { round(#3 / 255,5) }
+    }
   }
 \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 \s__color_stop
+        \exp_after:wN \__color_check_model:nn #1
         \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
               \l__color_value_tl
           }
         \tl_set:Nx #1
-          { \l_color_fixed_model_tl \c_space_tl \l__color_value_tl }
+          { { \l_color_fixed_model_tl } { \l__color_value_tl } }
       }
   }
-\cs_new_protected:Npn \__color_check_model:w #1 ~ #2 \s__color_stop
+\cs_new_protected:Npn \__color_check_model:nn #1#2
   {
     \tl_set:Nn \l__color_model_tl {#1}
     \tl_set:Nn \l__color_value_tl {#2}
@@ -327,7 +337,7 @@
 \cs_new_protected:Npn \__color_select:
   {
     \tl_set_eq:cN { l__color_named_ . _tl } \l__color_current_tl
-    \__color_select:V \l__color_current_tl
+    \__color_select:N \l__color_current_tl
   }
 \cs_new_protected:Npn \color_select:n #1
   {
@@ -344,7 +354,7 @@
     \cs_if_exist:cTF { __color_parse_model_ #1 :w }
       {
         \tl_set:Nx #3
-          { \use:c {  __color_parse_model_ #1 :w } #2 , 0 , 0 , 0 , 0 \s__color_stop }
+          { \use:c { __color_parse_model_ #1 :w } #2 , 0 , 0 , 0 , 0 \s__color_stop }
         \__color_check_model:N #3
       }
       {
@@ -399,21 +409,17 @@
       {#1}
       {
         \__color_if_defined:nTF {#1}
-          { \exp_last_unbraced:Nv \__color_show:w { l__color_named_ #1 _tl } \s__color_stop }
+          { \exp_last_unbraced:Nv \__color_show:nn { l__color_named_ #1 _tl } }
           { }
       }
       { }
       { }
   }
-\cs_new:Npn \__color_show:w #1 ~ #2 \s__color_stop
+\cs_new:Npn \__color_show:nn #1#2
   {
     \msg_show_item_unbraced:nn { model } {#1}
-    \exp_args:Nnf \msg_show_item_unbraced:nn { value }
-      { \use:c { __color_show_ #1 :w } #2 \s__color_stop }
+    \msg_show_item_unbraced:nn { value } {#2}
   }
-\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 } { unknown-color }
   { Unknown~color~'#1'. }
   {
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty b/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty
index 76faead77f0..8c812a5529c 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty
@@ -28,7 +28,7 @@
 %% 
 %% File: l3draw.dtx
 \RequirePackage{expl3}
-\ProvidesExplPackage{l3draw}{2020-06-03}{}
+\ProvidesExplPackage{l3draw}{2020-06-18}{}
   {L3 Experimental core drawing support}
 \RequirePackage { l3color }
 \scan_new:N \s__draw_mark
@@ -1677,7 +1677,7 @@
   }
 \seq_new:N \l__draw_tmp_seq
 \cs_new_protected:Npn \draw_miterlimit:n #1
-  { \__draw_backend_miterlimit:n { \fp_eval:n {#1} } }
+  { \exp_args:Nx \__draw_backend_miterlimit:n { \fp_eval:n {#1} } }
 \cs_new_protected:Npn \draw_cap_butt: { \__draw_backend_cap_butt: }
 \cs_new_protected:Npn \draw_cap_rectangle: { \__draw_backend_cap_rectangle: }
 \cs_new_protected:Npn \draw_cap_round: { \__draw_backend_cap_round: }
@@ -1695,21 +1695,10 @@
 \cs_new_protected:Npn \__draw_color:nn #1#2
   {
     \color_parse:nN {#2} \l__draw_color_tmp_tl
-    \__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 \s__draw_stop }
-\cs_generate_variant:Nn \__draw_color_aux:nn { V }
-\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 \s__draw_stop
-  { \use:c { __draw_backend_color_ #1 _gray:n } {#2} }
-\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 \s__draw_stop
-  { \use:c { __draw_backend_color_ #1 _spot:nn } {#2} {#3} }
+    \exp_after:wN \__draw_color:nnn \l__draw_color_tmp_tl {#1}
+  }
+\cs_new_protected:Npn \__draw_color:nnn #1#2#3
+  { \use:c { __draw_backend_color_ #3 _ #1 :n } {#2} }
 %% File: l3draw-transforms.dtx
 \bool_new:N \l__draw_matrix_active_bool
 \fp_new:N \l__draw_matrix_a_fp
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3graphics/l3graphics.sty b/Master/texmf-dist/tex/latex/l3experimental/l3graphics/l3graphics.sty
index 807a3339bf7..1b43f2d5701 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3graphics/l3graphics.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3graphics/l3graphics.sty
@@ -20,7 +20,7 @@
 %% 
 %% File: l3graphics.dtx
 \RequirePackage{expl3}
-\ProvidesExplPackage{l3graphics}{2020-06-03}{}
+\ProvidesExplPackage{l3graphics}{2020-06-18}{}
   {L3 Experimental graphics inclusion support}
 \ior_new:N \l__graphics_tmp_ior
 \tl_new:N  \l__graphics_tmp_tl
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3pdf/l3pdf.sty b/Master/texmf-dist/tex/latex/l3experimental/l3pdf/l3pdf.sty
index 255f388a75f..937f0a65c35 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3pdf/l3pdf.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3pdf/l3pdf.sty
@@ -20,7 +20,7 @@
 %% 
 %% File: l3pdf.dtx
 \RequirePackage{expl3}
-\ProvidesExplPackage{l3pdf}{2020-06-03}{}
+\ProvidesExplPackage{l3pdf}{2020-06-18}{}
   {L3 Experimental core PDF support}
 \scan_new:N \s__pdf_stop
 \bool_new:N \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 a0b0da8da52..444c8280fcd 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-06-03}{}
+\ProvidesExplPackage{l3str-format}{2020-06-18}{}
   {L3 Experimental string formatting}
 \cs_generate_variant:Nn \use:nn { nf }
 \cs_generate_variant:Nn \use:nnn { fnf }
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 92c47b4066a..53e0ebf675b 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,7 +20,7 @@
 %% 
 %% File: l3sys-shell.dtx
 \RequirePackage{expl3}
-\ProvidesExplPackage{l3sys-shell}{2020-06-03}{}
+\ProvidesExplPackage{l3sys-shell}{2020-06-18}{}
   {L3 Experimental system shell functions}
 \scan_new:N \s__sys_stop
 \quark_new:N \q__sys_nil
diff --git a/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty b/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty
index af5f8feeb48..d87a6c8fc7e 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-06-03}{}
+\ProvidesExplPackage{xcoffins}{2020-06-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 7de602702be..00729fb634f 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-06-03}{}
+\ProvidesExplPackage{l3galley}{2020-06-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 8b61537746d..ef965f138dd 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-06-03}{}
+\ProvidesExplPackage{xgalley}{2020-06-18}{}
   {L3 Experimental galley}
 \RequirePackage{xparse,xtemplate,l3galley}
 \clist_new:N \l__galley_tmpa_clist