X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=5e2dd4d86c14ea0572aadc11d7d5ae6a9e2f28b1;hb=6f664e0e318a1651f6fe9317a842bf9c7f476f08;hp=77dc44fb4accfd195a5ff2107c9f6afc04c3edc7;hpb=44eef75fc924487b8d322d7f4c7a4d9d73d204b1;p=lilypond.git

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 77dc44fb4a..5e2dd4d86c 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)
@@ -413,6 +422,7 @@
 	(stencil . ,ly:clef::print)
 	(glyph-name . ,ly:clef::calc-glyph-name)
 	(non-musical . #t)
+	(avoid-slur . inside)
 	(font-family . music)
 	(break-align-symbol . clef)
 	(break-visibility . ,begin-of-line-visible)
@@ -784,6 +794,7 @@
     (KeySignature
      . (
 	(stencil . ,ly:key-signature-interface::print)
+	(avoid-slur . inside)
 	(space-alist . (
 			(time-signature . (extra-space . 1.15))
 			(staff-bar . (extra-space . 1.1))
@@ -803,9 +814,10 @@
      . (
 	(stencil  . ,ly:tie::print)
 	(control-points . ,ly:semi-tie::calc-control-points)
-	(direction . ,ly:semi-tie::calc-direction)
+	(direction . ,ly:tie::calc-direction)
 	(details . ((ratio . 0.333)
 		    (height-limit . 1.0)))
+	(head-direction . ,LEFT)
 	(thickness . 1.0)
 	(meta . ((class . Item)
 		 (interfaces . (semi-tie-interface))
@@ -919,7 +931,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)
@@ -1277,10 +1289,11 @@
      . (
 	(stencil  . ,ly:tie::print)
 	(control-points . ,ly:semi-tie::calc-control-points)
-	(direction . ,ly:semi-tie::calc-direction)
+	(direction . ,ly:tie::calc-direction)
 	(details . ((ratio . 0.333)
 		    (height-limit . 1.0)))
 	(thickness . 1.0)
+	(head-direction . ,RIGHT)
 	(meta . ((class . Item)
 		 (interfaces . (semi-tie-interface))
 		 ))
@@ -1290,7 +1303,9 @@
      . (
 	(X-extent . #f)
 	(Y-extent . #f)
+	(direction . ,ly:tie::calc-direction)
 	(head-direction . ,RIGHT)
+	
 	(positioning-done . ,ly:semi-tie-column::calc-positioning-done)
 	(meta . ((class . Item)
 		 (interfaces . (semi-tie-column-interface))
@@ -1300,7 +1315,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)
@@ -1351,8 +1366,9 @@
 
     (SeparationItem
      . (
-	(X-extent . #f)
-	(Y-extent . #f)
+	(avoid-slur . inside)
+	(X-extent . ,ly:axis-group-interface::width)
+	(Y-extent . ,ly:axis-group-interface::height)
 	(meta . ((class . Item)
 		 (interfaces . (spacing-interface
 				separation-item-interface))))))
@@ -1487,7 +1503,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)
 
@@ -1627,6 +1643,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))))))
@@ -1694,7 +1711,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)
@@ -1795,6 +1811,7 @@
 	(stencil . ,ly:time-signature::print)
 	(break-align-symbol . time-signature)
 	(break-visibility . ,all-visible)
+	(avoid-slur . inside)
 	(space-alist . (
 			(first-note . (fixed-space . 2.0))
 			(right-edge . (extra-space . 0.5))
@@ -1951,6 +1968,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