l3kernel (14may18)

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

9 files changed, 19 insertions, 22 deletions

diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
index 3d3a5e42fb7..3a9d2dda5b6 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-04-30}%
+\def\ExplFileDate{2018-05-13}%
 \begingroup
   \def\next{\endgroup}%
   \expandafter\ifx\csname PackageError\endcsname\relax
@@ -25177,7 +25177,6 @@
         { xetex }
           {
             \int_use:N \tex_XeTeXversion:D
-            .
             \tex_XeTeXrevision:D
           }
       }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
index 2df1c910341..2709d31e383 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-04-30}%
+\def\ExplFileDate{2018-05-13}%
 \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 3b5366798c0..28ac288e2f5 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-04-30}%
+\def\ExplFileDate{2018-05-13}%
 \let\ExplLoaderFileDate\ExplFileDate
 \ProvidesPackage{expl3}
   [%
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls b/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls
index 4de17f6298d..dce81b3df6e 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls
@@ -66,9 +66,6 @@
 \bool_new:N \l__codedoc_names_verb_bool
 \seq_new:N \l__codedoc_names_seq
 \seq_new:N \g__codedoc_nested_names_seq
-\tl_const:Nx \c__codedoc_backslash_tl { \iow_char:N \\ }
-\exp_last_unbraced:NNo
-  \cs_new_eq:NN \c__codedoc_backslash_token { \c__codedoc_backslash_tl }
 \tl_new:N \l__codedoc_index_macro_tl
 \tl_new:N \l__codedoc_index_key_tl
 \tl_new:N \l__codedoc_index_module_tl
@@ -482,7 +479,7 @@
 \cs_set_protected:Npn \ifnot@excluded
   {
     \exp_args:Nxx \expanded@notin
-      { \c__codedoc_backslash_tl \tl_to_str:N \macro@namepart , }
+      { \c_backslash_str \tl_to_str:N \macro@namepart , }
       { \exp_args:NV \tl_to_str:n \index@excludelist }
   }
 \cs_new:Npn \pdfstringnewline { : ~ }
@@ -544,12 +541,12 @@
 \DeclareDocumentCommand \cmd { O{} m }
   { \__codedoc_cmd:no {#1} { \token_to_str:N #2 } }
 \DeclareDocumentCommand \cs  { O{} m }
-  { \__codedoc_cmd:no {#1} { \c__codedoc_backslash_tl #2 } }
+  { \__codedoc_cmd:no {#1} { \c_backslash_str #2 } }
 \DeclareDocumentCommand \tn  { O{} m }
   {
     \__codedoc_cmd:no
       { module = TeX , replace = false , #1 }
-      { \c__codedoc_backslash_tl #2 }
+      { \c_backslash_str #2 }
   }
 \DeclareDocumentCommand \meta { m }
   { \__codedoc_meta:n {#1} }
@@ -778,8 +775,8 @@
 \cs_new_protected:Npn \__codedoc_get_hyper_target:nN #1#2
   {
     \tl_set:Nx #2 { \tl_to_str:n {#1} }
-    \tl_replace_all:Nxn #2 { \iow_char:N \_ } { / }
-    \tl_remove_all:Nx   #2 { \iow_char:N \\ }
+    \tl_replace_all:Nxn #2 { \c_underscore_str } { / }
+    \tl_remove_all:Nx   #2 { \c_backslash_str }
     \tl_put_left:Nn #2 { doc/function// }
   }
 \cs_generate_variant:Nn \__codedoc_get_hyper_target:nN { o , x }
@@ -793,7 +790,7 @@
       }
       {
         \tl_remove_all:Nx \l__codedoc_tmpa_tl
-          { \iow_char:N \^^M \iow_char:N \% }
+          { \iow_char:N \^^M \c_percent_str }
         \tl_remove_all:Nx \l__codedoc_tmpa_tl { \tl_to_str:n { ^ ^ A } }
         \tl_remove_all:Nx \l__codedoc_tmpa_tl { \iow_char:N \^^I }
         \tl_remove_all:Nx \l__codedoc_tmpa_tl { \iow_char:N \^^M }
@@ -1503,7 +1500,7 @@
     \__codedoc_test_missing_aux:Nxn
       \g__codedoc_missing_tests_prop
       { \seq_use:Nn \l__codedoc_names_seq { , } }
-      { { \g_file_curr_name_str \iow_char:N \ (#1) } }
+      { { \g_file_curr_name_str \c_space_tl (#1) } }
   }
 \cs_new_protected:Npn \__codedoc_test_missing_aux:Nnn #1#2#3
   {
@@ -2127,7 +2124,7 @@
           {
             \tl_replace_all:Nnn #1 {##1}
               {
-                \verbatimchar \c__codedoc_backslash_tl ##1
+                \verbatimchar \c_backslash_str ##1
                 \token_to_str:N \verb * \verbatimchar
               }
           }
@@ -2140,7 +2137,7 @@
       {
         \tl_set:Nn #1 {#2}
         \tl_replace_all:Non #1
-          { \c__codedoc_backslash_tl }
+          { \c_backslash_str }
           { \token_to_str:N \bslash \c_space_tl }
       }
     \__codedoc_quote_special_char:N #1
@@ -2162,8 +2159,9 @@
     \tl_if_in:NoTF \l__codedoc_index_key_tl { \tl_to_str:n { __ } }
       { \bool_set_true:N \l__codedoc_index_internal_bool }
       { \bool_set_false:N \l__codedoc_index_internal_bool }
+    \exp_last_unbraced:NNo
     \tl_if_head_eq_charcode:oNT
-      { \l__codedoc_index_key_tl } \c__codedoc_backslash_token
+      { \l__codedoc_index_key_tl } \c_backslash_str
       { \__codedoc_key_pop: }
     \tl_if_in:NoTF \l__codedoc_index_key_tl { \token_to_str:N : }
       { \__codedoc_key_func: }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def b/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def
index de75c2d9b48..2f1db790996 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-12}{}
+  {l3dvidpfmx.def}{2018-05-13}{}
   {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 1ec0b43e968..74c485d938e 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-12}{}
+  {l3dvips.def}{2018-05-13}{}
   {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 d27c61decba..3cadd5db84d 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-12}{}
+  {l3dvisvgm.def}{2018-05-13}{}
   {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 091b078e79c..f68f35fd2ea 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-12}{}
+  {l3pdfmode.def}{2018-05-13}{}
   {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 b855c6fcd65..3bc19bf99e5 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-12}{}
+  {l3xdvidpfmx.def}{2018-05-13}{}
   {L3 Experimental driver: xdvipdfmx}
 \cs_new_eq:NN \__driver_literal_x:n \tex_special:D
 \cs_new_protected:Npn \__driver_literal:n #1