X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=84c3f72f8fbb72c715ebab652bd81c2780b31998;hb=ee44e5855df96a91937bdf36e7268bb9feb0f77b;hp=286490e81beffd11d05169fb2858eeb4b6736e9d;hpb=15feba22d437b566333c8c948a5780ce40c5953f;p=lilypond.git

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 286490e81b..84c3f72f8f 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
@@ -177,6 +179,8 @@
 
     (BalloonTextItem
      . (
+	(annotation-balloon . #t)
+	(annotation-line . #t)
 	(stencil . ,ly:balloon-interface::print)
 	(text . ,(grob::calc-property-by-copy 'text))
 	(X-offset . ,(grob::calc-property-by-copy 'X-offset))
@@ -324,7 +328,6 @@
      . (
 	;; todo: clean this up a bit: the list is getting
 	;; rather long.
-
 	(auto-knee-gap . 5.5)
 	(beam-thickness . 0.48) ; in staff-space
 
@@ -346,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)
@@ -361,10 +371,11 @@
            (musical-direction-factor . 400)
            (ideal-slope-factor . 10)
 	   (collision-penalty . 500)
-	   (collision-distance . 0.35)
+	   (collision-padding . 0.35)
            (round-to-zero-slope . 0.02)))
 	(direction . ,ly:beam::calc-direction)
 
+	(normalized-endpoints . ,ly:spanner::calc-normalized-endpoints)
 	;; only for debugging.
 	(font-family . roman)
 
@@ -793,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)
@@ -863,6 +876,41 @@
 				text-interface
 				text-script-interface))))))
 
+    (FootnoteItem
+     . (
+	(annotation-balloon . #f)
+	(annotation-line . #t)
+	(break-visibility . ,inherit-y-parent-visibility)
+	(footnote-text . ,(grob::calc-property-by-copy 'footnote-text))
+	(stencil . ,ly:balloon-interface::print)
+	(text . ,(grob::calc-property-by-copy 'text))
+	(Y-extent . #f)
+	(X-offset . ,(grob::calc-property-by-copy 'X-offset))
+	(Y-offset . ,(grob::calc-property-by-copy 'Y-offset))
+	(meta . ((class . Item)
+		 (interfaces . (balloon-interface
+				footnote-interface
+				font-interface
+				text-interface))))))
+
+    (FootnoteSpanner
+     . (
+	(annotation-balloon . #f)
+	(annotation-line . #t)
+	(footnote-text . ,(grob::calc-property-by-copy 'footnote-text))
+	(spanner-placement . ,LEFT)
+	(stencil . ,ly:balloon-interface::print-spanner)
+	(text . ,(grob::calc-property-by-copy 'text))
+	(Y-extent . #f)
+	(X-offset . ,(grob::calc-property-by-copy 'X-offset))
+	(Y-offset . ,(grob::calc-property-by-copy 'Y-offset))
+	(meta . ((class . Spanner)
+		 (interfaces . (balloon-interface
+                                footnote-interface
+				footnote-spanner-interface
+				font-interface
+				text-interface))))))
+
     (FretBoard
      . (
 	(after-line-breaking . ,ly:chord-name::after-line-breaking)
@@ -888,6 +936,7 @@
 			  ))
 	(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)
 	(stencil . ,ly:line-spanner::print)
 	(style . line)
@@ -1144,6 +1193,7 @@
 
     (LyricHyphen
      . (
+	(after-line-breaking . ,ly:spanner::kill-zero-spanned-time)
 	(dash-period . 10.0)
 	(height . 0.42)
 	(length . 0.66)
@@ -1326,6 +1376,7 @@
 	(skyline-vertical-padding . 0.6)
 	;;		      (stencil . ,ly:paper-column::print)
 
+	(keep-inside-line . #t)
 	(line-break-permission . allow)
 	(non-musical . #t)
 	(page-break-permission . allow)
@@ -1463,6 +1514,7 @@
 	(axes . (,X))
 	(before-line-breaking . ,ly:paper-column::before-line-breaking)
 	(horizontal-skylines . ,ly:separation-item::calc-skylines)
+	(keep-inside-line . #t)
 	;; (stencil . ,ly:paper-column::print)
 	(X-extent . ,ly:axis-group-interface::width)
 
@@ -1825,7 +1877,7 @@
 	 . (
 	    ;; 3.5 (or 3 measured from note head) is standard length
 	    ;; 32nd, 64th, 128th flagged stems should be longer
-	    (lengths . (3.5 3.5 3.5 4.5 5.0 6.0))
+	    (lengths . (3.5 3.5 3.5 4.25 5.0 6.0))
 
 	    ;; FIXME.  3.5 yields too long beams (according to Ross and
 	    ;; looking at Baerenreiter examples) for a number of common
@@ -2203,6 +2255,7 @@
 	(meta . ((class . Item)
 		 (interfaces . (accidental-interface
 				font-interface
+				inline-accidental-interface
 				side-position-interface
 				trill-pitch-accidental-interface))))))