l3kernel (2jun18)

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

8 files changed, 88 insertions, 44 deletions

diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
index 3a9d2dda5b6..6cf7cdc6578 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 Copyright (C) 1990-2018 The LaTeX3 Project
-\def\ExplFileDate{2018-05-13}%
+\def\ExplFileDate{2018-06-01}%
 \begingroup
   \def\next{\endgroup}%
   \expandafter\ifx\csname PackageError\endcsname\relax
@@ -251,7 +251,7 @@
     \else
       \expandafter\ifx\csname pdftexversion\endcsname\relax
         \expandafter\ifx\csname Ucharcat\endcsname\relax
-          \ifx\csname kanjiskip\endcsname\relax
+          \expandafter\ifx\csname kanjiskip\endcsname\relax
           \else
             1%
           \fi
@@ -24820,22 +24820,22 @@
               { \l__file_full_name_str }
           }
       }
-    \sys_if_engine_xetex:T
+    \cs_if_exist:NF \tex_filesize:D
       {
         \cs_set_protected:Npn \__file_get_details:nnN #1#2#3
           {
             \tl_clear:N #3
             \__kernel_msg_error:nnx
-              { kernel } { xetex-primitive-not-available }
-              { \exp_not:c { pdffile #2 } }
+              { kernel } { primitive-not-available }
+              { \exp_not:c { (pdf)file #2 } }
           }
       }
   }
-\__kernel_msg_new:nnnn { kernel } { xetex-primitive-not-available }
+\__kernel_msg_new:nnnn { kernel } { primitive-not-available }
   { Primitive~\token_to_str:N #1 not~available }
   {
-    XeTeX~does~not~currently~provide~functionality~equivalent~to~the~
-    \token_to_str:N #1 primitive.
+    The~version~of~XeTeX~in~use~does~not~provide~functionality~equivalent~to~
+    the~\token_to_str:N #1 primitive.
   }
 \cs_new_protected:Npn \file_if_exist_input:n #1
   {
@@ -25389,35 +25389,75 @@
   {
     \if_int_compare:w #1 > "80 \exp_stop_f:
       \if_int_compare:w #1 < "800 \exp_stop_f:
-        2
-        \__char_codepoint_to_bytes_auxii:Nnn C {#1} { 64 }
-        \__char_codepoint_to_bytes_auxiii:n {#1}
+        \__char_codepoint_to_bytes_outputi:nw
+          { \__char_codepoint_to_bytes_auxii:Nnn C {#1} { 64 } }
+        \__char_codepoint_to_bytes_outputii:nw
+          { \__char_codepoint_to_bytes_auxiii:n {#1} }
       \else:
         \if_int_compare:w #1 < "10000 \exp_stop_f:
-          3
-          \__char_codepoint_to_bytes_auxii:Nnn E {#1} { 64 * 64 }
-          \__char_codepoint_to_bytes_auxiii:n
-            { \int_div_truncate:nn {#1} { 64 } }
-          \__char_codepoint_to_bytes_auxiii:n {#1}
+          \__char_codepoint_to_bytes_outputi:nw
+            { \__char_codepoint_to_bytes_auxii:Nnn E {#1} { 64 * 64 } }
+          \__char_codepoint_to_bytes_outputii:nw
+            {
+              \__char_codepoint_to_bytes_auxiii:n
+                { \int_div_truncate:nn {#1} { 64 } }
+            }
+          \__char_codepoint_to_bytes_outputiii:nw
+            { \__char_codepoint_to_bytes_auxiii:n {#1} }
         \else:
-          4
-          \__char_codepoint_to_bytes_auxii:Nnn F
-            {#1} { 64 * 64 * 64 }
-          \__char_codepoint_to_bytes_auxiii:n
-            { \int_div_truncate:nn {#1} { 64 * 64 } }
-          \__char_codepoint_to_bytes_auxiii:n
-            { \int_div_truncate:nn {#1} { 64 } }
-          \__char_codepoint_to_bytes_auxiii:n {#1}
+          \__char_codepoint_to_bytes_outputi:nw
+            {
+              \__char_codepoint_to_bytes_auxii:Nnn F
+                 {#1} { 64 * 64 * 64 }
+            }
+          \__char_codepoint_to_bytes_outputii:nw
+            {
+              \__char_codepoint_to_bytes_auxiii:n
+                { \int_div_truncate:nn {#1} { 64 * 64 } }
+            }
+          \__char_codepoint_to_bytes_outputiii:nw
+            {
+              \__char_codepoint_to_bytes_auxiii:n
+                { \int_div_truncate:nn {#1} { 64 } }
+            }
+          \__char_codepoint_to_bytes_outputiv:nw
+            { \__char_codepoint_to_bytes_auxiii:n {#1} }
         \fi:
       \fi:
     \else:
-      1 {#1}
+      \__char_codepoint_to_bytes_outputi:nw {#1}
     \fi:
+    \__char_codepoint_to_bytes_end: { } { } { } { }
   }
 \cs_new:Npn \__char_codepoint_to_bytes_auxii:Nnn #1#2#3
-  { { \int_eval:n { "#10 + \int_div_truncate:nn {#2} {#3} } } }
+  {  "#10 + \int_div_truncate:nn {#2} {#3} }
 \cs_new:Npn \__char_codepoint_to_bytes_auxiii:n #1
-  { { \int_eval:n { \int_mod:nn {#1} { 64 } + 128 } } }
+  { \int_mod:nn {#1} { 64 } + 128 }
+\cs_new:Npn \__char_codepoint_to_bytes_outputi:nw
+  #1 #2 \__char_codepoint_to_bytes_end: #3
+  { \__char_codepoint_to_bytes_output:fnn { \int_eval:n {#1} } { } {#2} }
+\cs_new:Npn \__char_codepoint_to_bytes_outputii:nw
+  #1 #2 \__char_codepoint_to_bytes_end: #3#4
+  { \__char_codepoint_to_bytes_output:fnn { \int_eval:n {#1} } { {#3} } {#2} }
+\cs_new:Npn \__char_codepoint_to_bytes_outputiii:nw
+  #1 #2 \__char_codepoint_to_bytes_end: #3#4#5
+  {
+    \__char_codepoint_to_bytes_output:fnn
+      { \int_eval:n {#1} } { {#3} {#4} } {#2}
+  }
+\cs_new:Npn \__char_codepoint_to_bytes_outputiv:nw
+  #1 #2 \__char_codepoint_to_bytes_end: #3#4#5#6
+  {
+    \__char_codepoint_to_bytes_output:fnn
+      { \int_eval:n {#1} } { {#3} {#4} {#5} } {#2}
+  }
+\cs_new:Npn \__char_codepoint_to_bytes_output:nnn #1#2#3
+  {
+    #3
+    \__char_codepoint_to_bytes_end: #2 {#1}
+  }
+\cs_generate_variant:Nn \__char_codepoint_to_bytes_output:nnn { f }
+\cs_new:Npn \__char_codepoint_to_bytes_end: { }
 \cs_generate_variant:Nn \tl_if_head_eq_catcode:nNTF { o }
 \cs_new:Npn \tl_lower_case:n { \__tl_change_case:nnn { lower } { } }
 \cs_new:Npn \tl_upper_case:n { \__tl_change_case:nnn { upper } { } }
@@ -26026,21 +26066,25 @@
       \cs_set_protected:Npn \__tl_tmp:w #1#2
         {
           \tl_const:Nx #1
-            { \char_generate:nn {"#2} { \char_value_catcode:n {"#2} } }
+            {
+              \exp_after:wN \exp_after:wN \exp_after:wN
+               \exp_not:N \char_generate:nn
+                 {"#2} { \char_value_catcode:n {"#2} }
+            }
         }
     }
     {
       \cs_set_protected:Npn \__tl_tmp:w #1#2
         {
           \group_begin:
-            \cs_set_protected:Npn \__tl_tmp:w ##1##2##3
+            \cs_set_protected:Npn \__tl_tmp:w ##1##2##3##4
               {
                 \tl_const:Nx #1
                   {
                     \exp_after:wN \exp_after:wN \exp_after:wN
-                      \exp_not:N \char_generate:nn {##2} { 13 }
+                      \exp_not:N \char_generate:nn {##1} { 13 }
                     \exp_after:wN \exp_after:wN \exp_after:wN
-                      \exp_not:N \char_generate:nn {##3} { 13 }
+                      \exp_not:N \char_generate:nn {##2} { 13 }
                   }
               }
             \tl_set:Nx \l__tl_internal_a_tl
@@ -26070,13 +26114,13 @@
           \exp_after:wN \__tl_tmp:w \l__tl_internal_a_tl
           \__tl_loop:nn
         }
-      \cs_set_protected:Npn \__tl_tmp:w #1#2#3#4#5#6
+      \cs_set_protected:Npn \__tl_tmp:w #1#2#3#4#5#6#7#8
         {
           \tl_const:cx
             {
               c__tl_lower_case_
+              \char_generate:nn {#1} { 12 }
               \char_generate:nn {#2} { 12 }
-              \char_generate:nn {#3} { 12 }
               _tl
             }
             {
@@ -26094,9 +26138,9 @@
             }
             {
               \exp_after:wN \exp_after:wN \exp_after:wN
-                \exp_not:N \char_generate:nn {#2} { 13 }
+                \exp_not:N \char_generate:nn {#1} { 13 }
               \exp_after:wN \exp_after:wN \exp_after:wN
-                \exp_not:N \char_generate:nn {#3} { 13 }
+                \exp_not:N \char_generate:nn {#2} { 13 }
             }
         }
       \__tl_loop:nn
@@ -26204,13 +26248,13 @@
       \cs_set_protected:Npn \__tl_tmp:w #1#2#3
         {
           \group_begin:
-            \cs_set_protected:Npn \__tl_tmp:w ##1##2##3
+            \cs_set_protected:Npn \__tl_tmp:w ##1##2##3##4
               {
                 \tl_const:cx
                   {
                     c__tl_ #3 _case_
+                    \char_generate:nn {##1} { 12 }
                     \char_generate:nn {##2} { 12 }
-                    \char_generate:nn {##3} { 12 }
                     _tl
                   }
                     {#2}
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
index 2709d31e383..251bd130847 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 Copyright (C) 1990-2018 The LaTeX3 Project
-\def\ExplFileDate{2018-05-13}%
+\def\ExplFileDate{2018-06-01}%
 \let\ExplLoaderFileDate\ExplFileDate
 \begingroup
   \def\tempa{LaTeX2e}%
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
index 28ac288e2f5..31091110395 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 Copyright (C) 1990-2018 The LaTeX3 Project
-\def\ExplFileDate{2018-05-13}%
+\def\ExplFileDate{2018-06-01}%
 \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 2f1db790996..b37fd053f39 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 Copyright(C) 2011-2018 The LaTeX3 Project
 \ProvidesExplFile
-  {l3dvidpfmx.def}{2018-05-13}{}
+  {l3dvidpfmx.def}{2018-06-01}{}
   {L3 Experimental driver: dvipdfmx}
 \cs_new_eq:NN \__driver_literal_x:n \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 74c485d938e..73a8992041b 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 Copyright(C) 2011-2018 The LaTeX3 Project
 \ProvidesExplFile
-  {l3dvips.def}{2018-05-13}{}
+  {l3dvips.def}{2018-06-01}{}
   {L3 Experimental driver: dvips}
 \cs_new_eq:NN \__driver_literal_x:n \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 3cadd5db84d..bcb954e19e0 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 Copyright(C) 2011-2018 The LaTeX3 Project
 \ProvidesExplFile
-  {l3dvisvgm.def}{2018-05-13}{}
+  {l3dvisvgm.def}{2018-06-01}{}
   {L3 Experimental driver: dvisvgm}
 \cs_new_eq:NN \__driver_literal_x:n \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 f68f35fd2ea..6ae1a5b72ef 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 Copyright(C) 2011-2018 The LaTeX3 Project
 \ProvidesExplFile
-  {l3pdfmode.def}{2018-05-13}{}
+  {l3pdfmode.def}{2018-06-01}{}
   {L3 Experimental driver: PDF mode}
 \cs_new_eq:NN \__driver_literal_x:n \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 3bc19bf99e5..ed60301fdd7 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 Copyright(C) 2011-2018 The LaTeX3 Project
 \ProvidesExplFile
-  {l3xdvidpfmx.def}{2018-05-13}{}
+  {l3xdvidpfmx.def}{2018-06-01}{}
   {L3 Experimental driver: xdvipdfmx}
 \cs_new_eq:NN \__driver_literal_x:n \tex_special:D
 \cs_new_protected:Npn \__driver_literal:n #1