X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=ecfeee3d6bf35bd3f7ebeb5e113420bf2e821e2d;hb=c8955199d7ecee02bf9291d14e16cc0b51422b99;hp=ab2a87ae3f862eb26565c2c7efb36a6ca5acf426;hpb=c0e85db728feff5de2e379d7631f146e0545a89e;p=lilypond.git

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index ab2a87ae3f..ecfeee3d6b 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -349,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)
@@ -797,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)
@@ -1184,6 +1193,7 @@
 
     (LyricHyphen
      . (
+	(after-line-breaking . ,ly:spanner::kill-zero-spanned-time)
 	(dash-period . 10.0)
 	(height . 0.42)
 	(length . 0.66)
@@ -1299,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
@@ -2331,6 +2343,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)