X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=8b58b1a57a491992761a90a45d1fcaf68eb0aefa;hb=bc196049a8d71a528630ab6e83bf9ecadd50f837;hp=4609a7ca58ea7a49f51b5bef00a8ade078ce7e56;hpb=94882ec3a3565a8198bf8028855f99cb907befdd;p=lilypond.git

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 4609a7ca58..8b58b1a57a 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -486,6 +486,7 @@
 	(stencil . ,ly:cluster::print)
 	(minimum-length . 0.0)
 	(padding . 0.25)
+	(cross-staff . ,ly:cluster::calc-cross-staff)
 	(style . ramp)
 	(meta . ((class . Spanner)
 		 (interfaces . (cluster-interface))))))
@@ -1048,6 +1049,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 +1111,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 +1226,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)
@@ -1498,6 +1502,7 @@
      . (
 	(axes . (1))
 	(Y-extent . ,ly:axis-group-interface::height)
+	(X-extent . ,ly:axis-group-interface::width)
 	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(side-axis . ,Y)
 	(staff-padding . 1.0)
@@ -1525,7 +1530,8 @@
     (SpanBar
      . (
 	(break-align-symbol . staff-bar)
-	(Y-extent . ())
+	(Y-extent . ,ly:axis-group-interface::height)
+	(cross-staff . #t)
 	(layer . 0)
 	(non-musical . #t)
 	(stencil . ,ly:span-bar::print)
@@ -1710,6 +1716,7 @@
      . (
 	(axes . (1))
 	(Y-extent . ,ly:axis-group-interface::height)
+	(X-extent . ,ly:axis-group-interface::width)
 	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(side-axis . ,Y)
 	(padding . 1.2)
@@ -1784,6 +1791,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)
@@ -1827,6 +1835,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
@@ -2054,6 +2063,7 @@
      . (
 	(axes . (1))
 	(Y-extent . ,ly:axis-group-interface::height)
+	(X-extent . ,ly:axis-group-interface::width)
 	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(side-axis . ,Y)
 	(padding . 1.2)
@@ -2084,7 +2094,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
@@ -2251,6 +2261,7 @@
 
 (define pure-functions
   (list
+   parenthesize-elements
    ly:staff-symbol-referencer::callback
    ly:staff-symbol::height))