X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=d3270748bbfa28263ee66322d2ce502ffa7df8aa;hb=e42585017a01fd02f6353b994cf0c87b03a7bb2e;hp=d6265e851bc5580ecb76ba25777cbecf8d93334e;hpb=004c1d3bd69487ef95ac2d819bb9799275ccb5e6;p=lilypond.git

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index d6265e851b..d3270748bb 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -23,6 +23,7 @@
 	(glyph-name-alist . ,standard-alteration-glyph-name-alist)
 	(alteration . ,accidental-interface::calc-alteration) 
 	(stencil . ,ly:accidental-interface::print)
+	(pure-Y-extent . ,ly:accidental-interface::pure-height)
 	(after-line-breaking
 	 . ,ly:accidental-interface::after-line-breaking)
 	(meta . ((class . Item)
@@ -35,6 +36,7 @@
 	(glyph-name-alist . ,standard-alteration-glyph-name-alist)
 	(alteration . ,accidental-interface::calc-alteration) 
 	(stencil . ,ly:accidental-interface::print)
+	(pure-Y-extent . ,ly:accidental-interface::pure-height)
 	(after-line-breaking
 	 . ,ly:accidental-interface::after-line-breaking)
 	(meta . ((class . Item)
@@ -120,6 +122,7 @@
 	(X-offset . ,ly:side-position-interface::x-aligned-side)
 	(direction . ,LEFT)
 	(stencil . ,ly:accidental-interface::print)
+	(pure-Y-extent . ,ly:accidental-interface::pure-height)
 	(glyph-name-alist . ,standard-alteration-glyph-name-alist)	
 	(after-line-breaking . ,ly:accidental-interface::after-line-breaking)
 	(side-axis . ,X)
@@ -349,7 +352,9 @@
 	;; only for debugging.
 	(font-family . roman)
 	(meta . ((class . Spanner)
+		 (object-callbacks . ((normal-stems . ,ly:beam::calc-normal-stems))) 
 		 (interfaces . (staff-symbol-referencer-interface
+				unbreakable-spanner-interface
 				beam-interface))))))
 
     (BendAfter
@@ -546,6 +551,7 @@
      . (
 	(stencil . ,ly:dots::print)
 	(dot-count . ,dots::calc-dot-count)
+	(staff-position . ,dots::calc-staff-position)
 	(meta . ((class . Item)
 		 (interfaces . (font-interface
 				staff-symbol-referencer-interface
@@ -665,13 +671,6 @@
 	(self-alignment-X . 0)
 	(self-alignment-Y . 0)
 	(script-priority . 100)
-
-	(after-line-breaking . ,(lambda (grob)
-				  (display (list
-					    (ly:grob-extent grob (ly:grob-parent grob X) X)
-					    " " 
-					    (ly:grob-relative-coordinate grob (ly:grob-parent grob X) X) "\n")))) 
-					    
 	(stencil . ,ly:text-interface::print)
 	(direction . ,ly:script-interface::calc-direction)
 	(text . ,fingering::calc-text) 
@@ -704,6 +703,7 @@
 	(after-line-breaking . ,ly:line-spanner::after-line-breaking)
 	(meta . ((class . Spanner)
 		 (interfaces . (line-interface
+				unbreakable-spanner-interface
 				line-spanner-interface))))))
 
     (GraceSpacing
@@ -1894,6 +1894,7 @@
 	(glyph-name-alist . ,standard-alteration-glyph-name-alist)
 	(meta . ((class . Item)
 		 (interfaces . (trill-pitch-accidental-interface
+				accidental-interface
 				side-position-interface
 				font-interface))))))
 
@@ -1908,6 +1909,7 @@
 	(padding . 0.3)
 	(meta . ((class . Item)
 		 (interfaces . (side-position-interface
+				parentheses-interface
 				note-head-interface
 				rhythmic-head-interface
 				font-interface
@@ -2004,6 +2006,7 @@
 	(padding . 0.5)
 	(skylines . ,ly:axis-group-interface::combine-skylines)
 	(meta . ((class . Spanner)
+		 (object-callbacks . ((Y-common . ,ly:axis-group-interface::calc-y-common)))
 		 (interfaces . (align-interface
 				axis-group-interface))))))
     (VerticalAxisGroup
@@ -2014,6 +2017,7 @@
 	(X-extent . ,ly:axis-group-interface::width)
 	(skylines . ,ly:axis-group-interface::calc-skylines);
 	(meta . ((class . Spanner)
+		 (object-callbacks . ((X-common . ,ly:axis-group-interface::calc-x-common)))
 		 (interfaces . (axis-group-interface
 				hara-kiri-group-spanner-interface
 				vertically-spaceable-interface))))))
@@ -2131,6 +2135,7 @@
   (list
    `(,ly:slur::outside-slur-callback . ,ly:slur::pure-outside-slur-callback)
    `(,ly:stem::height . ,ly:stem::pure-height)
+   `(,ly:rest::height . ,ly:rest::pure-height)
    `(,ly:grob::stencil-height . ,pure-stencil-height)
    `(,ly:side-position-interface::y-aligned-side . ,ly:side-position-interface::pure-y-aligned-side)
    `(,ly:axis-group-interface::height . ,ly:axis-group-interface::pure-height)
@@ -2140,7 +2145,6 @@
 
 (define pure-functions
   (list
-   ly:rest::height
    ly:staff-symbol-referencer::callback
    ly:staff-symbol::height))