From 1b79ddbaaf7f6aaa89489fdfaa03e1310235cee6 Mon Sep 17 00:00:00 2001 From: Keith OHara Date: Wed, 4 Sep 2013 14:27:45 -0700 Subject: [PATCH] Doc: update outside-staff-padding; issue 2910 --- Documentation/notation/spacing.itely | 13 +++++++------ scm/define-grob-properties.scm | 5 +++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Documentation/notation/spacing.itely b/Documentation/notation/spacing.itely index 91eeefa4e8..c85be83869 100644 --- a/Documentation/notation/spacing.itely +++ b/Documentation/notation/spacing.itely @@ -2722,16 +2722,17 @@ r2. c4_"Text"\pp % now they will collide @end lilypond -The vertical padding between an outside-staff object and the -previously-positioned grobs can be controlled with -@code{outside-staff-padding}. +The vertical padding around outside-staff objects +can be controlled with @code{outside-staff-padding}. @lilypond[quote,ragged-right,relative=2,verbatim,staffsize=18] \once \override TextScript.outside-staff-padding = #0 -a'^"This text is placed very close to the note" +a4-"outside-staff-padding = #0" \once \override TextScript.outside-staff-padding = #3 -c^"This text is padded away from the previous text" -c^"This text is placed close to the previous text" +d-"outside-staff-padding = #3" +c-"default outside-staff-padding" +b-"default outside-staff-padding" +R1 @end lilypond diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm index 93859cb504..e4e0f9dd99 100644 --- a/scm/define-grob-properties.scm +++ b/scm/define-grob-properties.scm @@ -676,8 +676,9 @@ outside-staff-object can be placed so that is it very close to another grob horizontally. If this property is set, the outside-staff-object is raised so that it is not so close to its neighbor.") (outside-staff-padding ,number? "The padding to place between -this grob and the staff when spacing according to -@code{outside-staff-priority}.") +grobs when spacing according to @code{outside-staff-priority}. +Two grobs with different @code{outside-staff-padding} values have +the larger value of padding between them.") (outside-staff-placement-directive ,symbol? "One of four directives telling how outside staff objects should be placed. @itemize @bullet -- 2.39.5