X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=800362eb92956a1fa0ca853de5633ccad2e1345a;hb=7533c2056b52ff578abfab9fd6c82b4a08b8d124;hp=7a0781f5aeb734fc2a42fe5123b1d7416eaf255a;hpb=b1c6af875b7a015c4d1308d13720785f88cddcae;p=lilypond.git

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 7a0781f5ae..800362eb92 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 1998--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 ;;;; distances are given in line-thickness (thicknesses) and
@@ -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)
@@ -150,6 +152,7 @@
 	(Y-offset . ,ly:staff-symbol-referencer::callback)
 	(X-offset . ,ly:side-position-interface::x-aligned-side)
 	(direction . ,LEFT)
+	(positions . ,ly:arpeggio::calc-positions)
 	(padding . 0.5)
 	(script-priority . 0)
 	(side-axis . ,X)
@@ -181,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))
@@ -605,6 +610,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 +1004,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
@@ -1041,6 +1048,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
@@ -1102,6 +1110,7 @@
 	(direction . ,UP)
 	(padding . 0.2)
 	(staff-padding . 0.25)
+	(outside-staff-priority . 450)
 	(meta . ((class . Spanner)
 		 (interfaces . (side-position-interface
 				multi-measure-interface
@@ -1172,6 +1181,7 @@
      . (
 	(stem-spacing-correction . 0.5)
 	(same-direction-correction . 0.25)
+	(space-to-barline . #t)
 	;; Changed this from 0.75.
 	;; If you ever change this back, please document! --hwn
 	(knee-spacing-correction . 1.0)
@@ -1215,6 +1225,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)
@@ -1517,14 +1528,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!
 
@@ -1774,6 +1787,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)
@@ -1817,6 +1831,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
@@ -1902,7 +1917,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 . (
@@ -1922,12 +1938,14 @@
 	(right-bound-info . ,ly:line-spanner::calc-right-bound-info)
 
 	(bound-details . ((left . ((text . ,(make-translate-scaled-markup
-					     '(0.5 . -0.6)
+					     '(0.0 . -1.0)
 					     (make-musicglyph-markup "scripts.trill")))
 				   (Y . 0)
-				   (padding . 0.25)
+				   (stencil-offset . (-0.5 . 0))
+				   (padding . 1.5)
 				   (attach-dir . ,LEFT)
 				   ))
+			  (left-broken . ((end-on-note . #t)))
 			  (right . ((Y . 0)))
 			  ))
 	
@@ -2071,7 +2089,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
@@ -2238,6 +2256,7 @@
 
 (define pure-functions
   (list
+   parenthesize-elements
    ly:staff-symbol-referencer::callback
    ly:staff-symbol::height))