Use consistent key order for spacing alists.

diff --git a/ly/paper-defaults-init.ly b/ly/paper-defaults-init.ly
index e3ff4ee04d2426686364201741022671f96b9fd8..ed86a38513a3312d52037b5545d30751ddb3813e 100644 (file)
--- a/ly/paper-defaults-init.ly
+++ b/ly/paper-defaults-init.ly
@@ -66,9 +66,9 @@
   markup-system-spacing = #'((basic-distance . 5) (padding . 0.5) (stretchability . 30))
   score-markup-spacing = #'((basic-distance . 12) (padding . 0.5) (stretchability . 60))
   markup-markup-spacing = #'((basic-distance . 1) (padding . 0.5))
-  top-system-spacing = #'((basic-distance . 1) (padding . 1) (minimum-distance . 0))
-  top-markup-spacing = #'((basic-distance . 0) (padding . 1) (minimum-distance . 0))
-  last-bottom-spacing = #'((basic-distance . 1) (padding . 1) (minimum-distance . 0) (stretchability . 30))
+  top-system-spacing = #'((basic-distance . 1) (minimum-distance . 0) (padding . 1))
+  top-markup-spacing = #'((basic-distance . 0) (minimum-distance . 0) (padding . 1))
+  last-bottom-spacing = #'((basic-distance . 1) (minimum-distance . 0) (padding . 1) (stretchability . 30))
 
 
   %%

diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm
index 497f8f08af0798485d535eca88a5201735cbe39d..7f47363531bb19dc761f68dbf3e203f690e2a2a8 100644 (file)
--- a/scm/define-grob-properties.scm
+++ b/scm/define-grob-properties.scm
@@ -781,20 +781,30 @@ same system, replacing any settings inherited from the
 @code{StaffGrouper} grob of the containing staff-group, if there
 is one.  This property remains in effect even when non-staff lines
 appear between staves.  The alist can contain the following keys:
+
 @itemize
-@item @code{padding} -- the minimum required amount of
-unobstructed vertical whitespace between the two items, measured
-in staff-spaces.
-@item @code{basic-distance} -- the vertical distance, measured in
+
+@item
+@code{basic-distance} -- the vertical distance, measured in
 staff-spaces, between the reference points of the two items when
 no collisions would result, and no stretching or compressing is in
 effect.
-@item @code{minimum-distance} -- the smallest allowable vertical
+
+@item
+@code{minimum-distance} -- the smallest allowable vertical
 distance, measured in staff-spaces, between the reference points
 of the two items, when compressing is in effect.
-@item @code{stretchability} -- a unitless measure of the
-dimension's relative propensity to stretch.  If zero, the distance
-will not stretch (unless collisions would result).
+
+@item
+@code{padding} -- the minimum required amount of unobstructed
+vertical whitespace between the two items, measured in
+staff-spaces.
+
+@item
+@code{stretchability} -- a unitless measure of the dimension's
+relative propensity to stretch.  If zero, the distance will not
+stretch (unless collisions would result).
+
 @end itemize")
      (staffgroup-staff-spacing ,list? "The spacing alist
 controlling the distance between the last staff of the current