X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=a1ba5c399bcd9da72a126983a8ca1bafcdc56db6;hb=23efbcbaa7dab9303faec9fc0aca4fec805e550c;hp=ba600479635ff0e4f28d4c2c14996b720ba53aa7;hpb=a61f5daba33e3996b58492318ac127f84fbf0d88;p=lilypond.git

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index ba60047963..a1ba5c399b 100644
--- 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))
@@ -1528,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!
 
@@ -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
@@ -1936,6 +1942,7 @@
 				   (padding . 1.5)
 				   (attach-dir . ,LEFT)
 				   ))
+			  (left-broken . ((end-on-note . #t)))
 			  (right . ((Y . 0)))
 			  ))
 	
@@ -2079,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
@@ -2246,6 +2253,7 @@
 
 (define pure-functions
   (list
+   parenthesize-elements
    ly:staff-symbol-referencer::callback
    ly:staff-symbol::height))