Merge branch 'master' of /home/lilycvs/git/lily/

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index a93a209eb76c02554f6356a8eb7f2e30bb4848e6..800362eb92956a1fa0ca853de5633ccad2e1345a 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1048,6 +1048,7 @@
        (direction . ,UP)
        (padding . 0.8)
        (side-axis . ,Y)
+       (extra-spacing-width . (+inf.0 . -inf.0))
        (outside-staff-priority . 1000)
        (meta . ((class . Item)
                 (interfaces . (text-interface
@@ -1109,6 +1110,7 @@
        (direction . ,UP)
        (padding . 0.2)
        (staff-padding . 0.25)
+       (outside-staff-priority . 450)
        (meta . ((class . Spanner)
                 (interfaces . (side-position-interface
                                multi-measure-interface
@@ -1223,6 +1225,7 @@
        (staff-padding . 1.0)
        (padding . 0.5)
        (minimum-length . 1.0)
+       (style . dashed-line)
        (dash-fraction . 0.3)
        (edge-height . (0 . 1.2))
        (direction . ,UP)
@@ -1525,7 +1528,7 @@
     (SpanBar
      . (
        (break-align-symbol . staff-bar)
-       (Y-extent . ())
+       (Y-extent . ,ly:axis-group-interface::height)
        (layer . 0)
        (non-musical . #t)
        (stencil . ,ly:span-bar::print)
@@ -1828,6 +1831,7 @@
        (avoid-slur . around)
        (slur-padding . 0.5)
        (script-priority . 200)
+       (cross-staff . ,ly:script-interface::calc-cross-staff)
        ;; todo: add X self alignment?
        (meta . ((class . Item)
                 (interfaces . (text-script-interface