Fix 510.

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index cd2c337b8823ce0a408780279d6908d334fc3f5d..4691b1b0d7eceb123c9fbb6afa03e9a6e32ae67e 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -184,6 +184,8 @@
        (stencil . ,ly:bar-line::print)
        (glyph-name . ,bar-line::calc-glyph-name)
        (bar-size .  ,ly:bar-line::calc-bar-size)
+       (bar-extent . ,ly:bar-line::calc-bar-extent)
+       (allow-span-bar . #t)
        
        (space-alist . (
                        (time-signature . (extra-space . 0.75))
@@ -1523,14 +1525,16 @@
     (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)
        (bar-size . ,ly:span-bar::calc-bar-size)
+       (bar-extent . ,ly:axis-group-interface::height)
        (X-extent . ,ly:span-bar::width)
        (glyph-name . ,ly:span-bar::calc-glyph-name)
        (before-line-breaking . ,ly:span-bar::before-line-breaking)
+       (allow-span-bar . #t)
 
        ;; ugh duplication!
 
@@ -1780,6 +1784,7 @@
        (X-offset . ,ly:side-position-interface::x-aligned-side)
        (direction . ,LEFT)
        (style . bar-line)
+       (collapse-height . 5.0)
        (thickness . 1.6)
        (stencil . ,ly:system-start-delimiter::print)
        (meta . ((class . Spanner)
@@ -1823,6 +1828,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
@@ -2080,7 +2086,7 @@
        (stacking-dir . -1)
        (padding . 0.5)
        (vertical-skylines . ,ly:axis-group-interface::combine-skylines)
-       (max-stretch . ,ly:align-interface::calc-max-stretch)
+       (max-stretch . 0)
        (meta . ((class . Spanner)
                 (object-callbacks . ((Y-common . ,ly:axis-group-interface::calc-y-common)))
                 (interfaces . (align-interface
@@ -2247,6 +2253,7 @@
 
 (define pure-functions
   (list
+   parenthesize-elements
    ly:staff-symbol-referencer::callback
    ly:staff-symbol::height))