l3

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

5 files changed, 30 insertions, 23 deletions

diff --git a/Master/texmf-dist/source/latex/l3experimental/l3sort/l3sort.dtx b/Master/texmf-dist/source/latex/l3experimental/l3sort/l3sort.dtx
index f51cd7dfea6..cfd7f977c8b 100644
--- a/Master/texmf-dist/source/latex/l3experimental/l3sort/l3sort.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/l3sort/l3sort.dtx
@@ -1,6 +1,6 @@
 % \iffalse
 %
-%% File l3sort.dtx (C) Copyright 2012,2014,2015 The LaTeX3 Project
+%% File l3sort.dtx (C) Copyright 2012,2014-2016 The LaTeX3 Project
 %%
 %% It may be distributed and/or modified under the conditions of the
 %% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -37,8 +37,8 @@
 %<*driver|package>
 % The version of expl3 required is tested as early as possible, as
 % some really old versions do not define \ProvidesExplPackage.
-\RequirePackage{expl3}[2015/12/20]
-%<package>\@ifpackagelater{expl3}{2015/12/20}
+\RequirePackage{expl3}[2016/01/19]
+%<package>\@ifpackagelater{expl3}{2016/01/19}
 %<package>  {}
 %<package>  {%
 %<package>    \PackageError{l3sort}{Support package l3kernel too old}
@@ -50,7 +50,7 @@
 %<package>      }%
 %<package>    \endinput
 %<package>  }
-\GetIdInfo$Id: l3sort.dtx 6326 2015-12-20 18:42:59Z joseph $
+\GetIdInfo$Id: l3sort.dtx 6377 2016-01-19 22:28:13Z joseph $
   {L3 Experimental sorting functions}
 %</driver|package>
 %<*driver>
diff --git a/Master/texmf-dist/source/latex/l3experimental/l3str/l3flag.dtx b/Master/texmf-dist/source/latex/l3experimental/l3str/l3flag.dtx
index 5fa762e70ee..52fa61bbd8e 100644
--- a/Master/texmf-dist/source/latex/l3experimental/l3str/l3flag.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/l3str/l3flag.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-%% File: l3flag.dtx Copyright (C) 2011-2012,2014,2015 The LaTeX3 Project
+%% File: l3flag.dtx Copyright (C) 2011-2012,2014-2016 The LaTeX3 Project
 %%
 %% It may be distributed and/or modified under the conditions of the
 %% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -36,8 +36,8 @@
 %<*driver|package>
 % The version of expl3 required is tested as early as possible, as
 % some really old versions do not define \ProvidesExplPackage.
-\RequirePackage{expl3}[2015/12/20]
-%<package>\@ifpackagelater{expl3}{2015/12/20}
+\RequirePackage{expl3}[2016/01/19]
+%<package>\@ifpackagelater{expl3}{2016/01/19}
 %<package>  {}
 %<package>  {%
 %<package>    \PackageError{l3flag}{Support package l3kernel too old}
@@ -49,7 +49,7 @@
 %<package>      }%
 %<package>    \endinput
 %<package>  }
-\GetIdInfo$Id: l3flag.dtx 6326 2015-12-20 18:42:59Z joseph $
+\GetIdInfo$Id: l3flag.dtx 6377 2016-01-19 22:28:13Z joseph $
   {L3 Experimental flags}
 %</driver|package>
 %<*driver>
diff --git a/Master/texmf-dist/source/latex/l3experimental/l3str/l3regex.dtx b/Master/texmf-dist/source/latex/l3experimental/l3str/l3regex.dtx
index d35147e002f..db1fc7c1f1a 100644
--- a/Master/texmf-dist/source/latex/l3experimental/l3str/l3regex.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/l3str/l3regex.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-%% File: l3regex.dtx Copyright (C) 2011-2015 The LaTeX3 Project
+%% File: l3regex.dtx Copyright (C) 2011-2016 The LaTeX3 Project
 %%
 %% It may be distributed and/or modified under the conditions of the
 %% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -36,8 +36,8 @@
 %<*driver|package>
 % The version of expl3 required is tested as early as possible, as
 % some really old versions do not define \ProvidesExplPackage.
-\RequirePackage{expl3}[2015/12/20]
-%<package>\@ifpackagelater{expl3}{2015/12/20}
+\RequirePackage{expl3}[2016/01/19]
+%<package>\@ifpackagelater{expl3}{2016/01/19}
 %<package>  {}
 %<package>  {%
 %<package>    \PackageError{l3regex}{Support package l3kernel too old}
@@ -49,7 +49,7 @@
 %<package>      }%
 %<package>    \endinput
 %<package>  }
-\GetIdInfo$Id: l3regex.dtx 6326 2015-12-20 18:42:59Z joseph $
+\GetIdInfo$Id: l3regex.dtx 6377 2016-01-19 22:28:13Z joseph $
   {L3 Experimental regular expressions}
 %</driver|package>
 %<*driver>
diff --git a/Master/texmf-dist/source/latex/l3experimental/l3str/l3tl-build.dtx b/Master/texmf-dist/source/latex/l3experimental/l3str/l3tl-build.dtx
index b37c5a31c28..eb44382e0a2 100644
--- a/Master/texmf-dist/source/latex/l3experimental/l3str/l3tl-build.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/l3str/l3tl-build.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-%% File: l3tl-build.dtx Copyright (C) 2011-2015 The LaTeX3 Project
+%% File: l3tl-build.dtx Copyright (C) 2011-2016 The LaTeX3 Project
 %%
 %% It may be distributed and/or modified under the conditions of the
 %% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -36,8 +36,8 @@
 %<*driver|package>
 % The version of expl3 required is tested as early as possible, as
 % some really old versions do not define \ProvidesExplPackage.
-\RequirePackage{expl3}[2015/12/20]
-%<package>\@ifpackagelater{expl3}{2015/12/20}
+\RequirePackage{expl3}[2016/01/19]
+%<package>\@ifpackagelater{expl3}{2016/01/19}
 %<package>  {}
 %<package>  {%
 %<package>    \PackageError{l3tl-build}{Support package l3kernel too old}
@@ -49,7 +49,7 @@
 %<package>      }%
 %<package>    \endinput
 %<package>  }
-\GetIdInfo$Id: l3tl-build.dtx 6326 2015-12-20 18:42:59Z joseph $
+\GetIdInfo$Id: l3tl-build.dtx 6377 2016-01-19 22:28:13Z joseph $
   {L3 Experimental token list construction}
 %</driver|package>
 %<*driver>
diff --git a/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx b/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx
index 47270bb408d..8bc0bafa285 100644
--- a/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx
@@ -1,7 +1,7 @@
 % \iffalse
 %
 %% File: l3galley.dtx Copyright (C) 1999-2001, 2004-2009 Frank Mittelbach
-%%                              (C) 2010-2015 The LaTeX3 Project
+%%                              (C) 2010-2016 The LaTeX3 Project
 %%
 %% It may be distributed and/or modified under the conditions of the
 %% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -38,8 +38,8 @@
 %<*driver|package>
 % The version of expl3 required is tested as early as possible, as
 % some really old versions do not define \ProvidesExplPackage.
-\RequirePackage{expl3}[2015/12/20]
-%<package>\@ifpackagelater{expl3}{2015/12/20}
+\RequirePackage{expl3}[2016/01/19]
+%<package>\@ifpackagelater{expl3}{2016/01/19}
 %<package>  {}
 %<package>  {%
 %<package>    \PackageError{l3galley}{Support package l3kernel too old}
@@ -51,7 +51,7 @@
 %<package>      }%
 %<package>    \endinput
 %<package>  }
-\GetIdInfo$Id: l3galley.dtx 6326 2015-12-20 18:42:59Z joseph $
+\GetIdInfo$Id: l3galley.dtx 6377 2016-01-19 22:28:13Z joseph $
   {L3 Experimental galley code}
 %</driver|package>
 %<*driver>
@@ -240,8 +240,7 @@
 %   \end{syntax}
 %   Sets the \meta{space} to be inserted between the current and next
 %   paragraph on a one-off basis. This function is intended for user-level
-%   adjustments to design, and otherwise is analogous to
-%   \cs{galley_set_vspace:n}.
+%   adjustments to design.
 % \end{function}
 %
 % \subsection{Paragraph shape}
@@ -2556,6 +2555,14 @@
 %    \end{macrocode}
 % \end{macro}
 %
+% \begin{macro}{\addpenalty, \addvspace}
+%   The mechanism here is entirely different, but at least this works!
+%    \begin{macrocode}
+\cs_set_nopar:Npn \addpenalty { \galley_penalty_set_single:n }
+\cs_set_nopar:Npn \addvspace  { \galley_vspace_set_single:n }
+%    \end{macrocode}
+%\end{macro}
+%
 % \begin{macro}{\@afterheading}
 %   Set some flags and hope for the best!
 %    \begin{macrocode}
@@ -2596,7 +2603,7 @@
 %   This is needed as \cs{@parboxrestore} sets |\\| equal to \cs{@normalcr},
 %   and the new definition must be used
 %    \begin{macrocode}
-\cs_set_eq:Nc \@normalcr { \token_to_str:N \\ }
+\cs_set_eq:Nc \@normalcr { \cs_to_str:N \\ }
 %    \end{macrocode}
 %\end{macro}
 %