Merge commit '52915ed'

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index daacad59d393f8d3a5dd2b461904dba0be30783b..6b2135c9e6014e8fb45633f1bdb3a21ae3830b1a 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -605,6 +605,7 @@
        (outside-staff-priority . 250)
        (Y-extent . ,ly:axis-group-interface::height)
        (X-extent . ,ly:axis-group-interface::width)
+       (cross-staff . ,ly:side-position-interface::calc-cross-staff)
        (meta . ((class . Spanner)
                 (interfaces . (axis-group-interface
                                dynamic-interface
@@ -998,6 +999,7 @@
        (word-space . 0.6)
        (font-series . bold-narrow)
        (font-size . 1.0)
+       (extra-spacing-width . (0.0 . 0.0))
        (meta . ((class . Item)
                 (interfaces . (rhythmic-grob-interface
                                lyric-syllable-interface
@@ -1718,7 +1720,6 @@
        (Y-extent . ,ly:axis-group-interface::height)
        (vertical-skylines . ,ly:axis-group-interface::calc-skylines)
        (max-stretch . ,ly:axis-group-interface::calc-max-stretch)
-       (skyline-horizontal-padding . 1.0)
        (meta . ((class . System)
                 (interfaces . (system-interface
                                axis-group-interface))))))