X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=97645233c63a9057a319541fb4413b020ca9d002;hb=3df53397e259a474f2ba8daec711ca9795a2d59d;hp=08b3ff5f1416f87fe29f325937f6797d85d25a96;hpb=49fbcc8b526edcad8a0650e9d7870b647c43d698;p=lilypond.git

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 08b3ff5f14..97645233c6 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1,6 +1,6 @@
 ;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;; Copyright (C) 1998--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; Copyright (C) 1998--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;
 ;;;; LilyPond is free software: you can redistribute it and/or modify
@@ -507,6 +507,7 @@
 	(font-size . 1.5)
 	(stencil . ,ly:text-interface::print)
 	(extra-spacing-height . (0.2 . -0.2))
+	(extra-spacing-width . (-0.5 . 0.5))
 	(word-space . 0.0)
 	(meta . ((class . Item)
 		 (interfaces . (chord-name-interface
@@ -1636,6 +1637,7 @@
 	(springs-and-rods . ,ly:spanner::set-spacing-rods)
 	(stencil . ,ly:slur::print)
 	(thickness . 1.1)
+	(vertical-skylines . ,ly:slur::vertical-skylines)
 	(Y-extent . ,ly:slur::height)
 	(meta . ((class . Spanner)
 		 (interfaces . (slur-interface))))))
@@ -1793,6 +1795,7 @@
 	(springs-and-rods . ,ly:spanner::set-spacing-rods)
 	(stencil . ,ly:slur::print)
 	(thickness . 1.2)
+	(vertical-skylines . ,ly:slur::vertical-skylines)
 	(Y-extent . ,ly:slur::height)
 	(meta . ((class . Spanner)
 		 (interfaces . (slur-interface))))))
@@ -1978,6 +1981,14 @@
 	(meta . ((class . Item)
 		 (interfaces . (stem-interface))))))
 
+    (StemStub
+     . (
+        (X-extent . ,stem-stub::width)
+	(extra-spacing-height . ,stem-stub::extra-spacing-height)
+	(Y-extent . ,(ly:make-unpure-pure-container #f stem-stub::pure-height))
+	(meta . ((class . Item)
+		 (interfaces . ())))))
+
     (StemTremolo
      . (
 	(beam-thickness . 0.48) ; staff-space
@@ -1986,9 +1997,16 @@
 	(stencil . ,ly:stem-tremolo::print)
 	(style . ,ly:stem-tremolo::calc-style)
 	(X-extent . ,ly:stem-tremolo::width)
+	(X-offset . ,(ly:make-simple-closure
+		      `(,+
+			,(ly:make-simple-closure
+			  (list ly:self-alignment-interface::centered-on-x-parent))
+			,(ly:make-simple-closure
+			  (list ly:self-alignment-interface::x-aligned-on-self)))))
 	(Y-offset . ,ly:stem-tremolo::calc-y-offset)
 	(meta . ((class . Item)
-		 (interfaces . (stem-tremolo-interface))))))
+		 (interfaces . (self-alignment-interface
+                                stem-tremolo-interface))))))
 
     (StringNumber
      . (
@@ -2383,6 +2401,7 @@
 
     (TupletBracket
      . (
+	(avoid-scripts . #t)
 	(connect-to-neighbor . ,ly:tuplet-bracket::calc-connect-to-neighbors)
 	(cross-staff . ,ly:tuplet-bracket::calc-cross-staff)
 	(direction  . ,ly:tuplet-bracket::calc-direction)
@@ -2632,6 +2651,7 @@
    ly:dots::print
    ly:clef::print
    ly:flag::print
+   ly:time-signature::print
    default-flag
    normal-flag
    mensural-flag