Merge branch 'master' of ssh://kainhofer@git.sv.gnu.org/srv/git/lilypond into kainhofer

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index b5e95678aa0d8219a98de22b67e5490c4e211fb4..a1ba5c399bcd9da72a126983a8ca1bafcdc56db6 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -47,8 +47,10 @@
        (Y-extent . ,ly:accidental-interface::height)
        (X-offset . ,(ly:make-simple-closure
                      `(,+
-                       ,(ly:make-simple-closure (list ly:self-alignment-interface::centered-on-x-parent))
-                       ,(ly:make-simple-closure (list ly:self-alignment-interface::x-aligned-on-self)))))
+                       ,(ly:make-simple-closure
+                         (list ly:self-alignment-interface::centered-on-x-parent))
+                       ,(ly:make-simple-closure
+                         (list ly:self-alignment-interface::x-aligned-on-self)))))
        (self-alignment-X . ,CENTER)
        (font-size . -2)
        (glyph-name-alist . ,standard-alteration-glyph-name-alist)
@@ -182,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))
@@ -1526,9 +1530,11 @@
        (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!
 
@@ -1778,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)
@@ -1821,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
@@ -1906,7 +1914,8 @@
      . (
        (stencil . ,ly:time-signature::print)
        (break-align-symbol . time-signature)
-       (break-align-anchor . ,ly:break-aligned-interface::calc-extent-aligned-anchor)
+       (break-align-anchor
+        . ,ly:break-aligned-interface::calc-extent-aligned-anchor)
        (break-visibility . ,all-visible)
        (avoid-slur . inside)
        (space-alist . (
@@ -1933,6 +1942,7 @@
                                   (padding . 1.5)
                                   (attach-dir . ,LEFT)
                                   ))
+                         (left-broken . ((end-on-note . #t)))
                          (right . ((Y . 0)))
                          ))
        
@@ -2076,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
@@ -2243,6 +2253,7 @@
 
 (define pure-functions
   (list
+   parenthesize-elements
    ly:staff-symbol-referencer::callback
    ly:staff-symbol::height))