X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=65b59bb01bdbfcec293b3a0b2a807b58558661d0;hb=d1db9b1d6ebb1014429974f22162b44bf9a03533;hp=8b9564f41e1776e00814887a7d4516b95dba4465;hpb=fe4f33aca60ea7c58bc9196eac43b4acca1d4437;p=lilypond.git

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 8b9564f41e..65b59bb01b 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -36,6 +36,7 @@
 	(Y-extent . ,ly:accidental-interface::height)
 	(meta . ((class . Item)
 		 (interfaces . (accidental-interface
+				inline-accidental-interface
 				font-interface))))))
 
     (AccidentalCautionary
@@ -48,6 +49,7 @@
 	(Y-extent . ,ly:accidental-interface::height)
 	(meta . ((class . Item)
 		 (interfaces . (accidental-interface
+				inline-accidental-interface
 				font-interface))))))
 
     (AccidentalPlacement
@@ -347,6 +349,13 @@
 
 	(beaming . ,ly:beam::calc-beaming)
 	(clip-edges . #t)
+	(collision-interfaces . (beam-interface
+				 clef-interface
+				 inline-accidental-interface
+				 key-signature-interface
+				 note-head-interface
+				 stem-interface
+				 time-signature-interface))
 	(concaveness . ,ly:beam::calc-concaveness)
 	(cross-staff . ,ly:beam::calc-cross-staff)
 	(damping . 1)
@@ -795,10 +804,12 @@
 
 	(left-bound-info . ,ly:line-spanner::calc-left-bound-info-and-text)
 
+	(minimum-length . 2.0)
 	;; make sure the spanner doesn't get too close to notes
 	(minimum-Y-extent . (-1 . 1))
 
 	(right-bound-info . ,ly:line-spanner::calc-right-bound-info)
+	(springs-and-rods . ,ly:spanner::set-spacing-rods)
 	(stencil . ,ly:line-spanner::print)
 	(style . dashed-line)
 	(meta . ((class . Spanner)
@@ -887,7 +898,7 @@
 	(annotation-balloon . #f)
 	(annotation-line . #t)
 	(footnote-text . ,(grob::calc-property-by-copy 'footnote-text))
-	(spanner-placement . LEFT)
+	(spanner-placement . ,LEFT)
 	(stencil . ,ly:balloon-interface::print-spanner)
 	(text . ,(grob::calc-property-by-copy 'text))
 	(Y-extent . #f)
@@ -925,7 +936,9 @@
 			  ))
 	(gap . 0.5)
 	(left-bound-info . ,ly:line-spanner::calc-left-bound-info)
+	(normalized-endpoints . ,ly:spanner::calc-normalized-endpoints)
 	(right-bound-info . ,ly:line-spanner::calc-right-bound-info)
+	(simple-Y . #t)
 	(stencil . ,ly:line-spanner::print)
 	(style . line)
 	(X-extent . #f)
@@ -1181,6 +1194,7 @@
 
     (LyricHyphen
      . (
+	(after-line-breaking . ,ly:spanner::kill-zero-spanned-time)
 	(dash-period . 10.0)
 	(height . 0.42)
 	(length . 0.66)
@@ -1277,7 +1291,6 @@
 	(self-alignment-X . ,LEFT)
 	(break-align-symbols . (time-signature))
 	(non-break-align-symbols . (multi-measure-rest-interface))
-	(non-musical . #t)
 	(meta . ((class . Item)
 		 (interfaces . (break-alignable-interface
 				font-interface
@@ -1296,6 +1309,8 @@
 	(staff-position . 0)
 	(stencil . ,ly:multi-measure-rest::print)
 	(thick-thickness . 6.6)
+	;; See Wanske pp. 125
+	(usable-duration-logs . (0 -1 -2 -3))
 	(Y-offset . ,ly:staff-symbol-referencer::callback)
 	(meta . ((class . Spanner)
 		 (interfaces . (font-interface
@@ -1423,6 +1438,7 @@
 		 (interfaces . (font-interface
 				gregorian-ligature-interface
 				ledgered-interface
+                                ligature-head-interface
 				mensural-ligature-interface
 				note-head-interface
 				rhythmic-grob-interface
@@ -1572,6 +1588,7 @@
 	(height-limit . 2.0)
 	(minimum-length . 1.5)
 	(ratio . 0.333)
+	(spanner-id . "")
 	(springs-and-rods . ,ly:spanner::set-spacing-rods)
 	(stencil . ,ly:slur::print)
 	(thickness . 1.1)
@@ -1726,6 +1743,7 @@
 	(line-thickness . 0.8)
 	(minimum-length . 1.5)
 	(ratio . 0.25)
+	(spanner-id . "")
 	(springs-and-rods . ,ly:spanner::set-spacing-rods)
 	(stencil . ,ly:slur::print)
 	(thickness . 1.2)
@@ -1897,6 +1915,7 @@
 	(length . ,ly:stem::calc-length)
 	(neutral-direction . ,DOWN)
 	(positioning-done . ,ly:stem::calc-positioning-done)
+	(stem-begin-position . ,ly:stem::calc-stem-begin-position)
 	(stem-end-position . ,ly:stem::calc-stem-end-position)
 	(stem-info . ,ly:stem::calc-stem-info)
 	(stencil . ,ly:stem::print)
@@ -1917,7 +1936,6 @@
 	(stencil . ,ly:stem-tremolo::print)
 	(style . ,ly:stem-tremolo::calc-style)
 	(X-extent . ,ly:stem-tremolo::width)
-	(Y-extent . ,ly:stem-tremolo::height)
 	(meta . ((class . Item)
 		 (interfaces . (stem-tremolo-interface))))))
 
@@ -2242,6 +2260,7 @@
 	(meta . ((class . Item)
 		 (interfaces . (accidental-interface
 				font-interface
+				inline-accidental-interface
 				side-position-interface
 				trill-pitch-accidental-interface))))))
 
@@ -2327,6 +2346,7 @@
      . (
 	(avoid-slur . inside)
 	(cross-staff . ,ly:tuplet-number::calc-cross-staff)
+	(direction . ,tuplet-number::calc-direction)
 	(font-shape . italic)
 	(font-size . -2)
 	(stencil . ,ly:tuplet-number::print)
@@ -2565,6 +2585,7 @@
     (,ly:arpeggio::brew-chord-bracket . ,ly:arpeggio::pure-height)
     (,ly:arpeggio::brew-chord-slur . ,ly:arpeggio::pure-height)
     (,ly:hairpin::print . ,ly:hairpin::pure-height)
+    (,ly:stem-tremolo::print . ,ly:stem-tremolo::pure-height)
     (,ly:volta-bracket-interface::print . ,volta-bracket-interface::pure-height)))
 
 ;; ly:grob::stencil-extent is safe if the print callback is safe too