l3 (20dec15)

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

1 files changed, 6 insertions, 18 deletions

diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
index 9757a20e523..77d2883700c 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
@@ -45,16 +45,16 @@
 %%   prior consultation with the LaTeX3 Project.
 %%
 %% -----------------------------------------------------------------------
-\def\ExplFileName{expl3}
-\def\ExplFileDescription{L3 programming layer}
-\def\ExplFileDate{2015/11/04}
-\def\ExplFileVersion{6224}
+\def\ExplFileName{expl3}%
+\def\ExplFileDescription{L3 programming layer}%
+\def\ExplFileDate{2015/12/20}%
+\def\ExplFileVersion{6326}%
 \let\ExplLoaderFileVersion\ExplFileVersion
 \ProvidesPackage{\ExplFileName}
   [%
     \ExplFileDate\space v\ExplFileVersion\space
     \ExplFileDescription\space (loader)
-  ]
+  ]%
 \newcommand\expl@create@bool@option[2]%
   {%
     \DeclareOption{#1}{\chardef #2=1 }%
@@ -222,19 +222,6 @@
     log-functions      .bool_set:N = \l@expl@log@functions@bool
   }
 \keys_set:nV { expl } \l@expl@options@clist
-\tl_const:Nn \c__expl_def_ext_tl { def }
-\group_begin:
-\cs_set_protected:Npn \ProvidesExplFile
-  {
-    \char_set_catcode_space:n { `\  }
-    \ProvidesExplFileAux
-  }
-\cs_set_protected:Npn \ProvidesExplFileAux #1#2#3#4
-  {
-    \group_end:
-    \ProvidesFile {#1} [ #2~v#3~#4 ]
-  }
-\@onefilewithoptions { l3unicode-data } [ ] [ ] \c__expl_def_ext_tl
 \str_if_eq:VnTF \l__expl_driver_tl { latex2e }
   {
     \tl_gput_left:Nn \@begindocumenthook { \RequirePackage { graphics } }
@@ -299,6 +286,7 @@
         \group_end:
         \ProvidesFile {#1} [ #2~v#3~#4 ]
       }
+    \tl_const:Nn \c__expl_def_ext_tl { def }
     \@onefilewithoptions { l3 \l__expl_driver_tl } [ ] [ ] \c__expl_def_ext_tl
   }
 \tl_put_left:Nn \@pushfilename