X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=32f68f5a509a8e4343b53d42d61a39fc3b3ff6e8;hb=1dca79ad0e125124abcae8ac048b351af4ed702a;hp=4c61c7c7fef73f9f19ded1e15fa846d7cf0af91f;hpb=47b6c3c8d0962ab03a6100099afd78298f5907c6;p=lilypond.git

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 4c61c7c7fe..32f68f5a50 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
@@ -970,6 +970,7 @@
 				   (padding . 0.5)
 				      ))
 			  ))
+	(cross-staff . ,ly:line-spanner::calc-cross-staff)
 	(gap . 0.5)
 	(left-bound-info . ,ly:line-spanner::calc-left-bound-info)
 	(normalized-endpoints . ,ly:spanner::calc-normalized-endpoints)
@@ -1417,6 +1418,7 @@
 	(allow-loose-spacing . #t)
 	(axes . (,X))
 	(before-line-breaking . ,ly:paper-column::before-line-breaking)
+	(bound-alignment-interfaces . (break-alignment-interface))
 	(full-measure-extra-space . 1.0)
 	(horizontal-skylines . ,ly:separation-item::calc-skylines)
 	;;		      (stencil . ,ly:paper-column::print)
@@ -1637,6 +1639,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))))))
@@ -1794,6 +1797,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))))))
@@ -1875,7 +1879,8 @@
     (SpanBarStub
      . (
         (X-extent . ,grob::x-parent-width)
-	(Y-extent . ,(ly:make-unpure-pure-container #f ly:axis-group-interface::pure-height))
+	(extra-spacing-height . ,pure-from-neighbor-interface::extra-spacing-height)
+	(Y-extent . #f)
 	(meta . ((class . Item)
 		 (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)
 				      (pure-relevant-grobs . ,ly:pure-from-neighbor-interface::calc-pure-relevant-grobs)))
@@ -1995,9 +2000,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
      . (
@@ -2392,6 +2404,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)
@@ -2641,6 +2654,7 @@
    ly:dots::print
    ly:clef::print
    ly:flag::print
+   ly:time-signature::print
    default-flag
    normal-flag
    mensural-flag
@@ -2689,6 +2703,7 @@
     (,ly:axis-group-interface::calc-staff-staff-spacing . ,ly:axis-group-interface::calc-pure-staff-staff-spacing)
     (,ly:axis-group-interface::height . ,ly:axis-group-interface::pure-height)
     (,ly:beam::rest-collision-callback . ,ly:beam::pure-rest-collision-callback)
+    (,ly:flag::calc-y-offset . ,ly:flag::pure-calc-y-offset)
     (,ly:grob::stencil-height . ,pure-stencil-height)
     (,ly:hara-kiri-group-spanner::y-extent . ,ly:hara-kiri-group-spanner::pure-height)
     (,ly:rest-collision::force-shift-callback-rest . ,pure-chain-offset-callback)
@@ -2708,7 +2723,6 @@
   (list
    parenthesize-elements
    laissez-vibrer::print
-   ly:flag::calc-y-offset
    ly:rest::y-offset-callback
    ly:staff-symbol-referencer::callback
    ly:staff-symbol::height))