l3kernel (14may18)

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

72 files changed, 94 insertions, 107 deletions

diff --git a/Master/texmf-dist/doc/latex/l3kernel/README.md b/Master/texmf-dist/doc/latex/l3kernel/README.md
index e4299b1c7b0..f98b6df7349 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/README.md
+++ b/Master/texmf-dist/doc/latex/l3kernel/README.md
@@ -1,7 +1,7 @@
 LaTeX3 Programming Conventions
 ==============================
 
-Release 2018-05-12
+Release 2018-05-13
 
 Overview
 --------
diff --git a/Master/texmf-dist/doc/latex/l3kernel/expl3.pdf b/Master/texmf-dist/doc/latex/l3kernel/expl3.pdf
index 255770e7e92..25085fb2eb5 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/expl3.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/expl3.pdf
diff --git a/Master/texmf-dist/doc/latex/l3kernel/interface3.pdf b/Master/texmf-dist/doc/latex/l3kernel/interface3.pdf
index a6c294b59f9..c9b61164ea0 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/interface3.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/interface3.pdf
diff --git a/Master/texmf-dist/doc/latex/l3kernel/interface3.tex b/Master/texmf-dist/doc/latex/l3kernel/interface3.tex
index 370d56f9c9a..724e1d4fb6b 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/interface3.tex
+++ b/Master/texmf-dist/doc/latex/l3kernel/interface3.tex
@@ -52,7 +52,7 @@
          {latex-team@latex-project.org}%
    }%
 }
-\date{Released 2018-04-30}
+\date{Released 2018-05-13}
 
 \pagenumbering{roman}
 \maketitle
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3docstrip.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3docstrip.pdf
index 2a727e5cee5..f4366239583 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3docstrip.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3docstrip.pdf
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.pdf
index ec32a951299..7e3c40e620d 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.pdf
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.tex b/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.tex
index d5a30013214..33d11e06648 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.tex
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.tex
@@ -30,7 +30,7 @@ The released version of this bundle is available from CTAN.
         {latex-team@latex-project.org}%
     }%
 }
-\date{Released 2018-04-30}
+\date{Released 2018-05-13}
 
 \begin{document}
 
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.pdf
index 83b9e145245..f8d0b518b23 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.pdf
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.tex b/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.tex
index d3eb59a1fd9..12ffffb7c01 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.tex
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.tex
@@ -30,7 +30,7 @@ The released version of this bundle is available from CTAN.
         {latex-team@latex-project.org}%
     }%
 }
-\date{Released 2018-04-30}
+\date{Released 2018-05-13}
 
 \newcommand{\TF}{\textit{(TF)}}
 
diff --git a/Master/texmf-dist/doc/latex/l3kernel/source3.pdf b/Master/texmf-dist/doc/latex/l3kernel/source3.pdf
index ce84e9ec71f..4eb178feb4c 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/source3.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/source3.pdf
diff --git a/Master/texmf-dist/doc/latex/l3kernel/source3.tex b/Master/texmf-dist/doc/latex/l3kernel/source3.tex
index 7fe47853b07..1aba1669ffb 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/source3.tex
+++ b/Master/texmf-dist/doc/latex/l3kernel/source3.tex
@@ -51,7 +51,7 @@
          {latex-team@latex-project.org}%
    }%
 }
-\date{Released 2018-04-30}
+\date{Released 2018-05-13}
 
 \pagenumbering{roman}
 \maketitle
diff --git a/Master/texmf-dist/source/latex/l3kernel/expl3.dtx b/Master/texmf-dist/source/latex/l3kernel/expl3.dtx
index 694f616f01e..51c36af3939 100644
--- a/Master/texmf-dist/source/latex/l3kernel/expl3.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/expl3.dtx
@@ -21,7 +21,7 @@
 % for those people who are interested.
 %
 %<*driver|generic|package>
-\def\ExplFileDate{2018-04-30}%
+\def\ExplFileDate{2018-05-13}%
 %</driver|generic|package>
 %<*driver>
 \documentclass[full]{l3doc}
@@ -49,7 +49,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3alloc.dtx b/Master/texmf-dist/source/latex/l3kernel/l3alloc.dtx
index e90028fca56..bd7a55e9870 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3alloc.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3alloc.dtx
@@ -41,7 +41,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3basics.dtx b/Master/texmf-dist/source/latex/l3kernel/l3basics.dtx
index debebd7cc60..5b290ddebb5 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3basics.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3basics.dtx
@@ -41,7 +41,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx b/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx
index cdc368b575b..9b9ed0ab8ef 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx
@@ -138,7 +138,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3box.dtx b/Master/texmf-dist/source/latex/l3kernel/l3box.dtx
index 7e3648f5101..6795398cb18 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3box.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3box.dtx
@@ -41,7 +41,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx b/Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx
index 1463eba5ce8..d5dd4f94a97 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx
@@ -42,7 +42,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
@@ -2815,7 +2815,6 @@
         { xetex }
           {
             \int_use:N \tex_XeTeXversion:D
-            .
             \tex_XeTeXrevision:D
           }
       }
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3clist.dtx b/Master/texmf-dist/source/latex/l3kernel/l3clist.dtx
index a89220df2eb..5042cf53f1b 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3clist.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3clist.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx b/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx
index c30fcdb5cfc..b0b4965fc27 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx
@@ -41,7 +41,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3color-base.dtx b/Master/texmf-dist/source/latex/l3kernel/l3color-base.dtx
index a16e980550c..f39a521560e 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3color-base.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3color-base.dtx
@@ -41,7 +41,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3deprecation.dtx b/Master/texmf-dist/source/latex/l3kernel/l3deprecation.dtx
index 0630ede3626..8ebb56f2f22 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3deprecation.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3deprecation.dtx
@@ -41,7 +41,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx b/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx
index fc625ac8e1b..a5cf855733c 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx
@@ -77,7 +77,7 @@ and all files in that bundle must be distributed together.
 %
 % \title{The \cls{l3doc} class}
 % \author{\Team}
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 % \maketitle
 % \tableofcontents
 %
@@ -757,16 +757,6 @@ and all files in that bundle must be distributed together.
 %    \end{macrocode}
 % \end{variable}
 %
-% \begin{variable}{\c_@@_backslash_tl, \c_@@_backslash_token}
-%   A single backslash, as a token list, or as an implicit character
-%   token.
-%    \begin{macrocode}
-\tl_const:Nx \c_@@_backslash_tl { \iow_char:N \\ }
-\exp_last_unbraced:NNo
-  \cs_new_eq:NN \c_@@_backslash_token { \c_@@_backslash_tl }
-%    \end{macrocode}
-% \end{variable}
-%
 % \begin{variable}
 %   {
 %     \l_@@_index_macro_tl, \l_@@_index_key_tl,
@@ -969,7 +959,7 @@ and all files in that bundle must be distributed together.
 %   Used to test if the argument of |\cmd| or other macros to be indexed
 %   is almost a string or not: for instance this is \texttt{false} if |#1|
 %   contains |\meta{...}|.  The surprising |f|-expansion are there to
-%   cope with the case of |#1| starting with \cs{c_@@_backslash_tl}
+%   cope with the case of |#1| starting with \cs{c_backslash_str}
 %   which should be expanded and considered to be \enquote{normal}.
 %    \begin{macrocode}
 \prg_new_protected_conditional:Npnn \@@_if_almost_str:n #1 { TF , T , F }
@@ -1546,7 +1536,7 @@ and all files in that bundle must be distributed together.
 \cs_set_protected:Npn \ifnot@excluded
   {
     \exp_args:Nxx \expanded@notin
-      { \c_@@_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 }
   }
 %    \end{macrocode}
@@ -1679,12 +1669,12 @@ and all files in that bundle must be distributed together.
 \DeclareDocumentCommand \cmd { O{} m }
   { \@@_cmd:no {#1} { \token_to_str:N #2 } }
 \DeclareDocumentCommand \cs  { O{} m }
-  { \@@_cmd:no {#1} { \c_@@_backslash_tl #2 } }
+  { \@@_cmd:no {#1} { \c_backslash_str #2 } }
 \DeclareDocumentCommand \tn  { O{} m }
   {
     \@@_cmd:no
       { module = TeX , replace = false , #1 }
-      { \c_@@_backslash_tl #2 }
+      { \c_backslash_str #2 }
   }
 %    \end{macrocode}
 % \end{macro}
@@ -2071,8 +2061,8 @@ and all files in that bundle must be distributed together.
 \cs_new_protected:Npn \@@_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 \@@_get_hyper_target:nN { o , x }
@@ -2101,7 +2091,7 @@ and all files in that bundle must be distributed together.
       }
       {
         \tl_remove_all:Nx \l_@@_tmpa_tl
-          { \iow_char:N \^^M \iow_char:N \% }
+          { \iow_char:N \^^M \c_percent_str }
         \tl_remove_all:Nx \l_@@_tmpa_tl { \tl_to_str:n { ^ ^ A } }
         \tl_remove_all:Nx \l_@@_tmpa_tl { \iow_char:N \^^I }
         \tl_remove_all:Nx \l_@@_tmpa_tl { \iow_char:N \^^M }
@@ -3161,7 +3151,7 @@ and all files in that bundle must be distributed together.
     \@@_test_missing_aux:Nxn
       \g_@@_missing_tests_prop
       { \seq_use:Nn \l_@@_names_seq { , } }
-      { { \g_file_curr_name_str \iow_char:N \ (#1) } }
+      { { \g_file_curr_name_str \c_space_tl (#1) } }
   }
 \cs_new_protected:Npn \@@_test_missing_aux:Nnn #1#2#3
   {
@@ -4071,7 +4061,7 @@ and all files in that bundle must be distributed together.
           {
             \tl_replace_all:Nnn #1 {##1}
               {
-                \verbatimchar \c_@@_backslash_tl ##1
+                \verbatimchar \c_backslash_str ##1
                 \token_to_str:N \verb * \verbatimchar
               }
           }
@@ -4084,7 +4074,7 @@ and all files in that bundle must be distributed together.
       {
         \tl_set:Nn #1 {#2}
         \tl_replace_all:Non #1
-          { \c_@@_backslash_tl }
+          { \c_backslash_str }
           { \token_to_str:N \bslash \c_space_tl }
       }
     \@@_quote_special_char:N #1
@@ -4132,8 +4122,9 @@ and all files in that bundle must be distributed together.
     \tl_if_in:NoTF \l_@@_index_key_tl { \tl_to_str:n { __ } }
       { \bool_set_true:N \l_@@_index_internal_bool }
       { \bool_set_false:N \l_@@_index_internal_bool }
+    \exp_last_unbraced:NNo
     \tl_if_head_eq_charcode:oNT
-      { \l_@@_index_key_tl } \c_@@_backslash_token
+      { \l_@@_index_key_tl } \c_backslash_str
       { \@@_key_pop: }
     \tl_if_in:NoTF \l_@@_index_key_tl { \token_to_str:N : }
       { \@@_key_func: }
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3docstrip.dtx b/Master/texmf-dist/source/latex/l3kernel/l3docstrip.dtx
index c61d696c5a3..40f40ba8a8f 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3docstrip.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3docstrip.dtx
@@ -61,7 +61,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3drivers.dtx b/Master/texmf-dist/source/latex/l3kernel/l3drivers.dtx
index 00c271c91e9..a0e106df7a6 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3drivers.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3drivers.dtx
@@ -41,7 +41,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
@@ -481,23 +481,23 @@
 %<*package>
 \ProvidesExplFile
 %<*dvipdfmx>
-  {l3dvidpfmx.def}{2018-05-12}{}
+  {l3dvidpfmx.def}{2018-05-13}{}
   {L3 Experimental driver: dvipdfmx}
 %</dvipdfmx>
 %<*dvips>
-  {l3dvips.def}{2018-05-12}{}
+  {l3dvips.def}{2018-05-13}{}
   {L3 Experimental driver: dvips}
 %</dvips>
 %<*dvisvgm>
-  {l3dvisvgm.def}{2018-05-12}{}
+  {l3dvisvgm.def}{2018-05-13}{}
   {L3 Experimental driver: dvisvgm}
 %</dvisvgm>
 %<*pdfmode>
-  {l3pdfmode.def}{2018-05-12}{}
+  {l3pdfmode.def}{2018-05-13}{}
   {L3 Experimental driver: PDF mode}
 %</pdfmode>
 %<*xdvipdfmx>
-  {l3xdvidpfmx.def}{2018-05-12}{}
+  {l3xdvidpfmx.def}{2018-05-13}{}
   {L3 Experimental driver: xdvipdfmx}
 %</xdvipdfmx>
 %</package>
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx b/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx
index be337acfb7b..2f54268c880 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx
@@ -41,7 +41,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3file.dtx b/Master/texmf-dist/source/latex/l3kernel/l3file.dtx
index d535536a8c6..e4574d85a70 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3file.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3file.dtx
@@ -42,7 +42,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3final.dtx b/Master/texmf-dist/source/latex/l3kernel/l3final.dtx
index e7180952553..82cd11646c3 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3final.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3final.dtx
@@ -41,7 +41,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3flag.dtx b/Master/texmf-dist/source/latex/l3kernel/l3flag.dtx
index be0d1a23f53..38cec5ce4c2 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3flag.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3flag.dtx
@@ -41,7 +41,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-assign.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-assign.dtx
index 8da6dca6551..a5abc74acef 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3fp-assign.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-assign.dtx
@@ -38,7 +38,7 @@
 %          {latex-team@latex-project.org}^^A
 %    }^^A
 % }
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 % \maketitle
 %
 % \begin{documentation}
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-aux.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-aux.dtx
index 28c4c9bd47e..94a0ef4f3b5 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3fp-aux.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-aux.dtx
@@ -41,7 +41,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-basics.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-basics.dtx
index 7b5c7bd8982..49d85ae7d50 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3fp-basics.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-basics.dtx
@@ -38,7 +38,7 @@
 %          {latex-team@latex-project.org}^^A
 %    }^^A
 % }
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-convert.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-convert.dtx
index 5bd0662a69b..9f2d3dd301e 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3fp-convert.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-convert.dtx
@@ -41,7 +41,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-expo.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-expo.dtx
index 7cd493a7eff..977536907da 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3fp-expo.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-expo.dtx
@@ -38,7 +38,7 @@
 %          {latex-team@latex-project.org}^^A
 %    }^^A
 % }
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-extended.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-extended.dtx
index 11e322406c8..a958e52fd54 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3fp-extended.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-extended.dtx
@@ -38,7 +38,7 @@
 %          {latex-team@latex-project.org}^^A
 %    }^^A
 % }
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-logic.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-logic.dtx
index f450cf17982..ebdd689c814 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3fp-logic.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-logic.dtx
@@ -38,7 +38,7 @@
 %          {latex-team@latex-project.org}^^A
 %    }^^A
 % }
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx
index dd473d12422..b4cc0a1cc39 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx
@@ -38,7 +38,7 @@
 %          {latex-team@latex-project.org}^^A
 %    }^^A
 % }
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-random.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-random.dtx
index d5f0d684729..2f2cb70885a 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3fp-random.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-random.dtx
@@ -38,7 +38,7 @@
 %          {latex-team@latex-project.org}^^A
 %    }^^A
 % }
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-round.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-round.dtx
index 610e8d60428..ea97dd98b0b 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3fp-round.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-round.dtx
@@ -41,7 +41,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-traps.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-traps.dtx
index 7baed58dc52..4ca1d34835f 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3fp-traps.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-traps.dtx
@@ -38,7 +38,7 @@
 %          {latex-team@latex-project.org}^^A
 %    }^^A
 % }
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 % \maketitle
 %
 % \begin{documentation}
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-trig.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-trig.dtx
index 165301268b0..4c23cd5a1bd 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3fp-trig.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-trig.dtx
@@ -38,7 +38,7 @@
 %          {latex-team@latex-project.org}^^A
 %    }^^A
 % }
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp.dtx
index 3c44cbd67b1..c1df08162ba 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3fp.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3fp.dtx
@@ -47,7 +47,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fparray.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fparray.dtx
index 199e53572cb..a1747691e6e 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3fparray.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3fparray.dtx
@@ -42,7 +42,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3int.dtx b/Master/texmf-dist/source/latex/l3kernel/l3int.dtx
index 4b75c60f836..2eab9ac07cd 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3int.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3int.dtx
@@ -41,7 +41,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3intarray.dtx b/Master/texmf-dist/source/latex/l3kernel/l3intarray.dtx
index 90d734c438a..66bc8ef79da 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3intarray.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3intarray.dtx
@@ -42,7 +42,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3kernel-functions.dtx b/Master/texmf-dist/source/latex/l3kernel/l3kernel-functions.dtx
index 17182172a5c..9edfafea2fe 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3kernel-functions.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3kernel-functions.dtx
@@ -41,7 +41,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3keys.dtx b/Master/texmf-dist/source/latex/l3kernel/l3keys.dtx
index 16e295be511..86a9f85d83d 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3keys.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3keys.dtx
@@ -41,7 +41,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx b/Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx
index 65419364c8b..08c08e36959 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx
@@ -41,7 +41,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx b/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx
index 9db8122bd5a..7cc3c08adca 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx
@@ -41,7 +41,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3names.dtx b/Master/texmf-dist/source/latex/l3kernel/l3names.dtx
index 52cb56d61b6..bf1c4ae7a13 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3names.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3names.dtx
@@ -41,7 +41,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3oldmodules.dtx b/Master/texmf-dist/source/latex/l3kernel/l3oldmodules.dtx
index 6bf16f942fe..98a45d94e4e 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3oldmodules.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3oldmodules.dtx
@@ -42,7 +42,7 @@
 % }
 %
 %
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx b/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx
index 6717b23a484..cbfb7dcbaa8 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx
@@ -41,7 +41,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3prop.dtx b/Master/texmf-dist/source/latex/l3kernel/l3prop.dtx
index 7ac71b02a67..24d0a73f719 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3prop.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3prop.dtx
@@ -41,7 +41,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3quark.dtx b/Master/texmf-dist/source/latex/l3kernel/l3quark.dtx
index 612e1ab8af4..06253f2ffa4 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3quark.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3quark.dtx
@@ -41,7 +41,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3regex.dtx b/Master/texmf-dist/source/latex/l3kernel/l3regex.dtx
index 859763a12fb..6b80bc04a54 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3regex.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3regex.dtx
@@ -41,7 +41,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3seq.dtx b/Master/texmf-dist/source/latex/l3kernel/l3seq.dtx
index 50c909a6d30..5816accc113 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3seq.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3seq.dtx
@@ -41,7 +41,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx b/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx
index c3bbead79ac..15510bc4f7d 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx
@@ -42,7 +42,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx b/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx
index 9afcc51901d..782f29db804 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx
@@ -41,7 +41,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3str.dtx b/Master/texmf-dist/source/latex/l3kernel/l3str.dtx
index 94bafe7e20e..c224b6ee7c2 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3str.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3str.dtx
@@ -41,7 +41,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3sys.dtx b/Master/texmf-dist/source/latex/l3kernel/l3sys.dtx
index d40ff5ea8d1..466879a6bfe 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3sys.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3sys.dtx
@@ -41,7 +41,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3tl-analysis.dtx b/Master/texmf-dist/source/latex/l3kernel/l3tl-analysis.dtx
index df13705a842..333ac305019 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3tl-analysis.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3tl-analysis.dtx
@@ -42,7 +42,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx b/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx
index 40fb555658c..a32790d0ec5 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx
@@ -41,7 +41,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3token.dtx b/Master/texmf-dist/source/latex/l3kernel/l3token.dtx
index 1b2213a24bd..409115970f3 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3token.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3token.dtx
@@ -41,7 +41,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3unicode.dtx b/Master/texmf-dist/source/latex/l3kernel/l3unicode.dtx
index 0e6dcc47b9e..9ce0f9e31c5 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3unicode.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3unicode.dtx
@@ -41,7 +41,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2018-05-12}
+% \date{Released 2018-05-13}
 %
 % \maketitle
 %
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