l3

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

48 files changed, 127 insertions, 208 deletions

diff --git a/Master/texmf-dist/tex/latex/l3build/l3build.lua b/Master/texmf-dist/tex/latex/l3build/l3build.lua
index 7d218d08274..b3d55b0fb00 100644
--- a/Master/texmf-dist/tex/latex/l3build/l3build.lua
+++ b/Master/texmf-dist/tex/latex/l3build/l3build.lua
@@ -23,8 +23,7 @@ for those people who are interested.
 --]]
 
 -- Version information: should be identical to that in l3build.dtx
-release_date = "2017/03/18"
-release_ver  = "7019"
+release_date = "2017/04/01"
 
 -- "module" is a deprecated function in Lua 5.2: as we want the name
 -- for other purposes, and it should eventually be 'free', simply
@@ -410,7 +409,12 @@ if os.type == "windows" then
   os_diffext  = os.getenv("diffext") or ".fc"
   os_diffexe  = os.getenv("diffexe") or "fc /n"
   os_grepexe  = "findstr /r"
-  os_newline  = "\r\n"
+  os_newline  = "\n"
+  if tonumber(status.luatex_version) < 100 or
+     (tonumber(status.luatex_version) == 100
+       and tonumber(status.luatex_revision) < 4) then
+    os_newline = "\r\n"
+  end
   os_null     = "nul"
   os_pathsep  = ";"
   os_setenv   = "set"
@@ -867,7 +871,11 @@ function formatlog(logfile, newfile, engine)
   local newlog = ""
   local prestart = true
   local skipping = false
-  for line in io.lines(logfile) do
+  -- Read the entire log file as a binary: deals with ^@/^[, etc.
+  local file = assert(io.open(logfile, "rb"))
+  local contents = string.gsub(file:read("*all") .. "\n", "\r\n", "\n")
+  io.close(file)
+  for line in string.gmatch(contents, "([^\n]*)\n") do
     if line == "START-TEST-LOG" then
       prestart = false
     elseif line == "END-TEST-LOG" then
@@ -1060,7 +1068,11 @@ function formatlualog(logfile, newfile)
   local newlog = ""
   local lastline = ""
   local dropping = false
-  for line in io.lines(logfile) do
+  -- Read the entire log file as a binary: deals with ^@/^[, etc.
+  local file = assert(io.open(logfile, "rb"))
+  local contents = string.gsub(file:read("*all") .. "\n", "\r\n", "\n")
+  io.close(file)
+  for line in string.gmatch(contents, "([^\n]*)\n") do
     line, lastline, dropping = normalize(line, lastline, dropping)
     if not string.match(line, "^ *$") then
       newlog = newlog .. line .. os_newline
@@ -2095,8 +2107,7 @@ end
 function version()
   print(
     "\n"
-    .. "l3build Release " .. string.gsub(release_date, "/", "-")
-    .. " (SVN r" .. release_ver .. ")\n"
+    .. "l3build Release " .. string.gsub(release_date, "/", "-") .. "\n"
   )
 end
 
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty
index bb5b3661e3a..e74c484390d 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty
@@ -19,8 +19,8 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: l3regex.dtx Copyright (C) 2011-2017 The LaTeX3 Project
-\RequirePackage{expl3}[2017/03/18]
-\@ifpackagelater{expl3}{2017/03/18}
+\RequirePackage{expl3}[2017/04/01]
+\@ifpackagelater{expl3}{2017/04/01}
   {}
   {%
     \PackageError{l3regex}{Support package l3kernel too old}
@@ -32,9 +32,7 @@
       }%
     \endinput
   }
-\def\ExplFileDate{2017/03/18}
-\def\ExplFileVersion{7019}
-\ProvidesExplPackage{l3regex}{\ExplFileDate}{\ExplFileVersion}
+\ProvidesExplPackage{l3regex}{2017/04/01}{}
   {L3 Experimental regular expressions}
 \RequirePackage{l3tl-build, l3tl-analysis, l3str-convert}
 \cs_generate_variant:Nn \tl_to_str:n { V }
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty
index f782f164edc..671cb91fc11 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty
@@ -19,8 +19,8 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: l3regex.dtx Copyright (C) 2011-2017 The LaTeX3 Project
-\RequirePackage{expl3}[2017/03/18]
-\@ifpackagelater{expl3}{2017/03/18}
+\RequirePackage{expl3}[2017/04/01]
+\@ifpackagelater{expl3}{2017/04/01}
   {}
   {%
     \PackageError{l3regex}{Support package l3kernel too old}
@@ -32,9 +32,7 @@
       }%
     \endinput
   }
-\def\ExplFileDate{2017/03/18}
-\def\ExplFileVersion{7019}
-\ProvidesExplPackage{l3regex}{\ExplFileDate}{\ExplFileVersion}
+\ProvidesExplPackage{l3regex}{2017/04/01}{}
   {L3 Experimental regular expressions}
 \RequirePackage{l3tl-build, l3tl-analysis, l3str-convert}
 \cs_generate_variant:Nn \tl_to_str:n { V }
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-convert.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-convert.sty
index d8b02098d46..d7998754945 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-convert.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-convert.sty
@@ -20,9 +20,7 @@
 %% 
 %% File: l3str-convert.dtx Copyright (C) 2013-2017 The LaTeX3 Project
 \RequirePackage{expl3}
-\def\ExplFileDate{2017/03/18}
-\def\ExplFileVersion{7019}
-\ProvidesExplPackage{l3str-convert}{\ExplFileDate}{\ExplFileVersion}
+\ProvidesExplPackage{l3str-convert}{2017/04/01}{}
   {L3 Experimental string encoding conversions}
 \RequirePackage{l3tl-analysis,l3tl-build}
 \cs_if_exist:NF \use_ii_i:nn
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty
index 0dbc633a0be..8c2f7a98001 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty
@@ -20,9 +20,7 @@
 %% 
 %% File: l3str-format.dtx Copyright (C) 2012-2013,2015-2017 The LaTeX3 Project
 \RequirePackage{expl3}
-\def\ExplFileDate{2017/03/18}
-\def\ExplFileVersion{7019}
-\ProvidesExplPackage{l3str-format}{\ExplFileDate}{\ExplFileVersion}
+\ProvidesExplPackage{l3str-format}{2017/04/01}{}
   {L3 Experimental string formatting}
 \RequirePackage{l3str}
 \cs_generate_variant:Nn \use:nn { nf }
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-analysis.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-analysis.sty
index 16aa9c146a3..0a8ca847851 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-analysis.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-analysis.sty
@@ -20,9 +20,7 @@
 %% 
 %% File: l3tl-analysis.dtx Copyright (C) 2011-2012,2015-2017 The LaTeX3 Project
 \RequirePackage{expl3}
-\def\ExplFileDate{2017/03/18}
-\def\ExplFileVersion{7019}
-\ProvidesExplPackage{l3tl-analysis}{\ExplFileDate}{\ExplFileVersion}
+\ProvidesExplPackage{l3tl-analysis}{2017/04/01}{}
   {L3 Experimental token list analysis}
 \__scan_new:N \s__tl
 \tl_new:N \l__tl_analysis_internal_tl
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-build.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-build.sty
index c7987f43006..a176d86fde3 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-build.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-build.sty
@@ -19,8 +19,8 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: l3tl-build.dtx Copyright (C) 2011-2017 The LaTeX3 Project
-\RequirePackage{expl3}[2017/03/18]
-\@ifpackagelater{expl3}{2017/03/18}
+\RequirePackage{expl3}[2017/04/01]
+\@ifpackagelater{expl3}{2017/04/01}
   {}
   {%
     \PackageError{l3tl-build}{Support package l3kernel too old}
@@ -32,9 +32,7 @@
       }%
     \endinput
   }
-\def\ExplFileDate{2017/03/18}
-\def\ExplFileVersion{7019}
-\ProvidesExplPackage{l3tl-build}{\ExplFileDate}{\ExplFileVersion}
+\ProvidesExplPackage{l3tl-build}{2017/04/01}{}
   {L3 Experimental token list construction}
 \int_new:N \l__tl_build_start_index_int
 \int_new:N \l__tl_build_index_int
diff --git a/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty b/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty
index b127c878522..9df0824a280 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty
@@ -20,9 +20,7 @@
 %% 
 %% File: xcoffins.dtx Copyright(C) 2010-2012,2014,2016,2017 The LaTeX3 Project
 \RequirePackage{xparse}
-\def\ExplFileDate{2017/03/18}
-\def\ExplFileVersion{7019}
-\ProvidesExplPackage{xcoffins}{\ExplFileDate}{\ExplFileVersion}
+\ProvidesExplPackage{xcoffins}{2017/04/01}{}
   {L3 Experimental design level coffins}
 \keys_define:nn { coffin }
   {
diff --git a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
index 9cc00bcf77a..6318649f93e 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
@@ -20,8 +20,8 @@
 %% 
 %% File: l3galley.dtx Copyright (C) 1999-2001, 2004-2009 Frank Mittelbach
 %%                              (C) 2010-2017 The LaTeX3 Project
-\RequirePackage{expl3}[2017/03/18]
-\@ifpackagelater{expl3}{2017/03/18}
+\RequirePackage{expl3}[2017/04/01]
+\@ifpackagelater{expl3}{2017/04/01}
   {}
   {%
     \PackageError{l3galley}{Support package l3kernel too old}
@@ -33,9 +33,7 @@
       }%
     \endinput
   }
-\def\ExplFileDate{2017/03/18}
-\def\ExplFileVersion{7019}
-\ProvidesExplPackage{l3galley}{\ExplFileDate}{\ExplFileVersion}
+\ProvidesExplPackage{l3galley}{2017/04/01}{}
   {L3 Experimental galley code}
 \int_new:N \l__galley_tmp_int
 \seq_new:N \g__galley_tmpa_seq
diff --git a/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty b/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty
index cc7a85be44e..8027687f2eb 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty
@@ -21,9 +21,7 @@
 %% File: xgalley.dtx Copyright (C) 1999-2001, 2004-2009 Frank Mittelbach
 %%                             (C) 2010-2012,2014,2016-2017 The LaTeX3 Project
 \RequirePackage{xparse}
-\def\ExplFileDate{2017/03/18}
-\def\ExplFileVersion{7019}
-\ProvidesExplPackage{xgalley}{\ExplFileDate}{\ExplFileVersion}
+\ProvidesExplPackage{xgalley}{2017/04/01}{}
   {L3 Experimental galley}
 \RequirePackage{xparse,xtemplate,l3galley}
 \clist_new:N \l__galley_tmpa_clist
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
index 99c00c3f9e3..f0604e11f7c 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
@@ -58,8 +58,7 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: expl3.dtx Copyright (C) 1990-2017 The LaTeX3 Project
-\def\ExplFileDate{2017/03/18}%
-\def\ExplFileVersion{7019}%
+\def\ExplFileDate{2017/04/01}%
 \begingroup
   \def\next{\endgroup}%
   \expandafter\ifx\csname PackageError\endcsname\relax
@@ -72,7 +71,7 @@
           \errmessage{#1 Error: #2!}%
         }%
   \fi
-  \expandafter\ifx\csname ExplLoaderFileVersion\endcsname\relax
+  \expandafter\ifx\csname ExplLoaderFileDate\endcsname\relax
     \def\next
       {%
         \PackageError{expl3}{No expl3 loader detected}
@@ -84,7 +83,7 @@
         \endinput
       }
   \else
-    \ifx\ExplLoaderFileVersion\ExplFileVersion
+    \ifx\ExplLoaderFileDate\ExplFileDate
     \else
       \def\next
         {%
@@ -104,7 +103,7 @@
 \expandafter\ifx\csname ver@expl3-code.tex\endcsname\relax
   \expandafter\edef\csname ver@expl3-code.tex\endcsname
     {%
-      \ExplFileDate\space v\ExplFileVersion\space
+      \ExplFileDate\space
       L3 programming layer
     }%
 \else
@@ -113,7 +112,7 @@
 \immediate\write-1 %
   {%
     Package: expl3
-      \ExplFileDate\space v\ExplFileVersion\space
+      \ExplFileDate\space
       L3 programming layer (code)%
   }%
 %% File: l3bootstrap.dtx Copyright (C) 2011-2017 The LaTeX3 project
@@ -929,6 +928,7 @@
   \__kernel_primitive:NN \aligntab                    \luatex_aligntab:D
   \__kernel_primitive:NN \attribute                   \luatex_attribute:D
   \__kernel_primitive:NN \attributedef                \luatex_attributedef:D
+  \__kernel_primitive:NN \automatichyphenpenalty      \luatex_automatichyphenpenalty:D
   \__kernel_primitive:NN \begincsname                 \luatex_begincsname:D
   \__kernel_primitive:NN \catcodetable                \luatex_catcodetable:D
   \__kernel_primitive:NN \clearmarks                  \luatex_clearmarks:D
@@ -942,6 +942,7 @@
   \__kernel_primitive:NN \dvivariable                 \luatex_dvivariable:D
   \__kernel_primitive:NN \etoksapp                    \luatex_etoksapp:D
   \__kernel_primitive:NN \etokspre                    \luatex_etokspre:D
+  \__kernel_primitive:NN \explicithyphenpenalty       \luatex_explicithyphenpenalty:D
   \__kernel_primitive:NN \expanded                    \luatex_expanded:D
   \__kernel_primitive:NN \firstvalidlanguage          \luatex_firstvalidlanguage:D
   \__kernel_primitive:NN \fontid                      \luatex_fontid:D
@@ -950,6 +951,7 @@
   \__kernel_primitive:NN \hpack                       \luatex_hpack:D
   \__kernel_primitive:NN \hyphenationbounds           \luatex_hyphenationbounds:D
   \__kernel_primitive:NN \hyphenationmin              \luatex_hyphenationmin:D
+  \__kernel_primitive:NN \hyphenpenaltymode           \luatex_hyphenpenaltymode:D
   \__kernel_primitive:NN \gleaders                    \luatex_gleaders:D
   \__kernel_primitive:NN \initcatcodetable            \luatex_initcatcodetable:D
   \__kernel_primitive:NN \lastnamedcs                 \luatex_lastnamedcs:D
@@ -5809,6 +5811,36 @@
   { % (
     \__bool_eval_skip_to_end_auxi:Nw #1#3 )
   }
+\prg_new_conditional:Npnn \bool_lazy_all:n #1 { p , T , F , TF }
+  { \__bool_lazy_all:n #1 \q_recursion_tail \q_recursion_stop }
+\cs_new:Npn \__bool_lazy_all:n #1
+  {
+    \quark_if_recursion_tail_stop_do:nn {#1} { \prg_return_true: }
+    \bool_if:nF {#1}
+      { \use_i_delimit_by_q_recursion_stop:nw { \prg_return_false: } }
+    \__bool_lazy_all:n
+  }
+\prg_new_conditional:Npnn \bool_lazy_and:nn #1#2 { p , T , F , TF }
+  {
+    \bool_if:nTF {#1}
+      { \bool_if:nTF {#2} { \prg_return_true: } { \prg_return_false: } }
+      { \prg_return_false: }
+  }
+\prg_new_conditional:Npnn \bool_lazy_any:n #1 { p , T , F , TF }
+  { \__bool_lazy_any:n #1 \q_recursion_tail \q_recursion_stop }
+\cs_new:Npn \__bool_lazy_any:n #1
+  {
+    \quark_if_recursion_tail_stop_do:nn {#1} { \prg_return_false: }
+    \bool_if:nT {#1}
+      { \use_i_delimit_by_q_recursion_stop:nw { \prg_return_true: } }
+    \__bool_lazy_any:n
+  }
+\prg_new_conditional:Npnn \bool_lazy_or:nn #1#2 { p , T , F , TF }
+  {
+    \bool_if:nTF {#1}
+      { \prg_return_true: }
+      { \bool_if:nTF {#2} { \prg_return_true: } { \prg_return_false: } }
+  }
 \cs_new:Npn \bool_not_p:n #1 { \bool_if_p:n { ! ( #1 ) } }
 \cs_new:Npn \bool_xor_p:nn #1#2
   {
@@ -18107,36 +18139,6 @@
     \exp_after:wN \use_none_delimit_by_q_stop:w
     \use:n { \::error ! ~ #2 : ~ #1 } \q_stop
   }
-\prg_new_conditional:Npnn \bool_lazy_all:n #1 { p , T , F , TF }
-  { \__bool_lazy_all:n #1 \q_recursion_tail \q_recursion_stop }
-\cs_new:Npn \__bool_lazy_all:n #1
-  {
-    \quark_if_recursion_tail_stop_do:nn {#1} { \prg_return_true: }
-    \bool_if:nF {#1}
-      { \use_i_delimit_by_q_recursion_stop:nw { \prg_return_false: } }
-    \__bool_lazy_all:n
-  }
-\prg_new_conditional:Npnn \bool_lazy_and:nn #1#2 { p , T , F , TF }
-  {
-    \bool_if:nTF {#1}
-      { \bool_if:nTF {#2} { \prg_return_true: } { \prg_return_false: } }
-      { \prg_return_false: }
-  }
-\prg_new_conditional:Npnn \bool_lazy_any:n #1 { p , T , F , TF }
-  { \__bool_lazy_any:n #1 \q_recursion_tail \q_recursion_stop }
-\cs_new:Npn \__bool_lazy_any:n #1
-  {
-    \quark_if_recursion_tail_stop_do:nn {#1} { \prg_return_false: }
-    \bool_if:nT {#1}
-      { \use_i_delimit_by_q_recursion_stop:nw { \prg_return_true: } }
-    \__bool_lazy_any:n
-  }
-\prg_new_conditional:Npnn \bool_lazy_or:nn #1#2 { p , T , F , TF }
-  {
-    \bool_if:nTF {#1}
-      { \prg_return_true: }
-      { \bool_if:nTF {#2} { \prg_return_true: } { \prg_return_false: } }
-  }
 \cs_new:Npn \prop_count:N #1
   {
     \int_eval:n
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
index 4a963470869..d219cea798d 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
@@ -19,9 +19,8 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: expl3.dtx Copyright (C) 1990-2017 The LaTeX3 Project
-\def\ExplFileDate{2017/03/18}%
-\def\ExplFileVersion{7019}%
-\let\ExplLoaderFileVersion\ExplFileVersion
+\def\ExplFileDate{2017/04/01}%
+\let\ExplLoaderFileDate\ExplFileDate
 \begingroup
   \def\tempa{LaTeX2e}%
   \def\next{}%
@@ -46,11 +45,11 @@
 \immediate\write-1
   {%
     Package: expl3
-    \ExplFileDate\space v\ExplFileVersion\space
+    \ExplFileDate\space
     L3 programming layer (loader)%
   }%
 \expandafter\edef\csname ver@expl3-generic.tex\endcsname
-  {\ExplFileDate\space v\ExplFileVersion\space L3 programming layer}%
+  {\ExplFileDate\space L3 programming layer}%
 \expandafter\edef\csname l@expl@tidy@tl\endcsname
   {%
     \catcode64=\the\catcode64\relax
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
index f5e9fc4e40f..b72e6e3ac4b 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
@@ -19,12 +19,11 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: expl3.dtx Copyright (C) 1990-2017 The LaTeX3 Project
-\def\ExplFileDate{2017/03/18}%
-\def\ExplFileVersion{7019}%
-\let\ExplLoaderFileVersion\ExplFileVersion
+\def\ExplFileDate{2017/04/01}%
+\let\ExplLoaderFileDate\ExplFileDate
 \ProvidesPackage{expl3}
   [%
-    \ExplFileDate\space v\ExplFileVersion\space
+    \ExplFileDate\space
     L3 programming layer (loader)
   ]%
 \newcommand\expl@create@bool@option[2]%
@@ -53,17 +52,17 @@
 \ProcessOptions\relax
 \protected\def\ProvidesExplPackage#1#2#3#4%
   {%
-    \ProvidesPackage{#1}[#2 v#3 #4]%
+    \ProvidesPackage{#1}[#2 \ifx\relax#3\relax\else v#3\space\fi #4]%
     \ExplSyntaxOn
   }
 \protected\def\ProvidesExplClass#1#2#3#4%
   {%
-    \ProvidesClass{#1}[#2 v#3 #4]%
+    \ProvidesClass{#1}[#2 \ifx\relax#3\relax\else v#3\space\fi #4]%
     \ExplSyntaxOn
   }
 \protected\def\ProvidesExplFile#1#2#3#4%
   {%
-    \ProvidesFile{#1}[#2 v#3 #4]%
+    \ProvidesFile{#1}[#2 \ifx\relax#3\relax\else v#3\space\fi #4]%
     \ExplSyntaxOn
   }
 \input{expl3-code.tex}
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty b/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty
index d8acdbed580..ecc4ec63d8b 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty
@@ -19,13 +19,11 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
-\def\ExplFileDate{2017/03/18}
 \def\old@liii@module@name
 {l3basics}
 \ProvidesPackage\old@liii@module@name
   [%
-    \ExplFileDate\space v-no-info
-    Obsolete L3 package
+    2017/03/18 Obsolete L3 package
   ]
 \typeout{*****************************************************************}
 \typeout{** }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3bootstrap.sty b/Master/texmf-dist/tex/latex/l3kernel/l3bootstrap.sty
index 8555b517dc8..5802b76351d 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3bootstrap.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3bootstrap.sty
@@ -19,13 +19,11 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
-\def\ExplFileDate{2017/03/18}
 \def\old@liii@module@name
 {l3bootstrap}
 \ProvidesPackage\old@liii@module@name
   [%
-    \ExplFileDate\space v-no-info
-    Obsolete L3 package
+    2017/03/18 Obsolete L3 package
   ]
 \typeout{*****************************************************************}
 \typeout{** }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3box.sty b/Master/texmf-dist/tex/latex/l3kernel/l3box.sty
index 7fd4c58fba7..e97f3c82e8a 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3box.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3box.sty
@@ -19,13 +19,11 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
-\def\ExplFileDate{2017/03/18}
 \def\old@liii@module@name
 {l3box}
 \ProvidesPackage\old@liii@module@name
   [%
-    \ExplFileDate\space v-no-info
-    Obsolete L3 package
+    2017/03/18 Obsolete L3 package
   ]
 \typeout{*****************************************************************}
 \typeout{** }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3candidates.sty b/Master/texmf-dist/tex/latex/l3kernel/l3candidates.sty
index f6d6c1ba1e5..3e9cc1ca2a0 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3candidates.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3candidates.sty
@@ -19,13 +19,11 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
-\def\ExplFileDate{2017/03/18}
 \def\old@liii@module@name
 {l3candidates}
 \ProvidesPackage\old@liii@module@name
   [%
-    \ExplFileDate\space v-no-info
-    Obsolete L3 package
+    2017/03/18 Obsolete L3 package
   ]
 \typeout{*****************************************************************}
 \typeout{** }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3clist.sty b/Master/texmf-dist/tex/latex/l3kernel/l3clist.sty
index 91f96a31976..448c5e6416c 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3clist.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3clist.sty
@@ -19,13 +19,11 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
-\def\ExplFileDate{2017/03/18}
 \def\old@liii@module@name
 {l3clist}
 \ProvidesPackage\old@liii@module@name
   [%
-    \ExplFileDate\space v-no-info
-    Obsolete L3 package
+    2017/03/18 Obsolete L3 package
   ]
 \typeout{*****************************************************************}
 \typeout{** }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3coffins.sty b/Master/texmf-dist/tex/latex/l3kernel/l3coffins.sty
index 30f183f5d0e..8402a41fea2 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3coffins.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3coffins.sty
@@ -19,13 +19,11 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
-\def\ExplFileDate{2017/03/18}
 \def\old@liii@module@name
 {l3coffins}
 \ProvidesPackage\old@liii@module@name
   [%
-    \ExplFileDate\space v-no-info
-    Obsolete L3 package
+    2017/03/18 Obsolete L3 package
   ]
 \typeout{*****************************************************************}
 \typeout{** }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3color.sty b/Master/texmf-dist/tex/latex/l3kernel/l3color.sty
index 170fcb5324a..b40efec230e 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3color.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3color.sty
@@ -19,13 +19,11 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
-\def\ExplFileDate{2017/03/18}
 \def\old@liii@module@name
 {l3color}
 \ProvidesPackage\old@liii@module@name
   [%
-    \ExplFileDate\space v-no-info
-    Obsolete L3 package
+    2017/03/18 Obsolete L3 package
   ]
 \typeout{*****************************************************************}
 \typeout{** }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls b/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls
index 3f34f8a113f..7282e860ae8 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls
@@ -19,15 +19,9 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: l3doc.dtx Copyright (C) 1990-2017 The LaTeX3 project
-\let        \filedateOld        \ExplFileDate
-\let     \fileversionOld        \ExplFileVersion
 \RequirePackage{expl3,xparse,calc}
-\def\ExplFileDate{2017/03/18}
-\def\ExplFileVersion{7019}
-\ProvidesExplClass{l3doc}{\ExplFileDate}{\ExplFileVersion}
+\ProvidesExplClass{l3doc}{2017/04/01}{}
   {L3 Experimental documentation class}
-\let        \ExplFileDate        \filedateOld
-\let        \ExplFileVersion     \fileversionOld
 \clist_new:N \g_docinput_clist
 \seq_new:N \g_doc_functions_seq
 \seq_new:N \g_doc_macros_seq
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3docstrip.tex b/Master/texmf-dist/tex/latex/l3kernel/l3docstrip.tex
index c357fd7c80a..ce36a54a4ec 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3docstrip.tex
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3docstrip.tex
@@ -19,8 +19,6 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File l3dosctrip.dtx Copyright (C) 2012,2016,2017 The LaTeX3 Project
-\def\ExplFileDate{2017/03/18}
-\def\ExplFileVersion{7019}
 \input docstrip %
 \def\checkOption<#1{%
   \ifcase
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def b/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def
index 671b5a044d2..421757e959a 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def
@@ -19,10 +19,8 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: l3drivers.dtx Copyright(C) 2011-2017 The LaTeX3 Project
-\def\ExplFileDate{2017/03/18}
-\def\ExplFileVersion{7019}
 \ProvidesExplFile
-  {l3dvidpfmx.def}{\ExplFileDate}{\ExplFileVersion}
+  {l3dvidpfmx.def}{2017/03/18}{}
   {L3 Experimental driver: dvipdfmx}
 \cs_new_protected:Npn \__driver_literal:n #1
   { \tex_special:D { pdf:literal~ #1 } }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def b/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def
index 690e0f23169..c28613a5c00 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def
@@ -19,10 +19,8 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: l3drivers.dtx Copyright(C) 2011-2017 The LaTeX3 Project
-\def\ExplFileDate{2017/03/18}
-\def\ExplFileVersion{7019}
 \ProvidesExplFile
-  {l3dvips.def}{\ExplFileDate}{\ExplFileVersion}
+  {l3dvips.def}{2017/03/18}{}
   {L3 Experimental driver: dvips}
 \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 12784d943c1..2fdbc9d5dbd 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3dvisvgm.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3dvisvgm.def
@@ -19,10 +19,8 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: l3drivers.dtx Copyright(C) 2011-2017 The LaTeX3 Project
-\def\ExplFileDate{2017/03/18}
-\def\ExplFileVersion{7019}
 \ProvidesExplFile
-  {l3dvisvgm.def}{\ExplFileDate}{\ExplFileVersion}
+  {l3dvisvgm.def}{2017/03/18}{}
   {L3 Experimental driver: dvisvgm}
 \cs_new_protected:Npn \__driver_literal:n #1
   { \tex_special:D { dvisvgm:raw~ #1 { ?nl } } }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3expan.sty b/Master/texmf-dist/tex/latex/l3kernel/l3expan.sty
index 40b9a4ce3e2..1384b917ae2 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3expan.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3expan.sty
@@ -19,13 +19,11 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
-\def\ExplFileDate{2017/03/18}
 \def\old@liii@module@name
 {l3expan}
 \ProvidesPackage\old@liii@module@name
   [%
-    \ExplFileDate\space v-no-info
-    Obsolete L3 package
+    2017/03/18 Obsolete L3 package
   ]
 \typeout{*****************************************************************}
 \typeout{** }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3file.sty b/Master/texmf-dist/tex/latex/l3kernel/l3file.sty
index c0be015254c..1d304be09b0 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3file.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3file.sty
@@ -19,13 +19,11 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
-\def\ExplFileDate{2017/03/18}
 \def\old@liii@module@name
 {l3file}
 \ProvidesPackage\old@liii@module@name
   [%
-    \ExplFileDate\space v-no-info
-    Obsolete L3 package
+    2017/03/18 Obsolete L3 package
   ]
 \typeout{*****************************************************************}
 \typeout{** }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3fp.sty b/Master/texmf-dist/tex/latex/l3kernel/l3fp.sty
index ef82a4fb713..b0db3df4086 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3fp.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3fp.sty
@@ -19,13 +19,11 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
-\def\ExplFileDate{2017/03/18}
 \def\old@liii@module@name
 {l3fp}
 \ProvidesPackage\old@liii@module@name
   [%
-    \ExplFileDate\space v-no-info
-    Obsolete L3 package
+    2017/03/18 Obsolete L3 package
   ]
 \typeout{*****************************************************************}
 \typeout{** }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3int.sty b/Master/texmf-dist/tex/latex/l3kernel/l3int.sty
index 10eb3bcc2f9..39f59525ccd 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3int.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3int.sty
@@ -19,13 +19,11 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
-\def\ExplFileDate{2017/03/18}
 \def\old@liii@module@name
 {l3int}
 \ProvidesPackage\old@liii@module@name
   [%
-    \ExplFileDate\space v-no-info
-    Obsolete L3 package
+    2017/03/18 Obsolete L3 package
   ]
 \typeout{*****************************************************************}
 \typeout{** }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3keys.sty b/Master/texmf-dist/tex/latex/l3kernel/l3keys.sty
index 43011e63129..6bf04e91edf 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3keys.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3keys.sty
@@ -19,13 +19,11 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
-\def\ExplFileDate{2017/03/18}
 \def\old@liii@module@name
 {l3keys}
 \ProvidesPackage\old@liii@module@name
   [%
-    \ExplFileDate\space v-no-info
-    Obsolete L3 package
+    2017/03/18 Obsolete L3 package
   ]
 \typeout{*****************************************************************}
 \typeout{** }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty b/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty
index 29aaa04fa60..5f56f117b47 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty
@@ -19,13 +19,11 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
-\def\ExplFileDate{2017/03/18}
 \def\old@liii@module@name
 {l3msg}
 \ProvidesPackage\old@liii@module@name
   [%
-    \ExplFileDate\space v-no-info
-    Obsolete L3 package
+    2017/03/18 Obsolete L3 package
   ]
 \typeout{*****************************************************************}
 \typeout{** }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3names.sty b/Master/texmf-dist/tex/latex/l3kernel/l3names.sty
index db14da323a5..d3ed998a594 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3names.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3names.sty
@@ -19,13 +19,11 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
-\def\ExplFileDate{2017/03/18}
 \def\old@liii@module@name
 {l3names}
 \ProvidesPackage\old@liii@module@name
   [%
-    \ExplFileDate\space v-no-info
-    Obsolete L3 package
+    2017/03/18 Obsolete L3 package
   ]
 \typeout{*****************************************************************}
 \typeout{** }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def b/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def
index f21db61784d..c4e02851cbd 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def
@@ -19,10 +19,8 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: l3drivers.dtx Copyright(C) 2011-2017 The LaTeX3 Project
-\def\ExplFileDate{2017/03/18}
-\def\ExplFileVersion{7019}
 \ProvidesExplFile
-  {l3pdfmode.def}{\ExplFileDate}{\ExplFileVersion}
+  {l3pdfmode.def}{2017/03/18}{}
   {L3 Experimental driver: PDF mode}
 \cs_new_protected:Npx \__driver_literal:n #1
   {
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3prg.sty b/Master/texmf-dist/tex/latex/l3kernel/l3prg.sty
index 3b981245675..a17d2ea2240 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3prg.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3prg.sty
@@ -19,13 +19,11 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
-\def\ExplFileDate{2017/03/18}
 \def\old@liii@module@name
 {l3prg}
 \ProvidesPackage\old@liii@module@name
   [%
-    \ExplFileDate\space v-no-info
-    Obsolete L3 package
+    2017/03/18 Obsolete L3 package
   ]
 \typeout{*****************************************************************}
 \typeout{** }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3prop.sty b/Master/texmf-dist/tex/latex/l3kernel/l3prop.sty
index dda20c8bc8b..77f6d1baa0e 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3prop.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3prop.sty
@@ -19,13 +19,11 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
-\def\ExplFileDate{2017/03/18}
 \def\old@liii@module@name
 {l3prop}
 \ProvidesPackage\old@liii@module@name
   [%
-    \ExplFileDate\space v-no-info
-    Obsolete L3 package
+    2017/03/18 Obsolete L3 package
   ]
 \typeout{*****************************************************************}
 \typeout{** }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3quark.sty b/Master/texmf-dist/tex/latex/l3kernel/l3quark.sty
index c762c1376ca..11fb023c9f8 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3quark.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3quark.sty
@@ -19,13 +19,11 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
-\def\ExplFileDate{2017/03/18}
 \def\old@liii@module@name
 {l3quark}
 \ProvidesPackage\old@liii@module@name
   [%
-    \ExplFileDate\space v-no-info
-    Obsolete L3 package
+    2017/03/18 Obsolete L3 package
   ]
 \typeout{*****************************************************************}
 \typeout{** }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3seq.sty b/Master/texmf-dist/tex/latex/l3kernel/l3seq.sty
index 84de19a58cf..a37f41ed175 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3seq.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3seq.sty
@@ -19,13 +19,11 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
-\def\ExplFileDate{2017/03/18}
 \def\old@liii@module@name
 {l3seq}
 \ProvidesPackage\old@liii@module@name
   [%
-    \ExplFileDate\space v-no-info
-    Obsolete L3 package
+    2017/03/18 Obsolete L3 package
   ]
 \typeout{*****************************************************************}
 \typeout{** }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3skip.sty b/Master/texmf-dist/tex/latex/l3kernel/l3skip.sty
index 857f24cbfc1..0ecd47abf7a 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3skip.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3skip.sty
@@ -19,13 +19,11 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
-\def\ExplFileDate{2017/03/18}
 \def\old@liii@module@name
 {l3skip}
 \ProvidesPackage\old@liii@module@name
   [%
-    \ExplFileDate\space v-no-info
-    Obsolete L3 package
+    2017/03/18 Obsolete L3 package
   ]
 \typeout{*****************************************************************}
 \typeout{** }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3sort.sty b/Master/texmf-dist/tex/latex/l3kernel/l3sort.sty
index 15695d28116..618a56f4d66 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3sort.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3sort.sty
@@ -19,13 +19,11 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
-\def\ExplFileDate{2017/03/18}
 \def\old@liii@module@name
 {l3sort}
 \ProvidesPackage\old@liii@module@name
   [%
-    \ExplFileDate\space v-no-info
-    Obsolete L3 package
+    2017/03/18 Obsolete L3 package
   ]
 \typeout{*****************************************************************}
 \typeout{** }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3str.sty b/Master/texmf-dist/tex/latex/l3kernel/l3str.sty
index 8a9eddb49e0..d1e5a9b7512 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3str.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3str.sty
@@ -19,13 +19,11 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
-\def\ExplFileDate{2017/03/18}
 \def\old@liii@module@name
 {l3str}
 \ProvidesPackage\old@liii@module@name
   [%
-    \ExplFileDate\space v-no-info
-    Obsolete L3 package
+    2017/03/18 Obsolete L3 package
   ]
 \typeout{*****************************************************************}
 \typeout{** }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3tl.sty b/Master/texmf-dist/tex/latex/l3kernel/l3tl.sty
index 9d888a679cc..f3e6f71ab09 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3tl.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3tl.sty
@@ -19,13 +19,11 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
-\def\ExplFileDate{2017/03/18}
 \def\old@liii@module@name
 {l3tl}
 \ProvidesPackage\old@liii@module@name
   [%
-    \ExplFileDate\space v-no-info
-    Obsolete L3 package
+    2017/03/18 Obsolete L3 package
   ]
 \typeout{*****************************************************************}
 \typeout{** }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3token.sty b/Master/texmf-dist/tex/latex/l3kernel/l3token.sty
index 5621182916a..dfdf3bde38f 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3token.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3token.sty
@@ -19,13 +19,11 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
-\def\ExplFileDate{2017/03/18}
 \def\old@liii@module@name
 {l3token}
 \ProvidesPackage\old@liii@module@name
   [%
-    \ExplFileDate\space v-no-info
-    Obsolete L3 package
+    2017/03/18 Obsolete L3 package
   ]
 \typeout{*****************************************************************}
 \typeout{** }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def b/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def
index 63796a63121..53f51576a3c 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def
@@ -19,10 +19,8 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: l3drivers.dtx Copyright(C) 2011-2017 The LaTeX3 Project
-\def\ExplFileDate{2017/03/18}
-\def\ExplFileVersion{7019}
 \ProvidesExplFile
-  {l3xdvidpfmx.def}{\ExplFileDate}{\ExplFileVersion}
+  {l3xdvidpfmx.def}{2017/03/18}{}
   {L3 Experimental driver: xdvipdfmx}
 \cs_new_protected:Npn \__driver_literal:n #1
   { \tex_special:D { pdf:literal~ #1 } }
diff --git a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
index 6047fb45863..05598c500d7 100644
--- a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
@@ -19,8 +19,8 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: l3keys2e.dtx (C) Copyright 2009,2011-2017 The LaTeX3 Project
-\RequirePackage{expl3}[2017/03/18]
-\@ifpackagelater{expl3}{2017/03/18}
+\RequirePackage{expl3}[2017/04/01]
+\@ifpackagelater{expl3}{2017/04/01}
   {}
   {%
     \PackageError{l3keys2e}{Support package l3kernel too old}
@@ -32,9 +32,7 @@
       }%
     \endinput
   }
-\def\ExplFileDate{2017/03/18}
-\def\ExplFileVersion{7019}
-\ProvidesExplPackage{l3keys2e}{\ExplFileDate}{\ExplFileVersion}
+\ProvidesExplPackage{l3keys2e}{2017/04/01}{}
   {LaTeX2e option processing using LaTeX3 keys}
 \cs_generate_variant:Nn \clist_put_right:Nn { Nv }
 \cs_generate_variant:Nn \keys_if_exist:nnT  { nx }
diff --git a/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty b/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty
index 13a6bf6baf3..6d1e87919e3 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty
@@ -19,8 +19,8 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: xfp.dtx (C) Copyright 2017 The LaTeX3 Project
-\RequirePackage{expl3}[2017/03/18]
-\@ifpackagelater{expl3}{2017/03/18}
+\RequirePackage{expl3}[2017/04/01]
+\@ifpackagelater{expl3}{2017/04/01}
   {}
   {%
     \PackageError{xfpu}{Support package l3kernel too old}
@@ -33,9 +33,7 @@
     \endinput
   }
 \RequirePackage{xparse}
-\def\ExplFileDate{2017/03/18}
-\def\ExplFileVersion{7019}
-\ProvidesExplPackage{xfp}{\ExplFileDate}{\ExplFileVersion}
+\ProvidesExplPackage{xfp}{2017/04/01}{}
   {L3 Floating point unit}
 \NewExpandableDocumentCommand \fpeval { m } { \fp_eval:n {#1} }
 %% 
diff --git a/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty b/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty
index e3c154f47f7..0321ddae4c5 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty
@@ -20,8 +20,8 @@
 %% 
 %% File: xfrac.dtx Copyright (C) 2004, 2008-2010 Morten Hoegholm
 %%                           (C) 2011,2012,2014-2017 The LaTeX3 Project
-\RequirePackage{expl3}[2017/03/18]
-\@ifpackagelater{expl3}{2017/03/18}
+\RequirePackage{expl3}[2017/04/01]
+\@ifpackagelater{expl3}{2017/04/01}
   {}
   {%
     \PackageError{xfrac}{Support package l3kernel too old}
@@ -34,9 +34,7 @@
     \endinput
   }
 \RequirePackage{amstext,graphicx,l3keys2e,textcomp,xparse,xtemplate}
-\def\ExplFileDate{2017/03/18}
-\def\ExplFileVersion{7019}
-\ProvidesExplPackage{xfrac}{\ExplFileDate}{\ExplFileVersion}
+\ProvidesExplPackage{xfrac}{2017/04/01}{}
   {L3 Experimental split-level fractions}
 \keys_define:nn { xfrac }
   {
diff --git a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
index 33a8c34a06a..d266150d793 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
@@ -23,8 +23,8 @@
 %%                  (C) Copyright 2004-2008 Frank Mittelbach,
 %%                      The LaTeX3 Project
 %%                  (C) Copyright 2009-2017 The LaTeX3 Project
-\RequirePackage{expl3}[2017/03/18]
-\@ifpackagelater{expl3}{2017/03/18}
+\RequirePackage{expl3}[2017/04/01]
+\@ifpackagelater{expl3}{2017/04/01}
   {}
   {%
     \PackageError{xparse}{Support package l3kernel too old}
@@ -36,9 +36,7 @@
       }%
     \endinput
   }
-\def\ExplFileDate{2017/03/18}
-\def\ExplFileVersion{7019}
-\ProvidesExplPackage{xparse}{\ExplFileDate}{\ExplFileVersion}
+\ProvidesExplPackage{xparse}{2017/04/01}{}
   {L3 Experimental document command parser}
 \tl_const:Nx \c__xparse_no_value_tl
   { \char_generate:nn { `\- } { 11 } NoValue- }
diff --git a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
index e52dff4d266..d3a040d8b8d 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
@@ -23,8 +23,8 @@
 %%                     (C) Copyright 2004-2010 Frank Mittelbach,
 %%                         The LaTeX3 Project
 %%                     (C) Copyright 2011-2016 The LaTeX3 Project
-\RequirePackage{expl3}[2017/03/18]
-\@ifpackagelater{expl3}{2017/03/18}
+\RequirePackage{expl3}[2017/04/01]
+\@ifpackagelater{expl3}{2017/04/01}
   {}
   {%
     \PackageError{xtemplate}{Support package l3kernel too old}
@@ -36,9 +36,7 @@
       }%
     \endinput
   }
-\def\ExplFileDate{2017/03/18}
-\def\ExplFileVersion{7019}
-\ProvidesExplPackage{xtemplate}{\ExplFileDate}{\ExplFileVersion}
+\ProvidesExplPackage{xtemplate}{2017/04/01}{}
   {L3 Experimental prototype document functions}
 \tl_const:Nn \c__xtemplate_code_root_tl      { template~code~>~ }
 \tl_const:Nn \c__xtemplate_defaults_root_tl  { template~defaults~>~ }