[latex3-commits] [l3svn] branch master updated: Hopefully get \addvspace right

[noreply at latex-project.org]

This is an automated email from the git hooks/post-receive script.

joseph pushed a commit to branch master
in repository l3svn.

The following commit(s) were added to refs/heads/master by this push:
       new  cd43e0f   Hopefully get \addvspace right
cd43e0f is described below

commit cd43e0fb3c169635e51db49f1792fc4bb054b3fe
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Sat May 14 19:25:17 2016 +0100

    Hopefully get \addvspace right
---
 l3experimental/xgalley/l3galley.dtx |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/l3experimental/xgalley/l3galley.dtx b/l3experimental/xgalley/l3galley.dtx
index 9daa122..4a7858f 100644
--- a/l3experimental/xgalley/l3galley.dtx
+++ b/l3experimental/xgalley/l3galley.dtx
@@ -2556,7 +2556,17 @@
 %   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 }
+\cs_set:Npn \addvspace #1
+  {
+    \tl_if_empty:NTF \g_@@_interpar_vspace_user_tl
+      { \galley_vspace_set_single:n {#1} }
+      {
+        \dim_compare:nNnF
+          { \etex_glueexpr:D \g_@@_interpar_vspace_user_tl } 
+            > { \etex_glueexpr:D #1 \scan_stop: }
+          { \galley_vspace_set_single:n {#1} }
+      }
+  }
 %    \end{macrocode}
 %\end{macro}
 %

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.