X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=f458290be5661e539625ffcee57489cdcb90e0d4;hb=1a788358cd2d55e1d8f7556861e984f94c1ce2e9;hp=0c1df0a25714540f03ea860347b8b274114c8c4d;hpb=b6b251afb3d68e32df8b84274f28c864ecd2beff;p=lilypond.git

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 0c1df0a257..f458290be5 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 1998--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 ;;;; distances are given in line-thickness (thicknesses) and
@@ -357,11 +357,13 @@
 		 (object-callbacks . ((normal-stems . ,ly:beam::calc-normal-stems))) 
 		 (interfaces . (staff-symbol-referencer-interface
 				unbreakable-spanner-interface
-				beam-interface))))))
+				beam-interface
+				font-interface))))))
 
     (BendAfter
      . (
 	(stencil . ,bend::print)
+	(minimum-length . 0.5)
 	(thickness . 2.0)
 	(meta . ((class . Spanner)
 		 (interfaces . (spanner-interface
@@ -1151,6 +1153,7 @@
 	(non-musical . #t)
 	(line-break-permission . allow)
 	(page-break-permission . allow)
+	(full-measure-extra-space . 1.0)
 
 	;; debugging stuff: print column number.
 	;;		 (font-size . -6) (font-name . "sans")	(Y-extent . #f)
@@ -1159,7 +1162,8 @@
 		 (interfaces . (paper-column-interface
 				axis-group-interface
 				separation-item-interface
-				spaceable-grob-interface))))))
+				spaceable-grob-interface
+				font-interface))))))
 
     (NoteCollision
      . (
@@ -1197,7 +1201,10 @@
 				font-interface
 				note-head-interface
 				ledgered-interface
-				staff-symbol-referencer-interface))))))
+				staff-symbol-referencer-interface
+				gregorian-ligature-interface
+				mensural-ligature-interface
+				vaticana-ligature-interface))))))
 
     (NoteSpacing
      . (
@@ -1279,7 +1286,8 @@
 		 (interfaces . (paper-column-interface
 				separation-item-interface
 				axis-group-interface
-				spaceable-grob-interface))))))
+				spaceable-grob-interface
+				font-interface))))))
 
     (ParenthesesItem
      . ((stencil . ,parentheses-item::print)
@@ -1632,11 +1640,13 @@
 	(thickness . 1.3)
 	(cross-staff . ,ly:stem::calc-cross-staff)
 	(flag . ,ly:stem::calc-flag)
+	(beamlet-default-length . (1.1 . 1.1))
+	(beamlet-max-length-proportion . (0.75 . 0.75))
 	(details
 	 . (
 	    ;; 3.5 (or 3 measured from note head) is standard length
-	    ;; 32nd, 64th flagged stems should be longer
-	    (lengths . (3.5 3.5 3.5 4.5 5.0))
+	    ;; 32nd, 64th, 128th flagged stems should be longer
+	    (lengths . (3.5 3.5 3.5 4.5 5.0 6.0))
 
 	    ;; FIXME.  3.5 yields too long beams (according to Ross and
 	    ;; looking at Baerenreiter examples) for a number of common
@@ -1869,6 +1879,7 @@
 				text-interface
 				instrument-specific-markup-interface
 				side-position-interface
+				self-alignment-interface
 				font-interface))))))
 
     (TextSpanner
@@ -2266,6 +2277,7 @@
    ly:arpeggio::print
    ly:arpeggio::brew-chord-bracket
    ly:bar-line::print
+   ly:mensural-ligature::brew-ligature-primitive
    ly:note-head::print
    ly:dots::print
    ly:clef::print