l3kernel (6apr19)

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

9 files changed, 24 insertions, 29 deletions

diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
index f7bfa226825..715c3637b3d 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
@@ -63,7 +63,7 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: expl3.dtx
-\def\ExplFileDate{2019-03-26}%
+\def\ExplFileDate{2019-04-06}%
 \begingroup
   \def\next{\endgroup}%
   \expandafter\ifx\csname PackageError\endcsname\relax
@@ -4540,6 +4540,20 @@
     \fi:
   }
 \cs_new:Npn \__tl_if_single:nnw #1#2#3 \q_stop {#2}
+\prg_new_conditional:Npnn \tl_if_single_token:n #1 { p , T , F , TF }
+  {
+    \tl_if_head_is_N_type:nTF {#1}
+      { \__tl_if_empty_if:o { \use_none:n #1 } }
+      {
+        \tl_if_empty:nTF {#1}
+          { \if_false: }
+          { \__tl_if_empty_if:o { \exp:w \exp_end_continue_f:w #1 } }
+      }
+      \prg_return_true:
+    \else:
+      \prg_return_false:
+    \fi:
+  }
 \cs_new:Npn \tl_case:Nn #1#2
   {
     \exp:w
@@ -26382,20 +26396,6 @@
       { \iow_shipout:Nn \c__sys_shell_stream_int {#1} }
   }
 \cs_generate_variant:Nn \sys_shell_shipout:n { x }
-\prg_new_conditional:Npnn \tl_if_single_token:n #1 { p , T , F , TF }
-  {
-    \tl_if_head_is_N_type:nTF {#1}
-      { \__tl_if_empty_if:o { \use_none:n #1 } }
-      {
-        \tl_if_empty:nTF {#1}
-          { \if_false: }
-          { \__tl_if_empty_if:o { \exp:w \exp_end_continue_f:w #1 } }
-      }
-      \prg_return_true:
-    \else:
-      \prg_return_false:
-    \fi:
-  }
 \cs_new:Npn \char_lower_case:N #1
   { \__char_change_case:nNN { lower } \char_value_lccode:n #1 }
 \cs_new:Npn \char_upper_case:N #1
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
index abdcb8c16ab..2865a66e848 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
@@ -19,7 +19,7 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: expl3.dtx
-\def\ExplFileDate{2019-03-26}%
+\def\ExplFileDate{2019-04-06}%
 \let\ExplLoaderFileDate\ExplFileDate
 \begingroup
   \def\tempa{LaTeX2e}%
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.lua b/Master/texmf-dist/tex/latex/l3kernel/expl3.lua
index 32c32a2af07..06b3edd8384 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3.lua
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.lua
@@ -34,9 +34,6 @@ local byte       = string.byte
 local floor      = math.floor
 local format     = string.format
 local gsub       = string.gsub
-if not resolvers then
-  local kpse_find  = kpse.find_file
-end
 local lfs_attr   = lfs.attributes
 local md5_sum    = md5.sum
 local open       = io.open
@@ -45,10 +42,8 @@ local os_date    = os.date
 local setcatcode = tex.setcatcode
 local sprint     = tex.sprint
 local write      = tex.write
-local utf8_char  = unicode.utf8.char
-if resolvers then
-  kpse_find = resolvers.findfile
-end
+local utf8_char = (utf and utf.char) or unicode.utf8.char
+local kpse_find = (resolvers and resolvers.findfile) or kpse.find_file
 local function escapehex(str)
   write((gsub(str, ".",
     function (ch) return format("%02X", byte(ch)) end)))
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
index bca246bf946..4a7c73d8299 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
@@ -19,7 +19,7 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: expl3.dtx
-\def\ExplFileDate{2019-03-26}%
+\def\ExplFileDate{2019-04-06}%
 \let\ExplLoaderFileDate\ExplFileDate
 \ProvidesPackage{expl3}
   [%
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def b/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def
index fad2904d773..95b580d4e66 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def
@@ -20,7 +20,7 @@
 %% 
 %% File: l3drivers.dtx
 \ProvidesExplFile
-  {l3dvipdfmx.def}{2019-03-26}{}
+  {l3dvipdfmx.def}{2019-04-06}{}
   {L3 Experimental driver: dvipdfmx}
 \cs_new_eq:NN \__driver_literal:e \tex_special:D
 \cs_new_protected:Npn \__driver_literal:n #1
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def b/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def
index ac1e5240737..db72b671eff 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def
@@ -20,7 +20,7 @@
 %% 
 %% File: l3drivers.dtx
 \ProvidesExplFile
-  {l3dvips.def}{2019-03-26}{}
+  {l3dvips.def}{2019-04-06}{}
   {L3 Experimental driver: dvips}
 \cs_new_eq:NN \__driver_literal:e \tex_special:D
 \cs_new_protected:Npn \__driver_literal:n #1
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3dvisvgm.def b/Master/texmf-dist/tex/latex/l3kernel/l3dvisvgm.def
index 79b1de78784..010d500238d 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3dvisvgm.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3dvisvgm.def
@@ -20,7 +20,7 @@
 %% 
 %% File: l3drivers.dtx
 \ProvidesExplFile
-  {l3dvisvgm.def}{2019-03-26}{}
+  {l3dvisvgm.def}{2019-04-06}{}
   {L3 Experimental driver: dvisvgm}
 \cs_new_eq:NN \__driver_literal:e \tex_special:D
 \cs_new_protected:Npn \__driver_literal:n #1
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def b/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def
index 1b438148eee..8ce7bcf5e52 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def
@@ -20,7 +20,7 @@
 %% 
 %% File: l3drivers.dtx
 \ProvidesExplFile
-  {l3pdfmode.def}{2019-03-26}{}
+  {l3pdfmode.def}{2019-04-06}{}
   {L3 Experimental driver: PDF mode}
 \cs_new_eq:NN \__driver_literal:e \tex_special:D
 \cs_new_protected:Npn \__driver_literal:n #1
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def b/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def
index e19dc46dd5d..069f8ff0696 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def
@@ -20,7 +20,7 @@
 %% 
 %% File: l3drivers.dtx
 \ProvidesExplFile
-  {l3xdvipdfmx.def}{2019-03-26}{}
+  {l3xdvipdfmx.def}{2019-04-06}{}
   {L3 Experimental driver: xdvipdfmx}
 \cs_new_eq:NN \__driver_literal:e \tex_special:D
 \cs_new_protected:Npn \__driver_literal:n #1