Merge branch 'lilypond/translation' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / scm / define-grobs.scm

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 5df7652f6e001e375703c4539e22453a251d6993..766f2f928af9b60db77781a13dec041640be6d32 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -122,14 +122,13 @@
 
     (AmbitusLine
      . (
-       (join-heads . #t)
-       (stencil . ,ly:ambitus::print)
+       (gap . 0.35)
+       (stencil . ,ambitus::print)
        (thickness . 2)
        (X-offset . ,ly:self-alignment-interface::centered-on-x-parent)
        (meta . ((class . Item)
                 (interfaces . (ambitus-interface
-                               font-interface
-                               staff-symbol-referencer-interface))))))
+                               font-interface))))))
 
     (AmbitusNoteHead
      . (
@@ -260,7 +259,6 @@
        (padding . 0.2)
        (positioning-done . ,ly:align-interface::align-to-minimum-distances)
        (stacking-dir . ,DOWN)
-       (threshold . (2 . 1000))
        (Y-extent . ,ly:axis-group-interface::height)
        (meta . ((class . Spanner)
                 (interfaces . (align-interface
@@ -2218,7 +2216,6 @@
 
     (VoltaBracket
      . (
-       (after-line-breaking . ,ly:side-position-interface::move-to-extremal-staff)
        (direction . ,UP)
        (edge-height . (2.0 . 2.0)) ;; staff-space;
        (font-encoding . fetaNumber)
@@ -2236,10 +2233,11 @@
 
     (VoltaBracketSpanner
      . (
+       (after-line-breaking . ,ly:side-position-interface::move-to-extremal-staff)
        (axes . (,Y))
        (direction . ,UP)
        (no-alignment . ,#t)
-       (outside-staff-priority . 100)
+       (outside-staff-priority . 600)
        (padding . 1)
        (side-axis . ,Y)
        (X-extent . ,ly:axis-group-interface::width)