l3 (15may16)

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

6 files changed, 56 insertions, 24 deletions

diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty b/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty
index eb02643481b..404a6d581c3 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty
@@ -46,8 +46,8 @@
 %%
 %% -----------------------------------------------------------------------
 %%
-\RequirePackage{expl3}[2016/04/20]
-\@ifpackagelater{expl3}{2016/04/20}
+\RequirePackage{expl3}[2016/05/14]
+\@ifpackagelater{expl3}{2016/05/14}
   {}
   {%
     \PackageError{l3sort}{Support package l3kernel too old}
@@ -59,7 +59,7 @@
       }%
     \endinput
   }
-\GetIdInfo$Id: l3sort.dtx 6476 2016-04-20 19:46:45Z joseph $
+\GetIdInfo$Id: l3sort.dtx 6492 2016-05-14 20:27:55Z joseph $
   {L3 Experimental sorting functions}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3flag.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3flag.sty
index 02954e8b14f..560d0edf277 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3flag.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3flag.sty
@@ -45,8 +45,8 @@
 %%   prior consultation with the LaTeX3 Project.
 %%
 %% -----------------------------------------------------------------------
-\RequirePackage{expl3}[2016/04/20]
-\@ifpackagelater{expl3}{2016/04/20}
+\RequirePackage{expl3}[2016/05/14]
+\@ifpackagelater{expl3}{2016/05/14}
   {}
   {%
     \PackageError{l3flag}{Support package l3kernel too old}
@@ -58,7 +58,7 @@
       }%
     \endinput
   }
-\GetIdInfo$Id: l3flag.dtx 6476 2016-04-20 19:46:45Z joseph $
+\GetIdInfo$Id: l3flag.dtx 6492 2016-05-14 20:27:55Z joseph $
   {L3 Experimental flags}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
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 79195e0f1d5..ea479829d46 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty
@@ -45,8 +45,8 @@
 %%   prior consultation with the LaTeX3 Project.
 %%
 %% -----------------------------------------------------------------------
-\RequirePackage{expl3}[2016/04/20]
-\@ifpackagelater{expl3}{2016/04/20}
+\RequirePackage{expl3}[2016/05/14]
+\@ifpackagelater{expl3}{2016/05/14}
   {}
   {%
     \PackageError{l3regex}{Support package l3kernel too old}
@@ -58,7 +58,7 @@
       }%
     \endinput
   }
-\GetIdInfo$Id: l3regex.dtx 6476 2016-04-20 19:46:45Z joseph $
+\GetIdInfo$Id: l3regex.dtx 6492 2016-05-14 20:27:55Z joseph $
   {L3 Experimental regular expressions}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty
index 2ae92c23ac8..e1e95236068 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty
@@ -45,8 +45,8 @@
 %%   prior consultation with the LaTeX3 Project.
 %%
 %% -----------------------------------------------------------------------
-\RequirePackage{expl3}[2016/04/20]
-\@ifpackagelater{expl3}{2016/04/20}
+\RequirePackage{expl3}[2016/05/14]
+\@ifpackagelater{expl3}{2016/05/14}
   {}
   {%
     \PackageError{l3regex}{Support package l3kernel too old}
@@ -58,7 +58,7 @@
       }%
     \endinput
   }
-\GetIdInfo$Id: l3regex.dtx 6476 2016-04-20 19:46:45Z joseph $
+\GetIdInfo$Id: l3regex.dtx 6492 2016-05-14 20:27:55Z joseph $
   {L3 Experimental regular expressions}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
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 bf081c6925f..c98c6edee9e 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-build.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-build.sty
@@ -45,8 +45,8 @@
 %%   prior consultation with the LaTeX3 Project.
 %%
 %% -----------------------------------------------------------------------
-\RequirePackage{expl3}[2016/04/20]
-\@ifpackagelater{expl3}{2016/04/20}
+\RequirePackage{expl3}[2016/05/14]
+\@ifpackagelater{expl3}{2016/05/14}
   {}
   {%
     \PackageError{l3tl-build}{Support package l3kernel too old}
@@ -58,7 +58,7 @@
       }%
     \endinput
   }
-\GetIdInfo$Id: l3tl-build.dtx 6476 2016-04-20 19:46:45Z joseph $
+\GetIdInfo$Id: l3tl-build.dtx 6492 2016-05-14 20:27:55Z joseph $
   {L3 Experimental token list construction}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
index 5776af0598a..8fcffdf3ff0 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
@@ -47,8 +47,8 @@
 %%
 %% -----------------------------------------------------------------------
 %%
-\RequirePackage{expl3}[2016/04/20]
-\@ifpackagelater{expl3}{2016/04/20}
+\RequirePackage{expl3}[2016/05/14]
+\@ifpackagelater{expl3}{2016/05/14}
   {}
   {%
     \PackageError{l3galley}{Support package l3kernel too old}
@@ -60,7 +60,7 @@
       }%
     \endinput
   }
-\GetIdInfo$Id: l3galley.dtx 6476 2016-04-20 19:46:45Z joseph $
+\GetIdInfo$Id: l3galley.dtx 6493 2016-05-14 21:08:13Z joseph $
   {L3 Experimental galley code}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -675,8 +675,43 @@
   }
 \cs_new_protected:Npn \galley_penalty_set_single:n #1
   { \tl_gset:Nx \g__galley_interpar_penalty_user_tl { \int_eval:n {#1} } }
+\cs_new_protected:Npn \galley_penalty_add_single:n #1
+  {
+    \tl_gset:Nx \g__galley_interpar_penalty_user_tl
+      {
+        \int_eval:n
+          {
+            \tl_if_empty:NF \g__galley_interpar_penalty_user_tl
+              { \g__galley_interpar_penalty_user_tl + }
+            #1
+          }
+      }
+  }
 \cs_new_protected:Npn \galley_vspace_set_single:n #1
   { \tl_gset:Nx \g__galley_interpar_vspace_user_tl { \skip_eval:n {#1} } }
+\cs_new_protected:Npn \galley_vspace_add_single:n #1
+  {
+    \tl_gset:Nx \g__galley_interpar_vspace_user_tl
+      {
+        \skip_eval:n
+          {
+            \tl_if_empty:NF \g__galley_interpar_vspace_user_tl
+              { \g__galley_interpar_vspace_user_tl + }
+            #1
+          }
+      }
+  }
+\cs_new_protected:Npn \galley_vspace_max_single:n #1
+  {
+    \tl_if_empty:NTF \g__galley_interpar_vspace_user_tl
+      { \galley_vspace_set_single:n {#1} }
+      {
+        \dim_compare:nNnT
+          { \etex_glueexpr:D \g__galley_interpar_vspace_user_tl }
+            < { \etex_glueexpr:D #1 \scan_stop: }
+          { \galley_vspace_set_single:n {#1} }
+      }
+  }
 \dim_set:Nn \parskip \c_zero_dim
 \cs_undefine:N \parskip
 \skip_new:N \parskip
@@ -902,9 +937,6 @@
           }
       }
     \newpage
-    \tl_gput_right:Nn \g_galley_whatsit_next_tl
-      { \iow_shipout:Nx \c_minus_one { } }
-    \tex_vbox:D { }
     \galley_penalty_set_single:n { -\@Mi }
   }
 \cs_set_nopar:Npn \nobreak
@@ -920,7 +952,7 @@
       \@vspace
       \@vspace
   }
-\cs_set:Npn \@vspace #1 { \galley_vspace_set_single:n {#1} }
+\cs_set:Npn \@vspace #1 { \galley_vspace_add_single:n {#1} }
 \DeclareRobustCommand \\
   {
     \@ifstar
@@ -939,8 +971,8 @@
 \DeclareRobustCommand \newline
   { \galley_break_line:Nn \c_true_bool { 0pt } }
 \cs_set_eq:cN { @ @ par } \galley_par:
-\cs_set_nopar:Npn \addpenalty { \galley_penalty_set_single:n }
-\cs_set_nopar:Npn \addvspace  { \galley_vspace_set_single:n }
+\cs_set_nopar:Npn \addpenalty { \galley_penalty_add_single:n }
+\cs_set_nopar:Npn \addvspace  { \galley_vspace_max_single:n }
 \cs_set_nopar:Npn \@afterheading
   {
     \bool_gset_true:N \g_galley_no_break_next_bool