From 43811c20f16aad369767f4c9c066c940112f3fee Mon Sep 17 00:00:00 2001 From: Mark Polesky Date: Wed, 8 Dec 2010 02:01:34 -0800 Subject: [PATCH] Use consistent key order for spacing alists. --- ly/paper-defaults-init.ly | 6 +++--- scm/define-grob-properties.scm | 26 ++++++++++++++++++-------- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/ly/paper-defaults-init.ly b/ly/paper-defaults-init.ly index e3ff4ee04d..ed86a38513 100644 --- 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 497f8f08af..7f47363531 100644 --- 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 -- 2.39.2