Merge branch 'master' of git://git.sv.gnu.org/lilypond

diff --git a/input/regression/skyline-vertical-placement.ly b/input/regression/skyline-vertical-placement.ly
index 6c85a39f2a582fe12aba0837a2a952badf26e8a3..59e57f06fff6b51c299b95b91cf7701e233b9ca8 100644 (file)
--- a/input/regression/skyline-vertical-placement.ly
+++ b/input/regression/skyline-vertical-placement.ly
@@ -7,7 +7,8 @@ using a skyline algorithm so that they don't collide with other objects."
 
 \version "2.11.0"
 \relative c''' {
-  \override TextScript #'outside-staff-priority = #1
+  \override TextScript #'outside-staff-priority = #2
+  \override DynamicLineSpanner #'outside-staff-priority = #1
   c
   \once \override TextScript #'self-alignment-X = #CENTER
   a,^"this doesn't collide with the c"

diff --git a/scm/define-context-properties.scm b/scm/define-context-properties.scm
index f68ac402918116c3809a4682acb5452de9b3a80d..528bce09017e0cd974665c570ea3114ad9ebc061 100644 (file)
--- a/scm/define-context-properties.scm
+++ b/scm/define-context-properties.scm
@@ -463,9 +463,6 @@ for repeated bass figures.")
 context names whose vertical axis groups should be taken into account
 for vertical spacing of systems.")
      (vocalName ,markup? "Name of a vocal line.")
-     (voltaOnThisStaff ,boolean? "Normally, volta brackets are put
-only on the topmost staff.  This variable overrides this behavior, when
-set to @code{#t} or @code{#f}.")
      (voltaSpannerDuration ,ly:moment? "This specifies the maximum
 duration to use for the brackets printed for @code{\\alternative}.
 This can be used to shrink the length of brackets in the situation