X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=08937eb37f75fc660a43950482d54333e68f6cc3;hb=32426e733840b1d33afbf023639ca7e21a9f647e;hp=3ad6b22bff125b113e77982f4eac300a2ae2340d;hpb=f1be8fc9c6ff873ed9074dfb27fc898a8b001306;p=lilypond.git

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 3ad6b22bff..08937eb37f 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -51,6 +51,7 @@
 				accidental-suggestion-interface
 				self-alignment-interface
 				font-interface))))))
+
     (AccidentalPlacement
      . (
 	(left-padding . 0.2)
@@ -144,6 +145,14 @@
 				side-position-interface
 				font-interface))))))
 
+    (BalloonTextItem 
+     . ((stencil . ,ly:balloon-interface::print)
+	(text . ,(grob::calc-property-by-copy 'text)) 
+	(X-offset . ,(grob::calc-property-by-copy 'X-offset)) 
+	(Y-offset . ,(grob::calc-property-by-copy 'Y-offset)) 
+	(meta . ((class . Item)
+		 (interfaces . (text-interface
+				font-interface))))))
     (BarLine
      . (
 	(break-align-symbol . staff-bar)
@@ -920,7 +929,7 @@
     (LyricText
      . (
 	(stencil . ,lyric-text::print)
-	(text . ,lyric-text::calc-text)
+	(text . ,(grob::calc-property-by-copy 'text)) 
 	(X-offset . ,ly:self-alignment-interface::aligned-on-x-parent)
 	(self-alignment-X . 0)
 	(word-space . 0.6)
@@ -1304,7 +1313,7 @@
     (Rest
      . (
 	(stencil . ,ly:rest::print)
-	(duration-log . ,note-head::calc-duration-log)
+	(duration-log . ,stem::calc-duration-log)
 	(X-extent . ,ly:rest::width)
 	(Y-extent . ,ly:rest::height)
 	(Y-offset . ,ly:rest::y-offset-callback)
@@ -1492,7 +1501,7 @@
     (Stem
      . (
 	(direction . ,ly:stem::calc-direction)
-	(duration-log . ,note-head::calc-duration-log)
+	(duration-log . ,stem::calc-duration-log)
 	(default-direction . ,ly:stem::calc-default-direction)
 	(stem-end-position . ,ly:stem::calc-stem-end-position)
 
@@ -1632,6 +1641,7 @@
 	(axes . (0 1))
 	(X-extent . ,ly:axis-group-interface::width)
 	(Y-extent . ,ly:axis-group-interface::height)
+	(skyline-spacing . #t)
 	(meta . ((class . System)
 		 (interfaces . (system-interface
 				axis-group-interface))))))
@@ -1699,7 +1709,6 @@
      . (
 	(stencil . ,ly:text-interface::print)
 	(Y-offset . ,ly:staff-symbol-referencer::callback)
-	(duration-log . ,note-head::calc-duration-log)
 	(font-size . -2)
 	(stem-attachment . (0.0 . 1.35))
 	(font-series . bold)
@@ -1956,6 +1965,7 @@
 	(Y-offset . ,ly:hara-kiri-group-spanner::force-hara-kiri-callback)
 	(Y-extent . ,ly:hara-kiri-group-spanner::y-extent)
 	(X-extent . ,ly:axis-group-interface::width)
+	(skyline-spacing . #t)
 	(meta . ((class . Spanner)
 		 (interfaces . (axis-group-interface
 				hara-kiri-group-interface