l3 (13may18)

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

7 files changed, 36 insertions, 36 deletions

diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3color/l3color.sty b/Master/texmf-dist/tex/latex/l3experimental/l3color/l3color.sty
index f7dbbcc9d9c..2c6a256c808 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 Copyright(C) 2017-2018 The LaTeX3 Project
 \RequirePackage{expl3}
-\ProvidesExplPackage{l3color}{2018-04-30}{}
+\ProvidesExplPackage{l3color}{2018-05-12}{}
   {L3 Experimental color support}
 \tl_new:N \l__color_tmp_tl
 \prg_new_conditional:Npnn \__color_if_defined:n #1 { T, F, TF }
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty b/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty
index f991619ccc9..a10b21221ac 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty
@@ -27,7 +27,7 @@
 %% 
 %% File: l3draw.dtx Copyright(C) 2018 The LaTeX3 Project
 \RequirePackage{expl3}
-\ProvidesExplPackage{l3draw}{2018-04-30}{}
+\ProvidesExplPackage{l3draw}{2018-05-12}{}
   {L3 Experimental core drawing support}
 \RequirePackage { l3color }
 %% File: l3draw-boxes.dtx Copyright(C) 2018 The LaTeX3 Project
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-convert.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-convert.sty
index e2a1f762f08..e56a46d4da1 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-convert.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-convert.sty
@@ -20,7 +20,7 @@
 %% 
 %% File: l3str-convert.dtx Copyright (C) 2013-2018 The LaTeX3 Project
 \RequirePackage{expl3}
-\ProvidesExplPackage{l3str-convert}{2018-04-30}{}
+\ProvidesExplPackage{l3str-convert}{2018-05-12}{}
   {L3 Experimental string encoding conversions}
 \cs_if_exist:NF \use_ii_i:nn
   { \cs_new:Npn \use_ii_i:nn #1#2 { #2 #1 } }
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 d23bafdc9a2..ddb42af9343 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 Copyright (C) 2012-2018 The LaTeX3 Project
 \RequirePackage{expl3}
-\ProvidesExplPackage{l3str-format}{2018-04-30}{}
+\ProvidesExplPackage{l3str-format}{2018-05-12}{}
   {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/xcoffins/xcoffins.sty b/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty
index 55155b60800..7dc752d1b07 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 Copyright(C) 2010-2012,2014,2016-2018 The LaTeX3 Project
 \RequirePackage{xparse}
-\ProvidesExplPackage{xcoffins}{2018-04-30}{}
+\ProvidesExplPackage{xcoffins}{2018-05-12}{}
   {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 5b7b539bd92..8842c475e02 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
@@ -33,7 +33,7 @@
       }%
     \endinput
   }
-\ProvidesExplPackage{l3galley}{2018-04-30}{}
+\ProvidesExplPackage{l3galley}{2018-05-12}{}
   {L3 Experimental galley code}
 \int_new:N \l__galley_tmp_int
 \seq_new:N \g__galley_tmpa_seq
@@ -87,7 +87,7 @@
 \int_new:N \l__galley_group_level_int
 \cs_new_protected:Npn \__galley_initialise_variables:
   {
-    \int_set:Nn \l__galley_group_level_int { \etex_currentgrouplevel:D }
+    \int_set:Nn \l__galley_group_level_int { \tex_currentgrouplevel:D }
     \bool_gset_true:N \g__galley_begin_level_bool
     \bool_gset_false:N \g__galley_cutout_active_bool
     \seq_gclear:N \g__galley_cutout_left_seq
@@ -263,7 +263,7 @@
           }
         \__galley_parshape_set:
       }
-    \int_compare:nNnT \l__galley_group_level_int = \etex_currentgrouplevel:D
+    \int_compare:nNnT \l__galley_group_level_int = \tex_currentgrouplevel:D
       {
         \bool_lazy_and:nnT
           { \seq_if_empty_p:N \g__galley_cutout_left_seq }
@@ -664,8 +664,8 @@
       { \galley_vspace_set_single:n {#1} }
       {
         \dim_compare:nNnT
-          { \etex_glueexpr:D \g__galley_interpar_vspace_user_tl }
-            < { \etex_glueexpr:D (#1) \scan_stop: }
+          { \tex_glueexpr:D \g__galley_interpar_vspace_user_tl }
+            < { \tex_glueexpr:D (#1) \scan_stop: }
           { \galley_vspace_set_single:n {#1} }
       }
   }
@@ -677,7 +677,7 @@
 \dim_new:N \l_galley_par_begin_skip
 \cs_new_eq:NN \l_galley_par_end_skip   \tex_parfillskip:D
 \cs_new_eq:NN \l_galley_par_indent_dim \tex_parindent:D
-\cs_new_eq:NN \l_galley_last_line_fit_int \etex_lastlinefit:D
+\cs_new_eq:NN \l_galley_last_line_fit_int \tex_lastlinefit:D
 \cs_new_protected:Npn \galley_interword_spacing_set:N #1
   {
     \bool_if:NTF #1
@@ -727,7 +727,7 @@
 \clist_new:N \l_galley_line_penalties_clist
 \cs_new_protected:Npn \galley_display_widow_penalties_set:n #1
   {
-    \etex_displaywidowpenalties:D
+    \tex_displaywidowpenalties:D
       \int_eval:n { \clist_count:n {#1} + 1 } \exp_stop_f:
       \clist_map_function:nN {#1} \__galley_set_aux:n
       0 \exp_stop_f:
@@ -735,7 +735,7 @@
 \cs_generate_variant:Nn \galley_display_widow_penalties_set:n { V , v }
 \cs_new_protected:Npn \galley_widow_penalties_set:n #1
   {
-    \etex_widowpenalties:D
+    \tex_widowpenalties:D
       \int_eval:n { \clist_count:n {#1} + 1 } \exp_stop_f:
       \clist_map_function:nN {#1} \__galley_set_aux:n
       0 \exp_stop_f:
@@ -756,7 +756,7 @@
 \cs_generate_variant:Nn \galley_interline_penalties_set:n { V , v }
 \cs_new_protected:Npn \galley_display_club_penalties_set:n #1
   {
-    \etex_clubpenalties:D
+    \tex_clubpenalties:D
       \int_eval:n { \clist_count:n {#1} + 1 } \exp_stop_f:
       \clist_map_function:nN {#1} \__galley_set_aux:n
       0 \exp_stop_f:
@@ -765,9 +765,9 @@
 \cs_generate_variant:Nn \galley_display_club_penalties_set:n { V , v }
 \cs_new_protected:Npn \galley_interline_penalty_set:n #1
   {
-    \int_compare:nNnTF { \etex_interlinepenalties:D 0 } = 0
+    \int_compare:nNnTF { \tex_interlinepenalties:D 0 } = 0
       {
-        \etex_interlinepenalties:D 1 = \int_eval:n {#1} \exp_stop_f:
+        \tex_interlinepenalties:D 1 = \int_eval:n {#1} \exp_stop_f:
         \__galley_calc_interline_penalties:
       }
       {
@@ -775,8 +775,8 @@
           {
             \int_eval:n
               {
-                \etex_interlinepenalties:D ##1
-                - \etex_interlinepenalties:D \etex_interlinepenalties:D 0
+                \tex_interlinepenalties:D ##1
+                - \tex_interlinepenalties:D \tex_interlinepenalties:D 0
                 + #1
               }
               \exp_stop_f:
@@ -787,16 +787,16 @@
   }
 \cs_new_protected:Npn \__galley_set_interline_penalty:nn #1#2
   {
-    \etex_interlinepenalties:D
-      \etex_interlinepenalties:D 0 \exp_stop_f:
+    \tex_interlinepenalties:D
+      \tex_interlinepenalties:D 0 \exp_stop_f:
       \int_step_function:nN {#1}
         \__galley_set_interline_penalty_auxi:n
-      \int_step_function:nnN { #1 + 1 } { \etex_interlinepenalties:D 0 - 1 }
+      \int_step_function:nnN { #1 + 1 } { \tex_interlinepenalties:D 0 - 1 }
         \__galley_set_interline_penalty_auxii:n
       \int_eval:n {#2} \exp_stop_f:
   }
 \cs_new:Npn \__galley_set_interline_penalty_auxi:n #1
-  { \etex_interlinepenalties:D \int_eval:n {#1} \exp_stop_f: }
+  { \tex_interlinepenalties:D \int_eval:n {#1} \exp_stop_f: }
 \cs_new:Npn \__galley_set_interline_penalty_auxii:n #1 { }
 \cs_new_protected:Npn \__galley_calc_interline_penalties:
   {
@@ -807,19 +807,19 @@
           {
             \int_max:nn
               { \clist_count:N \l_galley_line_penalties_clist + 1 }
-              { \etex_clubpenalties:D 0 }
+              { \tex_clubpenalties:D 0 }
           }
       }
       { \clist_count:N \l_galley_line_penalties_clist }
   }
 \cs_new_protected:Npn \__galley_calc_interline_penalties:nn #1#2
   {
-    \etex_interlinepenalties:D #1 ~
+    \tex_interlinepenalties:D #1 ~
       \int_step_function:nN {#2}
         \__galley_calc_interline_penalties_auxi:n
       \int_step_function:nnN { #2 + 1 } { #1 - 1 }
         \__galley_calc_interline_penalties_auxii:n
-      \etex_interlinepenalties:D \etex_interlinepenalties:D 0 \exp_stop_f:
+      \tex_interlinepenalties:D \tex_interlinepenalties:D 0 \exp_stop_f:
   }
 \cs_new:Npn \__galley_calc_interline_penalties_auxi:n #1
   {
@@ -827,7 +827,7 @@
       {
         \clist_item:Nn \l_galley_line_penalties_clist {#1}
         + 0 \clist_item:Nn \l_galley_club_penalties_clist {#1}
-        - \etex_clubpenalties:D #1 ~
+        - \tex_clubpenalties:D #1 ~
       }
       \exp_stop_f:
   }
@@ -835,9 +835,9 @@
   {
     \int_eval:n
       {
-        \etex_interlinepenalties:D \etex_interlinepenalties:D 0 \exp_stop_f:
+        \tex_interlinepenalties:D \tex_interlinepenalties:D 0 \exp_stop_f:
         + 0 \clist_item:Nn \l_galley_club_penalties_clist {#1}
-        - \etex_clubpenalties:D #1 ~
+        - \tex_clubpenalties:D #1 ~
       }
       \exp_stop_f:
   }
@@ -849,37 +849,37 @@
   {
     \clist_set:Nx #1
       {
-        \int_step_function:nN { \etex_clubpenalties:D 0 - 1 }
+        \int_step_function:nN { \tex_clubpenalties:D 0 - 1 }
           \__galley_save_display_club_penalties:n
       }
   }
 \cs_new:Npn \__galley_save_display_club_penalties:n #1
-  { \int_value:w \etex_clubpenalties:D \int_eval:n {#1} , }
+  { \int_value:w \tex_clubpenalties:D \int_eval:n {#1} , }
 \cs_new_protected:Npn \galley_save_display_widow_penalties:N #1
   {
     \clist_set:Nx #1
       {
-        \int_step_function:nN { \etex_displaywidowpenalties:D 0 - 1 }
+        \int_step_function:nN { \tex_displaywidowpenalties:D 0 - 1 }
           \__galley_save_display_widow_penalties:n
       }
   }
 \cs_new:Npn \__galley_save_display_widow_penalties:n #1
   {
-    \int_value:w \etex_displaywidowpenalties:D
+    \int_value:w \tex_displaywidowpenalties:D
       \int_eval:n {#1} ,
   }
 \cs_new_protected:Npn \galley_save_widow_penalties:N #1
   {
     \clist_set:Nx #1
       {
-        \int_step_function:nN { \etex_widowpenalties:D 0 - 1 }
+        \int_step_function:nN { \tex_widowpenalties:D 0 - 1 }
           \__galley_save_widow_penalties:n
       }
   }
 \cs_new:Npn \__galley_save_widow_penalties:n #1
-  { \int_value:w \etex_widowpenalties:D \int_eval:n {#1} , }
+  { \int_value:w \tex_widowpenalties:D \int_eval:n {#1} , }
 \cs_new_protected:Npn \galley_interline_penalty:
-  { \int_value:w \etex_interlinepenalties:D \etex_interlinepenalties:D 0 \exp_stop_f: }
+  { \int_value:w \tex_interlinepenalties:D \tex_interlinepenalties:D 0 \exp_stop_f: }
 \__kernel_msg_new:nnn { galley } { no-line-to-end }
   { There's~no~line~here~to~end. }
 \cs_set:Npn \clearpage
diff --git a/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty b/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty
index 2f7a529d783..aa605b1bfc0 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty
@@ -21,7 +21,7 @@
 %% File: xgalley.dtx Copyright (C) 1999-2001, 2004-2009 Frank Mittelbach
 %%                             (C) 2010-2012,2014,2016-2018 The LaTeX3 Project
 \RequirePackage{xparse}
-\ProvidesExplPackage{xgalley}{2018-04-30}{}
+\ProvidesExplPackage{xgalley}{2018-05-12}{}
   {L3 Experimental galley}
 \RequirePackage{xparse,xtemplate,l3galley}
 \clist_new:N \l__galley_tmpa_clist