From 527bf264c6238978f19cb55441245c6c68aa4ee5 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Fri, 31 Jan 2020 22:14:18 +0000
Subject: l3kernel (31jan20)

git-svn-id: svn://tug.org/texlive/trunk@53618 c570f23f-e606-0410-a88d-b1316a301751
---
 .../texmf-dist/tex/latex/l3kernel/expl3-code.tex   | 48 +++++++++++-----------
 .../tex/latex/l3kernel/expl3-generic.tex           |  2 +-
 Master/texmf-dist/tex/latex/l3kernel/expl3.ltx     |  2 +-
 Master/texmf-dist/tex/latex/l3kernel/expl3.lua     |  2 +-
 Master/texmf-dist/tex/latex/l3kernel/expl3.sty     |  2 +-
 Master/texmf-dist/tex/latex/l3kernel/l3debug.def   |  2 +-
 6 files changed, 30 insertions(+), 28 deletions(-)

(limited to 'Master/texmf-dist/tex/latex/l3kernel')

diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
index facf6aa4954..572ed346fc1 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
@@ -67,7 +67,7 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: expl3.dtx
-\def\ExplFileDate{2020-01-22}%
+\def\ExplFileDate{2020-01-31}%
 \begingroup
   \def\next{\endgroup}%
   \expandafter\ifx\csname PackageError\endcsname\relax
@@ -1341,7 +1341,7 @@
   \tex_else:D
     \tex_ifdefined:D \tex_directlua:D
       \tex_directlua:D { tex.enableprimitives("@@", {"tracingfonts"}) }
-      \tex_let:D \tex_tracingfonts:D \luatextracingfonts
+      \tex_let:D \tex_tracingfonts:D \@@tracingfonts
     \tex_fi:D
   \tex_fi:D
 \tex_fi:D
@@ -28150,8 +28150,8 @@
   {
     \__text_if_expandable:NTF #1
       {
-        \str_if_eq:nnTF {#1} { \exp_not:n }
-          { \__text_expand_noexpand:n }
+        \token_if_eq_meaning:NNTF #1 \exp_not:n
+          { \__text_expand_noexpand:w }
           { \exp_after:wN \__text_expand_loop:w #1 }
       }
       {
@@ -28159,9 +28159,11 @@
         \__text_expand_loop:w
       }
   }
-\cs_new:Npn \__text_expand_noexpand:n #1
+\cs_new:Npn \__text_expand_noexpand:w #1#
+  { \__text_expand_noexpand:nn {#1} }
+\cs_new:Npn \__text_expand_noexpand:nn #1#2
   {
-    \__text_expand_store:n {#1}
+    #1 \__text_expand_store:n #1 {#2}
     \__text_expand_loop:w
   }
 \cs_new_protected:Npn \text_declare_expand_equivalent:Nn #1#2
@@ -29331,39 +29333,39 @@
   { \bool_if:NTF #1 { \bool_gset_false:N } { \bool_gset_true:N } #1 }
 \cs_generate_variant:Nn \bool_gset_inverse:N { c }
 \cs_new:Npn \bool_case_true:nTF
-  { \exp:w \__msg_case:NnTF \c_true_bool }
+  { \exp:w \__bool_case:NnTF \c_true_bool }
 \cs_new:Npn \bool_case_true:nT #1#2
-  { \exp:w \__msg_case:NnTF \c_true_bool {#1} {#2} { } }
+  { \exp:w \__bool_case:NnTF \c_true_bool {#1} {#2} { } }
 \cs_new:Npn \bool_case_true:nF #1
-  { \exp:w \__msg_case:NnTF \c_true_bool {#1} { } }
+  { \exp:w \__bool_case:NnTF \c_true_bool {#1} { } }
 \cs_new:Npn \bool_case_true:n #1
-  { \exp:w \__msg_case:NnTF \c_true_bool {#1} { } { } }
+  { \exp:w \__bool_case:NnTF \c_true_bool {#1} { } { } }
 \cs_new:Npn \bool_case_false:nTF
-  { \exp:w \__msg_case:NnTF \c_false_bool }
+  { \exp:w \__bool_case:NnTF \c_false_bool }
 \cs_new:Npn \bool_case_false:nT #1#2
-  { \exp:w \__msg_case:NnTF \c_false_bool {#1} {#2} { } }
+  { \exp:w \__bool_case:NnTF \c_false_bool {#1} {#2} { } }
 \cs_new:Npn \bool_case_false:nF #1
-  { \exp:w \__msg_case:NnTF \c_false_bool {#1} { } }
+  { \exp:w \__bool_case:NnTF \c_false_bool {#1} { } }
 \cs_new:Npn \bool_case_false:n #1
-  { \exp:w \__msg_case:NnTF \c_false_bool {#1} { } { } }
-\cs_new:Npn \__msg_case:NnTF #1#2#3#4
+  { \exp:w \__bool_case:NnTF \c_false_bool {#1} { } { } }
+\cs_new:Npn \__bool_case:NnTF #1#2#3#4
   {
-    \bool_if:NTF #1 \__msg_case_true:w \__msg_case_false:w
+    \bool_if:NTF #1 \__bool_case_true:w \__bool_case_false:w
     #2 #1 { } \q_mark {#3} \q_mark {#4} \q_stop
   }
-\cs_new:Npn \__msg_case_true:w #1#2
+\cs_new:Npn \__bool_case_true:w #1#2
   {
     \bool_if:nTF {#1}
-      { \__msg_case_end:nw {#2} }
-      { \__msg_case_true:w }
+      { \__bool_case_end:nw {#2} }
+      { \__bool_case_true:w }
   }
-\cs_new:Npn \__msg_case_false:w #1#2
+\cs_new:Npn \__bool_case_false:w #1#2
   {
     \bool_if:nTF {#1}
-      { \__msg_case_false:w }
-      { \__msg_case_end:nw {#2} }
+      { \__bool_case_false:w }
+      { \__bool_case_end:nw {#2} }
   }
-\cs_new:Npn \__msg_case_end:nw #1#2#3 \q_mark #4#5 \q_stop
+\cs_new:Npn \__bool_case_end:nw #1#2#3 \q_mark #4#5 \q_stop
   { \exp_end: #1 #4 }
 \cs_new:Npn \prop_rand_key_value: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 f01ef0d9a01..979c9f83846 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{2020-01-22}%
+\def\ExplFileDate{2020-01-31}%
 \let\ExplLoaderFileDate\ExplFileDate
 \begingroup
   \def\tempa{LaTeX2e}%
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx b/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx
index 3b5be14b9c0..06a5e1a9ca0 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx
@@ -19,7 +19,7 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: expl3.dtx
-\def\ExplFileDate{2020-01-22}%
+\def\ExplFileDate{2020-01-31}%
 \let\ExplLoaderFileDate\ExplFileDate
 \everyjob\expandafter{\the\everyjob
   \message{L3 programming layer <\ExplFileDate>}%
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.lua b/Master/texmf-dist/tex/latex/l3kernel/expl3.lua
index 35c757a6049..a0788cdfc7f 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3.lua
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.lua
@@ -47,7 +47,7 @@ local sprint     = tex.sprint
 local cprint     = tex.cprint
 local write      = tex.write
 local write_nl   = texio.write_nl
-local utf8_char = (utf and utf.char) or unicode.utf8.char
+local utf8_char = (utf8 and utf8.char) or (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, ".",
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
index 384c674b3b7..bea9e90e260 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{2020-01-22}%
+\def\ExplFileDate{2020-01-31}%
 \let\ExplLoaderFileDate\ExplFileDate
 \ProvidesPackage{expl3}
   [%
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3debug.def b/Master/texmf-dist/tex/latex/l3kernel/l3debug.def
index 1a009cd48b7..604332530cf 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3debug.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3debug.def
@@ -802,7 +802,7 @@
     }
   \__kernel_patch_eval:nn
     { \__box_dim_eval:n }
-    { \__box_eval:w { } }
+    { \__box_dim_eval:w { } }
   \__kernel_patch_eval:nn
     {
       \dim_eval:n
-- 
cgit v1.2.3