X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=inline;f=scm%2Fdefine-grobs.scm;h=df551b2d6fa2b0b1ba61f5a21ebe7db5317fac1e;hb=d8dfa746ead381a80901106b9c9b079dc9b5d004;hp=9e213c6daad1d7b52ea41877447230a7a13d186f;hpb=3b8f430efd506ccd6ae8235be0f08468c0da937d;p=lilypond.git

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 9e213c6daa..df551b2d6f 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
@@ -30,8 +30,10 @@
      . (
 	(alteration . ,accidental-interface::calc-alteration)
 	(avoid-slur . inside)
+	(glyph-name . ,accidental-interface::glyph-name)
 	(glyph-name-alist . ,standard-alteration-glyph-name-alist)
 	(stencil . ,ly:accidental-interface::print)
+	(vertical-skylines . ,ly:grob::vertical-skylines-from-stencil)
 	(X-extent . ,ly:accidental-interface::width)
 	(Y-extent . ,ly:accidental-interface::height)
 	(meta . ((class . Item)
@@ -198,6 +200,7 @@
 	(break-align-anchor . ,ly:bar-line::calc-anchor)
 	(break-align-symbol . staff-bar)
 	(break-visibility . ,bar-line::calc-break-visibility)
+	(extra-spacing-height . ,pure-from-neighbor-interface::account-for-span-bar)
 	(gap . 0.4)
 	(glyph . "|")
 	(glyph-name . ,bar-line::calc-glyph-name)
@@ -225,9 +228,12 @@
 			(right-edge . (extra-space . 0.0))))
 	(stencil . ,ly:bar-line::print)
 	(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)))
 		 (interfaces . (bar-line-interface
 				break-aligned-interface
-				font-interface))))))
+				font-interface
+				pure-from-neighbor-interface))))))
 
     (BarNumber
      . (
@@ -278,7 +284,8 @@
 	(stacking-dir . ,DOWN)
 	(Y-extent . ,ly:axis-group-interface::height)
 	(meta . ((class . Spanner)
-		 (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)
+		 (object-callbacks . ((full-score-pure-minimum-translations . ,ly:align-interface::full-score-pure-minimum-translations)
+				      (pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)
 				      (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)))
 		 (interfaces . (align-interface
 				axis-group-interface
@@ -331,6 +338,7 @@
 	;; todo: clean this up a bit: the list is getting
 	;; rather long.
 	(auto-knee-gap . 5.5)
+	(beam-segments . ,ly:beam::calc-beam-segments)
 	(beam-thickness . 0.48) ; in staff-space
 
 	;; We have some unreferenced problems here.
@@ -357,9 +365,9 @@
 				 inline-accidental-interface
 				 key-signature-interface
 				 note-head-interface
+				 octavate-eight-interface
 				 stem-interface
 				 time-signature-interface))
-	(concaveness . ,ly:beam::calc-concaveness)
 	(cross-staff . ,ly:beam::calc-cross-staff)
 	(damping . 1)
 	(details
@@ -382,14 +390,18 @@
 	;; only for debugging.
 	(font-family . roman)
 
-	(gap . 0.8)
+	(beam-gap . ,ly:beam::calc-beam-gap)
+	(minimum-length . ,ly:beam::calc-minimum-length)
 	(neutral-direction . ,DOWN)
-	(positions . ,ly:beam::quanting)
+	(positions . ,beam::place-broken-parts-individually)
+	(springs-and-rods . ,ly:beam::calc-springs-and-rods)
+	(X-positions . ,ly:beam::calc-x-positions)
 
 	;; this is a hack to set stem lengths, if positions is set.
 	(quantized-positions . ,ly:beam::set-stem-lengths)
 
 	(shorten . ,ly:beam::calc-stem-shorten)
+	(vertical-skylines . ,ly:grob::vertical-skylines-from-stencil)
 	(stencil . ,ly:beam::print)
 
 	(meta . ((class . Spanner)
@@ -501,6 +513,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
@@ -514,6 +527,7 @@
 	(break-align-anchor . ,ly:break-aligned-interface::calc-extent-aligned-anchor)
 	(break-align-symbol . clef)
 	(break-visibility . ,begin-of-line-visible)
+	(extra-spacing-height . ,pure-from-neighbor-interface::extra-spacing-height-at-beginning-of-line)
 	(glyph-name . ,ly:clef::calc-glyph-name)
 	(non-musical . #t)
 	(space-alist . ((cue-clef . (extra-space . 2.0))
@@ -525,11 +539,15 @@
 			(next-note . (extra-space . 1.0))
 			(right-edge . (extra-space . 0.5))))
 	(stencil . ,ly:clef::print)
+	(vertical-skylines . ,ly:grob::vertical-skylines-from-stencil)
 	(Y-offset . ,ly:staff-symbol-referencer::callback)
 	(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)))
 		 (interfaces . (break-aligned-interface
 				clef-interface
 				font-interface
+				pure-from-neighbor-interface
 				staff-symbol-referencer-interface))))))
 
     (ClusterSpanner
@@ -578,6 +596,7 @@
 	(break-align-anchor . ,ly:break-aligned-interface::calc-extent-aligned-anchor)
 	(break-align-symbol . cue-clef)
 	(break-visibility . ,begin-of-line-visible)
+	(extra-spacing-height . ,pure-from-neighbor-interface::extra-spacing-height-at-beginning-of-line)
 	(font-size . -4)
 	(glyph-name . ,ly:clef::calc-glyph-name)
 	(non-musical . #t)
@@ -593,9 +612,12 @@
 	(stencil . ,ly:clef::print)
 	(Y-offset . ,ly:staff-symbol-referencer::callback)
 	(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)))
 		 (interfaces . (break-aligned-interface
 				clef-interface
 				font-interface
+				pure-from-neighbor-interface
 				staff-symbol-referencer-interface))))))
 
     (CueEndClef
@@ -604,6 +626,7 @@
 	(break-align-anchor . ,ly:break-aligned-interface::calc-extent-aligned-anchor)
 	(break-align-symbol . cue-end-clef)
 	(break-visibility . ,begin-of-line-invisible)
+	(extra-spacing-height . ,pure-from-neighbor-interface::extra-spacing-height-at-beginning-of-line)
 	(font-size . -4)
 	(glyph-name . ,ly:clef::calc-glyph-name)
 	(non-musical . #t)
@@ -620,9 +643,12 @@
 	(stencil . ,ly:clef::print)
 	(Y-offset . ,ly:staff-symbol-referencer::callback)
 	(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)))
 		 (interfaces . (break-aligned-interface
 				clef-interface
 				font-interface
+				pure-from-neighbor-interface
 				staff-symbol-referencer-interface))))))
 
     (Custos
@@ -655,6 +681,7 @@
 
     (Dots
      . (
+	(avoid-slur . inside)
 	(dot-count . ,dots::calc-dot-count)
 	(staff-position . ,dots::calc-staff-position)
 	(stencil . ,ly:dots::print)
@@ -731,6 +758,8 @@
 	(side-axis . ,Y)
 	(slur-padding . 0.3)
 	(staff-padding . 0.1)
+	(vertical-skylines . ,ly:grob::vertical-skylines-from-element-stencils)
+	(use-skylines . #t)
 	(X-extent . ,ly:axis-group-interface::width)
 	(Y-extent . ,ly:axis-group-interface::height)
 	(Y-offset . ,ly:side-position-interface::y-aligned-side)
@@ -747,20 +776,23 @@
 
 	;; todo.
 
+	(collision-bias . -2.0)
+	(collision-padding . 0.5)
 	(direction . ,ly:script-interface::calc-direction)
 	(extra-spacing-width . (+inf.0 . -inf.0))
 	(font-encoding . fetaText)
 	(font-series . bold)
 	(font-shape . italic)
-	(outside-staff-priority . 250)
 	(positioning-done . ,ly:script-interface::calc-positioning-done)
 	(right-padding . 0.5)
 	(self-alignment-X . ,CENTER)
 	(self-alignment-Y . ,CENTER)
 	(stencil . ,ly:text-interface::print)
+	(vertical-skylines . ,ly:grob::vertical-skylines-from-stencil)
 	(X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
 	(Y-offset . ,ly:self-alignment-interface::y-aligned-on-self)
 	(meta . ((class . Item)
+		 (object-callbacks . ((X-colliding-grobs . ,ly:self-alignment-interface::x-colliding-grobs)))
 		 (interfaces . (dynamic-interface
 				dynamic-text-interface
 				font-interface
@@ -807,6 +839,7 @@
 	(springs-and-rods . ,ly:spanner::set-spacing-rods)
 	(stencil . ,ly:line-spanner::print)
 	(style . dashed-line)
+	(vertical-skylines . ,ly:grob::vertical-skylines-from-stencil)
 	(meta . ((class . Spanner)
 		 (interfaces . (dynamic-interface
 				dynamic-text-spanner-interface
@@ -871,12 +904,21 @@
 				text-interface
 				text-script-interface))))))
 
+    (FingeringColumn
+     . (
+	(padding . 0.2)
+	(positioning-done . ,ly:fingering-column::calc-positioning-done)
+	(meta . ((class . Item)
+		 (interfaces . (fingering-column-interface))))))
+
     (Flag
      . (
+	(glyph-name . ,ly:flag::glyph-name)
 	(stencil . ,ly:flag::print)
 	(X-extent . ,ly:flag::width)
 	(X-offset . ,ly:flag::calc-x-offset)
 	(Y-offset . ,ly:flag::calc-y-offset)
+	(vertical-skylines . ,ly:grob::vertical-skylines-from-stencil)
 	(meta . ((class . Item)
 		 (interfaces . (flag-interface
                                 font-interface))))))
@@ -947,6 +989,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)
@@ -954,6 +997,7 @@
 	(simple-Y . #t)
 	(stencil . ,ly:line-spanner::print)
 	(style . line)
+	(vertical-skylines . ,ly:grob::vertical-skylines-from-stencil)
 	(X-extent . #f)
 	(Y-extent . #f)
 	(zigzag-width . 0.75)
@@ -1001,6 +1045,7 @@
      . (
 	(after-line-breaking . ,ly:spanner::kill-zero-spanned-time)
 	(bound-padding . 1.0)
+	(broken-bound-padding . ,ly:hairpin::broken-bound-padding)
 	(circled-tip . #f)
 	(grow-direction . ,hairpin::calc-grow-direction)
 	(height . 0.6666)
@@ -1010,6 +1055,7 @@
 	(stencil . ,ly:hairpin::print)
 	(thickness . 1.0)
 	(to-barline . #t)
+	(vertical-skylines . ,ly:grob::vertical-skylines-from-stencil)
 	(Y-offset . ,ly:self-alignment-interface::y-aligned-on-self)
 	(meta . ((class . Spanner)
 		 (interfaces . (dynamic-interface
@@ -1076,6 +1122,8 @@
 	(break-visibility . ,begin-of-line-invisible)
 	(glyph-name-alist . ,cancellation-glyph-name-alist)
 	(non-musical . #t)
+	(flat-positions . (2 3 4 2 1 2 1))
+	(sharp-positions . (4 5 4 2 3 2 3))
 	(space-alist . (
 			(time-signature . (extra-space . 1.25))
 			(staff-bar . (extra-space . 0.6))
@@ -1084,13 +1132,18 @@
 			(right-edge . (extra-space . 0.5))
 			(first-note . (fixed-space . 2.5))))
 	(stencil . ,ly:key-signature-interface::print)
+	(vertical-skylines . ,ly:grob::vertical-skylines-from-stencil)
 	(extra-spacing-width . (0.0 . 1.0))
+	(extra-spacing-height . ,pure-from-neighbor-interface::extra-spacing-height-including-staff)
 	(Y-offset . ,ly:staff-symbol-referencer::callback)
 	(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)))
 		 (interfaces . (break-aligned-interface
 				font-interface
 				key-cancellation-interface
 				key-signature-interface
+				pure-from-neighbor-interface
 				staff-symbol-referencer-interface))))))
 
     (KeySignature
@@ -1101,6 +1154,8 @@
 	(break-visibility . ,begin-of-line-visible)
 	(glyph-name-alist . ,standard-alteration-glyph-name-alist)
 	(non-musical . #t)
+	(flat-positions . (2 3 4 2 1 2 1))
+	(sharp-positions . (4 5 4 2 3 2 3))
 	(space-alist . (
 			(time-signature . (extra-space . 1.15))
 			(staff-bar . (extra-space . 1.1))
@@ -1109,11 +1164,16 @@
 			(first-note . (fixed-space . 2.5))))
 	(stencil . ,ly:key-signature-interface::print)
 	(extra-spacing-width . (0.0 . 1.0))
+	(extra-spacing-height . ,pure-from-neighbor-interface::extra-spacing-height-including-staff)
+	(vertical-skylines . ,ly:grob::vertical-skylines-from-stencil)
 	(Y-offset . ,ly:staff-symbol-referencer::callback)
 	(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)))
 		 (interfaces . (break-aligned-interface
 				font-interface
 				key-signature-interface
+				pure-from-neighbor-interface
 				staff-symbol-referencer-interface))))))
 
 
@@ -1127,6 +1187,7 @@
 	(stencil  . ,laissez-vibrer::print)
 	(thickness . 1.0)
 	(extra-spacing-height . (-0.5 . 0.5))
+	(vertical-skylines . ,ly:grob::vertical-skylines-from-stencil)
 	(meta . ((class . Item)
 		 (interfaces . (semi-tie-interface))))))
 
@@ -1216,6 +1277,7 @@
 	(padding . 0.07)
 	(springs-and-rods . ,ly:lyric-hyphen::set-spacing-rods)
 	(stencil . ,ly:lyric-hyphen::print)
+	(vertical-skylines . ,ly:grob::vertical-skylines-from-stencil)
 	(thickness . 1.3)
 	(Y-extent . (0 . 0))
 	(meta . ((class . Spanner)
@@ -1247,6 +1309,8 @@
 	(stencil . ,lyric-text::print)
 	(text . ,(grob::calc-property-by-copy 'text))
 	(word-space . 0.6)
+	(skyline-horizontal-padding . 0.1)
+	(vertical-skylines . ,ly:grob::vertical-skylines-from-stencil)
 	(X-offset . ,ly:self-alignment-interface::aligned-on-x-parent)
 	(meta . ((class . Item)
 		 (interfaces . (font-interface
@@ -1255,7 +1319,6 @@
 				self-alignment-interface
 				text-interface))))))
 
-
     (MeasureGrouping
      . (
 	(direction . ,UP)
@@ -1290,10 +1353,12 @@
 	(break-visibility . ,end-of-line-invisible)
 	(direction . ,UP)
 	(extra-spacing-width . (+inf.0 . -inf.0))
+	(outside-staff-horizontal-padding . 0.12)
 	(outside-staff-priority . 1000)
 	(padding . 0.8)
 	(side-axis . ,Y)
 	(stencil . ,ly:text-interface::print)
+	(vertical-skylines . ,ly:grob::vertical-skylines-from-stencil)
 	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(X-offset . ,(ly:make-simple-closure
 		      `(,+
@@ -1385,10 +1450,9 @@
 	(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)
-	;; sufficient padding to prevent ledger lines from moving over/under
-	(skyline-vertical-padding . 0.6)
 	;;		      (stencil . ,ly:paper-column::print)
 
 	(keep-inside-line . #t)
@@ -1498,6 +1562,7 @@
 	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(meta . ((class . Item)
 		 (interfaces . (font-interface
+				octavate-eight-interface
 				self-alignment-interface
 				side-position-interface
 				text-interface))))))
@@ -1515,6 +1580,7 @@
 	(staff-padding . 1.0)
 	(stencil . ,ly:ottava-bracket::print)
 	(style . dashed-line)
+	(vertical-skylines . ,ly:grob::vertical-skylines-from-stencil)
 	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(meta . ((class . Spanner)
 		 (interfaces . (font-interface
@@ -1533,6 +1599,9 @@
 	(bound-alignment-interfaces . (note-column-interface))
 	(horizontal-skylines . ,ly:separation-item::calc-skylines)
 	(keep-inside-line . #t)
+	; 0.08 comes from spacing-horizontal-skyline.ly
+	; allows double flat of F to be nestled over dots of C
+	(skyline-vertical-padding . 0.08)
 	;; (stencil . ,ly:paper-column::print)
 	(X-extent . ,ly:axis-group-interface::width)
 
@@ -1607,6 +1676,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))))))
@@ -1622,6 +1692,7 @@
 	(stencil . ,ly:piano-pedal-bracket::print)
 	(style . line)
 	(thickness .  1.0)
+	(vertical-skylines . ,ly:grob::vertical-skylines-from-stencil)
 	(meta . ((class . Spanner)
 		 (interfaces . (line-interface
 				piano-pedal-bracket-interface
@@ -1638,10 +1709,12 @@
 	(extra-spacing-width . (+inf.0 . -inf.0))
 	(font-size . 2)
 	(non-musical . #t)
+	(outside-staff-horizontal-padding . 0.12)
 	(outside-staff-priority . 1500)
 	(padding . 0.8)
 	(self-alignment-X . ,CENTER)
 	(stencil . ,ly:text-interface::print)
+	(vertical-skylines . ,ly:grob::vertical-skylines-from-stencil)
 	(X-offset . ,(ly:make-simple-closure
 		      `(,+
 			,(ly:make-simple-closure
@@ -1678,6 +1751,7 @@
 	(stencil  . ,ly:tie::print)
 	(thickness . 1.0)
 	(extra-spacing-height . (-0.5 . 0.5))
+	(vertical-skylines . ,ly:grob::vertical-skylines-from-stencil)
 	(meta . ((class . Item)
 		 (interfaces . (semi-tie-interface))))))
 
@@ -1730,6 +1804,7 @@
 
 	(stencil . ,ly:script-interface::print)
 	(use-skylines . #t)
+	(vertical-skylines . ,ly:grob::vertical-skylines-from-stencil)
 	(X-offset . ,script-interface::calc-x-offset)
 	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(meta . ((class . Item)
@@ -1764,6 +1839,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))))))
@@ -1776,6 +1852,7 @@
 	(padding . 0.0) ;; padding relative to SostenutoPedalLineSpanner
 	(self-alignment-X . ,CENTER)
 	(stencil . ,ly:text-interface::print)
+	(vertical-skylines . ,ly:grob::vertical-skylines-from-stencil)
 	(X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
 	(meta . ((class . Item)
 		 (interfaces . (font-interface
@@ -1792,6 +1869,7 @@
 	(padding . 1.2)
 	(side-axis . ,Y)
 	(staff-padding . 1.0)
+	(vertical-skylines . ,ly:grob::vertical-skylines-from-element-stencils)
 	(X-extent . ,ly:axis-group-interface::width)
 	(Y-extent . ,ly:axis-group-interface::height)
 	(Y-offset . ,ly:side-position-interface::y-aligned-side)
@@ -1836,7 +1914,7 @@
 	(non-musical . #t)
 	(stencil . ,ly:span-bar::print)
 	(X-extent . ,ly:span-bar::width)
-	(Y-extent . #f)
+	(Y-extent . (+inf.0 . -inf.0))
 	(meta . ((class . Item)
 		 (interfaces . (bar-line-interface
 				font-interface
@@ -1844,12 +1922,12 @@
 
     (SpanBarStub
      . (
-	(elements-filtered . ,ly:pure-from-neighbor-interface::filter-elements)
         (X-extent . ,grob::x-parent-width)
-	(Y-extent . ,span-bar-stub::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:axis-group-interface::calc-pure-relevant-grobs)))
+				      (pure-relevant-grobs . ,ly:pure-from-neighbor-interface::calc-pure-relevant-grobs)))
 		 (interfaces . (pure-from-neighbor-interface))))))
 
     (StaffGrouper
@@ -1950,17 +2028,33 @@
 	(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
 	(beam-width . ,ly:stem-tremolo::calc-width) ; staff-space
+	(direction . ,ly:stem-tremolo::calc-direction)
 	(slope . ,ly:stem-tremolo::calc-slope)
 	(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
      . (
@@ -2010,6 +2104,7 @@
 	(padding . 0.0)  ;; padding relative to SustainPedalLineSpanner
 	(self-alignment-X . ,CENTER)
 	(stencil . ,ly:sustain-pedal::print)
+	(vertical-skylines . ,ly:grob::vertical-skylines-from-stencil)
 	(X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
 	(meta . ((class . Item)
 		 (interfaces . (font-interface
@@ -2027,6 +2122,7 @@
 	(padding . 1.2)
 	(side-axis . ,Y)
 	(staff-padding . 1.2)
+	(vertical-skylines . ,ly:grob::vertical-skylines-from-element-stencils)
 	(X-extent . ,ly:axis-group-interface::width)
 	(Y-extent . ,ly:axis-group-interface::height)
 	(Y-offset . ,ly:side-position-interface::y-aligned-side)
@@ -2041,13 +2137,18 @@
      . (
 	(adjacent-pure-heights . ,ly:axis-group-interface::adjacent-pure-heights)
 	(axes . (,X ,Y))
+	(outside-staff-placement-directive . left-to-right-polite)
 	(skyline-horizontal-padding . 0.5)
 	(vertical-skylines . ,ly:axis-group-interface::calc-skylines)
 	(X-extent . ,ly:axis-group-interface::width)
 	(Y-extent . ,ly:system::height)
 	(meta . ((class . System)
-		 (object-callbacks . ((pure-relevant-grobs . ,ly:system::calc-pure-relevant-grobs)
-				      (pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)))
+		 (object-callbacks . ((footnotes-before-line-breaking . ,ly:system::footnotes-before-line-breaking)
+				      (footnotes-after-line-breaking . ,ly:system::footnotes-after-line-breaking)
+				      (pure-relevant-grobs . ,ly:system::calc-pure-relevant-grobs)
+				      (pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)
+				      (vertical-skyline-elements . ,ly:system::vertical-skyline-elements)
+                                      (vertical-alignment . ,ly:system::get-vertical-alignment)))
 		 (interfaces . (axis-group-interface
 				system-interface))))))
 
@@ -2153,6 +2254,7 @@
 	(cross-staff . ,script-or-side-position-cross-staff)
 	(direction . ,DOWN)
 	(extra-spacing-width . (+inf.0 . -inf.0))
+	(outside-staff-horizontal-padding . 0.12)
 	(outside-staff-priority . 450)
 
 	;; sync with Fingering ?
@@ -2163,6 +2265,7 @@
 	(slur-padding . 0.5)
 	(staff-padding . 0.5)
 	(stencil . ,ly:text-interface::print)
+	(vertical-skylines . ,ly:grob::vertical-skylines-from-stencil)
 	;; todo: add X self alignment?
 	(X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
 	(Y-offset . ,ly:side-position-interface::y-aligned-side)
@@ -2180,7 +2283,7 @@
 				   (padding . 0.25)
 				   (attach-dir . ,LEFT)
 				   ))
-			  (left-broken . ((end-on-note . #t)))
+			  (left-broken . ((attach-dir . ,RIGHT)))
 			  (right . ((Y . 0)
 				    (padding . 0.25)
 				    ))
@@ -2236,6 +2339,7 @@
 	(neutral-direction . ,UP)
 	(springs-and-rods . ,ly:spanner::set-spacing-rods)
 	(stencil . ,ly:tie::print)
+	(vertical-skylines . ,ly:grob::vertical-skylines-from-stencil)
 	(thickness . 1.2)
 	(meta . ((class . Spanner)
 		 (interfaces . (tie-interface))))))
@@ -2257,7 +2361,7 @@
 	(break-align-symbol . time-signature)
 	(break-align-anchor-alignment . ,LEFT)
 	(break-visibility . ,all-visible)
-	(extra-spacing-height . (-1.0 . 1.0))
+	(extra-spacing-height . ,pure-from-neighbor-interface::extra-spacing-height-including-staff)
 	(extra-spacing-width . (0.0 . 0.8))
 	(non-musical . #t)
 	(space-alist . (
@@ -2268,8 +2372,11 @@
 	(stencil . ,ly:time-signature::print)
 	(style . C)
 	(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)))
 		 (interfaces . (break-aligned-interface
 				font-interface
+				pure-from-neighbor-interface
 				time-signature-interface))))))
 
     (TrillPitchAccidental
@@ -2350,6 +2457,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)
@@ -2361,6 +2469,7 @@
 	(staff-padding . 0.25)
 	(stencil . ,ly:tuplet-bracket::print)
 	(thickness . 1.6)
+	(vertical-skylines . ,ly:grob::vertical-skylines-from-stencil)
 	(X-positions . ,ly:tuplet-bracket::calc-x-positions)
 
 	(meta . ((class . Spanner)
@@ -2392,6 +2501,7 @@
 	(padding . 0.0)  ;; padding relative to UnaCordaPedalLineSpanner
 	(self-alignment-X . ,CENTER)
 	(stencil . ,ly:text-interface::print)
+	(vertical-skylines . ,ly:grob::vertical-skylines-from-stencil)
 	(X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
 	(meta . ((class . Item)
 		 (interfaces . (font-interface
@@ -2408,6 +2518,7 @@
 	(padding . 1.2)
 	(side-axis . ,Y)
 	(staff-padding . 1.2)
+	(vertical-skylines . ,ly:grob::vertical-skylines-from-element-stencils)
 	(X-extent . ,ly:axis-group-interface::width)
 	(Y-extent . ,ly:axis-group-interface::height)
 	(Y-offset . ,ly:side-position-interface::y-aligned-side)
@@ -2437,7 +2548,8 @@
 	(X-extent . ,ly:axis-group-interface::width)
 	(Y-extent . ,ly:axis-group-interface::height)
 	(meta . ((class . Spanner)
-		 (object-callbacks . ((Y-common . ,ly:axis-group-interface::calc-y-common)
+		 (object-callbacks . ((full-score-pure-minimum-translations . ,ly:align-interface::full-score-pure-minimum-translations)
+				      (Y-common . ,ly:axis-group-interface::calc-y-common)
 				      (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)
 				      (pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)))
 		 (interfaces . (align-interface
@@ -2451,8 +2563,10 @@
 					(minimum-distance . 8)
 					(padding . 1)))
 	(nonstaff-unrelatedstaff-spacing . ((padding . 0.5)))
+	(outside-staff-placement-directive . left-to-right-polite)
 	(staff-staff-spacing . ,ly:axis-group-interface::calc-staff-staff-spacing)
 	(stencil . ,ly:axis-group-interface::print)
+	(skyline-horizontal-padding . 0.1)
 	(vertical-skylines . ,ly:hara-kiri-group-spanner::calc-skylines)
 	(X-extent . ,ly:axis-group-interface::width)
 	(Y-extent . ,ly:hara-kiri-group-spanner::y-extent)
@@ -2476,6 +2590,7 @@
 				   (padding . 1.5)
 				      ))
 			  ))
+	(cross-staff . #t)
 	(gap . 0.5)
 	(left-bound-info . ,ly:line-spanner::calc-left-bound-info)
 	(non-musical . #t)
@@ -2497,6 +2612,7 @@
 	(stencil . ,ly:volta-bracket-interface::print)
 	(thickness . 1.6) ;; line-thickness
 	(word-space . 0.6)
+	(vertical-skylines . ,ly:grob::vertical-skylines-from-stencil)
 	(meta . ((class . Spanner)
 		 (interfaces . (font-interface
 				horizontal-bracket-interface
@@ -2515,9 +2631,10 @@
 	(outside-staff-priority . 600)
 	(padding . 1)
 	(side-axis . ,Y)
+	(vertical-skylines . ,ly:grob::vertical-skylines-from-element-stencils)
 	(X-extent . ,ly:axis-group-interface::width)
 	(Y-extent . ,ly:axis-group-interface::height)
-	(Y-offset . ,ly:side-position-interface::y-aligned-side)
+        (Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(meta . ((class . Spanner)
 		 (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)
 				      (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)))
@@ -2598,6 +2715,7 @@
    ly:dots::print
    ly:clef::print
    ly:flag::print
+   ly:time-signature::print
    default-flag
    normal-flag
    mensural-flag
@@ -2646,6 +2764,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)
@@ -2654,7 +2773,6 @@
     (,ly:side-position-interface::y-aligned-side . ,ly:side-position-interface::pure-y-aligned-side)
     (,ly:slur::height . ,ly:slur::pure-height)
     (,ly:slur::outside-slur-callback . ,ly:slur::pure-outside-slur-callback)
-    (,span-bar-stub::height . ,ly:axis-group-interface::pure-height)
     (,ly:stem::calc-stem-begin-position . ,ly:stem::pure-calc-stem-begin-position)
     (,ly:stem::calc-stem-end-position . ,ly:stem::pure-calc-stem-end-position)
     (,stem::length . ,stem::pure-length)
@@ -2666,7 +2784,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))