[latex3-commits] [l3svn] branch master updated: Update l3galley to match \addvspace behaviour

[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  3cd60f8   Update l3galley to match \addvspace behaviour
3cd60f8 is described below

commit 3cd60f84aa964b6c5e9c9ee009d55b32b2ef02ac
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Sat May 14 18:40:33 2016 +0100

    Update l3galley to match \addvspace behaviour
---
 l3experimental/xgalley/l3galley.dtx |   20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/l3experimental/xgalley/l3galley.dtx b/l3experimental/xgalley/l3galley.dtx
index 9daa122..c82c6bb 100644
--- a/l3experimental/xgalley/l3galley.dtx
+++ b/l3experimental/xgalley/l3galley.dtx
@@ -240,7 +240,9 @@
 %   \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.
+%   adjustments to design. If more than one call to the function is made
+%   before the value is used, the \emph{largest} spacing (in terms of the
+%   non-stretchable component) will be used.
 % \end{function}
 %
 % \subsection{Paragraph shape}
@@ -1975,7 +1977,21 @@
 \cs_new_protected:Npn \galley_penalty_set_single:n #1
   { \tl_gset:Nx \g_@@_interpar_penalty_user_tl { \int_eval:n {#1} } }
 \cs_new_protected:Npn \galley_vspace_set_single:n #1
-  { \tl_gset:Nx \g_@@_interpar_vspace_user_tl { \skip_eval:n {#1} } }
+  {
+    \tl_gset:Nx \g_@@_interpar_vspace_user_tl
+      {
+        \skip_eval:n
+          {
+            \tl_if_empty:NTF \g_@@_interpar_vspace_user_tl
+              {#1}
+              {
+                \dim_compare:nNnTF {#1} > \g_@@_interpar_vspace_user_tl
+                  {#1}
+                  { \g_@@_interpar_vspace_user_tl }
+              }
+          }
+      }
+  }
 %    \end{macrocode}
 % \end{macro}
 %

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