]> git.donarmstrong.com Git - lilypond.git/blobdiff - scm/define-grobs.scm
Mark ly:sustain-pedal::print as pure.
[lilypond.git] / scm / define-grobs.scm
index 30b1d8ae6d8702ad29c1bee766f28049261ce373..2860bc3e6aaa0925f6e12136b1e382733c068ca5 100644 (file)
@@ -1,9 +1,20 @@
-;;;; define-grobs.scm --
+;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;;  source file of the GNU LilyPond music typesetter
-;;;;
-;;;; (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; Copyright (C) 1998--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;;
+;;;; LilyPond is free software: you can redistribute it and/or modify
+;;;; it under the terms of the GNU General Public License as published by
+;;;; the Free Software Foundation, either version 3 of the License, or
+;;;; (at your option) any later version.
+;;;;
+;;;; LilyPond is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;;; GNU General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;;; distances are given in line-thickness (thicknesses) and
 ;;;; staff-space (distances)
@@ -13,8 +24,6 @@
 
 ;; TODO: junk the meta field in favor of something more compact?
 
-;;; todo:: reorder sensibly.
-
 (define-public all-grob-descriptions
   `(
     (Accidental
@@ -44,7 +53,6 @@
     (AccidentalPlacement
      . (
        (direction .  ,LEFT)
-       (left-padding . 0.2)
        (positioning-done . ,ly:accidental-placement::calc-positioning-done)
 
        ;; this is quite small, but it is very ugly to have
        (Y-extent . ,ly:accidental-interface::height)
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (meta . ((class . Item)
-                (interfaces . (side-position-interface
-                               script-interface
-                               accidental-interface
+                (interfaces . (accidental-interface
                                accidental-suggestion-interface
+                               font-interface
+                               script-interface
                                self-alignment-interface
-                               font-interface))))))
+                               side-position-interface))))))
 
     (Ambitus
      . (
        (X-extent . ,ly:axis-group-interface::width)
        (Y-extent . ,ly:axis-group-interface::height)
        (meta . ((class . Item)
-                (interfaces . (axis-group-interface
-                               break-aligned-interface
-                               ambitus-interface))))))
+                (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-items . ,ly:axis-group-interface::calc-pure-relevant-items)
+                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)))
+                (interfaces . (ambitus-interface
+                               axis-group-interface
+                               break-aligned-interface))))))
 
     (AmbitusAccidental
      . (
        (direction . ,LEFT)
-       (font-family . music)
        (glyph-name-alist . ,standard-alteration-glyph-name-alist)
        (padding . 0.5)
        (side-axis . ,X)
        (X-offset . ,ly:side-position-interface::x-aligned-side)
        (Y-extent . ,ly:accidental-interface::height)
        (meta . ((class . Item)
-                (interfaces . (
-                               accidental-interface
+                (interfaces . (accidental-interface
                                break-aligned-interface
-                               side-position-interface
-                               font-interface))))))
+                               font-interface
+                               side-position-interface))))))
 
     (AmbitusLine
      . (
-       (join-heads . #t)
-       (stencil . ,ly:ambitus::print)
+       (gap . 0.35)
+       (stencil . ,ambitus::print)
        (thickness . 2)
        (X-offset . ,ly:self-alignment-interface::centered-on-x-parent)
        (meta . ((class . Item)
                 (interfaces . (ambitus-interface
-                               staff-symbol-referencer-interface
                                font-interface))))))
 
     (AmbitusNoteHead
        (stencil . ,ly:note-head::print)
        (Y-offset . ,ly:staff-symbol-referencer::callback)
        (meta . ((class . Item)
-                (interfaces . (font-interface
+                (interfaces . (ambitus-interface
+                               font-interface
+                               ledgered-interface
                                note-head-interface
-                               ambitus-interface
-                               staff-symbol-referencer-interface
                                rhythmic-head-interface
-                               ledgered-interface))))))
+                               staff-symbol-referencer-interface))))))
 
     (Arpeggio
      . (
        (stencil . ,ly:arpeggio::print)
        (X-extent . ,ly:arpeggio::width)
        (X-offset . ,ly:side-position-interface::x-aligned-side)
-       (Y-extent . ,ly:arpeggio::height)
        (Y-offset . ,ly:staff-symbol-referencer::callback)
        (meta . ((class . Item)
                 (interfaces . (arpeggio-interface
-                               staff-symbol-referencer-interface
+                               font-interface
                                side-position-interface
-                               font-interface))))))
+                               staff-symbol-referencer-interface))))))
 
     (BalloonTextItem
      . (
        (Y-offset . ,(grob::calc-property-by-copy 'Y-offset))
        (meta . ((class . Item)
                 (interfaces . (balloon-interface
-                               text-interface
-                               font-interface))))))
+                               font-interface
+                               text-interface))))))
 
     (BarLine
      . (
 
     (BarNumber
      . (
+       (after-line-breaking . ,ly:side-position-interface::move-to-extremal-staff)
        ;; want the bar number before the clef at line start.
        (break-align-symbols . (left-edge staff-bar))
 
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (meta .
              ((class . Item)
-              (interfaces . (side-position-interface
-                             text-interface
-                             break-alignable-interface
+              (interfaces . (break-alignable-interface
+                             font-interface
                              self-alignment-interface
-                             font-interface))))))
+                             side-position-interface
+                             text-interface))))))
 
     (BassFigure
      . (
        (stencil . ,ly:text-interface::print)
        (meta . ((class . Item)
-                (interfaces . (text-interface
+                (interfaces . (bass-figure-interface
+                               font-interface
                                rhythmic-grob-interface
-                               bass-figure-interface
-                               font-interface))))))
+                               text-interface))))))
 
     (BassFigureAlignment
      . (
        (axes . (,Y))
        (padding . 0.2)
-       (positioning-done . ,ly:align-interface::calc-positioning-done)
+       (positioning-done . ,ly:align-interface::align-to-minimum-distances)
        (stacking-dir . ,DOWN)
-       (threshold . (2 . 1000))
        (Y-extent . ,ly:axis-group-interface::height)
        (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)
+                                     (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items)
+                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)))
                 (interfaces . (align-interface
-                               bass-figure-alignment-interface
-                               axis-group-interface))))))
+                               axis-group-interface
+                               bass-figure-alignment-interface))))))
 
     (BassFigureAlignmentPositioning
      . (
        (Y-extent . ,ly:axis-group-interface::height)
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (meta . ((class . Spanner)
-                (interfaces . (side-position-interface
-                               axis-group-interface))))))
+                (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-items . ,ly:axis-group-interface::calc-pure-relevant-items)
+                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)))
+                (interfaces . (axis-group-interface
+                               side-position-interface))))))
 
     (BassFigureBracket
      . (
        (vertical-skylines . ,ly:axis-group-interface::calc-skylines)
        (Y-extent . ,ly:axis-group-interface::height)
        (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)
+                                     (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items)
+                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)))
                 (interfaces . (axis-group-interface))))))
 
 
        ;; rather long.
 
        (auto-knee-gap . 5.5)
+       (beam-thickness . 0.48) ; in staff-space
 
        ;; We have some unreferenced problems here.
        ;;
        (shorten . ,ly:beam::calc-stem-shorten)
        (stencil . ,ly:beam::print)
 
-       ;; TODO: should be in SLT.
-       (thickness . 0.48) ; in staff-space
-
        (meta . ((class . Spanner)
                 (object-callbacks . ((normal-stems . ,ly:beam::calc-normal-stems)))
-                (interfaces . (staff-symbol-referencer-interface
-                               unbreakable-spanner-interface
-                               beam-interface
-                               font-interface))))))
+                (interfaces . (beam-interface
+                               font-interface
+                               staff-symbol-referencer-interface
+                               unbreakable-spanner-interface))))))
 
     (BendAfter
      . (
        (stencil . ,bend::print)
        (thickness . 2.0)
        (meta . ((class . Spanner)
-                (interfaces . (spanner-interface
-                               bend-after-interface))))))
+                (interfaces . (bend-after-interface
+                               spanner-interface))))))
 
     (BreakAlignGroup
      . (
        (break-visibility . ,ly:break-aligned-interface::calc-break-visibility)
        (X-extent . ,ly:axis-group-interface::width)
        (meta . ((class . Item)
-                (interfaces . (break-aligned-interface
-                               axis-group-interface))))))
+                (interfaces . (axis-group-interface
+                               break-aligned-interface))))))
 
     (BreakAlignment
      . (
        (stacking-dir . 1)
        (X-extent . ,ly:axis-group-interface::width)
        (meta . ((class . Item)
-                (interfaces . (break-alignment-interface
-                               axis-group-interface))))))
+                (interfaces . (axis-group-interface
+                               break-alignment-interface))))))
 
     (BreathingSign
      . (
        (meta . ((class . Item)
                 (interfaces . (break-aligned-interface
                                breathing-sign-interface
-                               text-interface
-                               font-interface))))))
+                               font-interface
+                               text-interface))))))
 
     (ChordName
      . (
        (stencil . ,ly:text-interface::print)
        (word-space . 0.0)
        (meta . ((class . Item)
-                (interfaces . (font-interface
+                (interfaces . (chord-name-interface
+                               font-interface
                                rhythmic-grob-interface
-                               text-interface
-                               chord-name-interface))))))
+                               text-interface))))))
 
     (Clef
      . (
        (break-align-anchor . ,ly:break-aligned-interface::calc-extent-aligned-anchor)
        (break-align-symbol . clef)
        (break-visibility . ,begin-of-line-visible)
-       (font-family . music)
        (glyph-name . ,ly:clef::calc-glyph-name)
        (non-musical . #t)
        (space-alist . ((ambitus . (extra-space . 2.0))
                        (next-note . (extra-space . 0.5))
                        (right-edge . (extra-space . 0.5))))
        (stencil . ,ly:clef::print)
+       (extra-spacing-height . (-0.5 . 0.5))
        (Y-offset . ,ly:staff-symbol-referencer::callback)
        (meta . ((class . Item)
-                (interfaces . (clef-interface
-                               staff-symbol-referencer-interface
+                (interfaces . (break-aligned-interface
+                               clef-interface
                                font-interface
-                               break-aligned-interface))))))
+                               staff-symbol-referencer-interface))))))
 
     (ClusterSpanner
      . (
      . (
        (Y-extent . ,ly:cluster-beacon::height)
        (meta . ((class . Item)
-                (interfaces . (rhythmic-grob-interface
-                               cluster-beacon-interface))))))
+                (interfaces . (cluster-beacon-interface
+                               rhythmic-grob-interface))))))
 
     (CombineTextScript
      . (
        (direction . ,UP)
        (extra-spacing-width . (+inf.0 . -inf.0))
        (font-series . bold)
+       (outside-staff-priority . 450)
        (padding . 0.5)
        (script-priority . 200)
        (side-axis . ,Y)
        (X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (meta . ((class . Item)
-                (interfaces . (text-script-interface
-                               text-interface
+                (interfaces . (font-interface
                                side-position-interface
-                               font-interface))))))
+                               text-interface
+                               text-script-interface))))))
 
     (Custos
      . (
        (style . vaticana)
        (Y-offset . ,ly:staff-symbol-referencer::callback)
        (meta . ((class . Item)
-                (interfaces  . (custos-interface
-                                staff-symbol-referencer-interface
+                (interfaces  . (break-aligned-interface
+                                custos-interface
                                 font-interface
-                                break-aligned-interface))))))
+                                staff-symbol-referencer-interface))))))
 
     (DotColumn
      . (
        (positioning-done . ,ly:dot-column::calc-positioning-done)
        (X-extent . ,ly:axis-group-interface::width)
        (meta . ((class . Item)
-                (interfaces . (dot-column-interface
-                               axis-group-interface))))))
+                (interfaces . (axis-group-interface
+                               dot-column-interface))))))
 
     (Dots
      . (
        (dot-count . ,dots::calc-dot-count)
        (staff-position . ,dots::calc-staff-position)
        (stencil . ,ly:dots::print)
+       (extra-spacing-height . (-0.5 . 0.5))
        (meta . ((class . Item)
-                (interfaces . (font-interface
-                               staff-symbol-referencer-interface
-                               dots-interface))))))
+                (interfaces . (dots-interface
+                               font-interface
+                               staff-symbol-referencer-interface))))))
 
     (DoublePercentRepeat
      . (
        (thickness . 0.48)
        (width . 2.0)
        (meta . ((class . Item)
-                (interfaces . (font-interface
-                               break-aligned-interface
+                (interfaces . (break-aligned-interface
+                               font-interface
                                percent-repeat-interface
                                percent-repeat-item-interface))))))
 
     (DoublePercentRepeatCounter
      . (
        (direction . ,UP)
-       (font-encoding . fetaNumber)
+       (font-encoding . fetaText)
        (font-size . -2)
        (padding . 0.2)
        (self-alignment-X . ,CENTER)
                          (list ly:self-alignment-interface::x-aligned-on-self)))))
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (meta . ((class . Item)
-                (interfaces . (side-position-interface
-                               self-alignment-interface
-                               percent-repeat-item-interface
+                (interfaces . (font-interface
                                percent-repeat-interface
-                               font-interface
+                               percent-repeat-item-interface
+                               self-alignment-interface
+                               side-position-interface
                                text-interface))))))
 
     (DynamicLineSpanner
        (Y-extent . ,ly:axis-group-interface::height)
        (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)
+                                     (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items)
+                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)))
                 (interfaces . (axis-group-interface
                                dynamic-interface
                                dynamic-line-spanner-interface
 
        (direction . ,ly:script-interface::calc-direction)
        (extra-spacing-width . (+inf.0 . -inf.0))
-       (font-encoding . fetaDynamic)
+       (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)
        (X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
        (Y-offset . ,ly:self-alignment-interface::y-aligned-on-self)
        (meta . ((class . Item)
-                (interfaces . (font-interface
-                               text-interface
+                (interfaces . (dynamic-interface
+                               dynamic-text-interface
+                               font-interface
+                               script-interface
                                self-alignment-interface
-                               dynamic-interface
-                               script-interface))))))
+                               text-interface))))))
 
     (DynamicTextSpanner
      . (
+       (before-line-breaking . ,dynamic-text-spanner::before-line-breaking)
        (bound-details . ((right . ((attach-dir .  ,LEFT)
                                    (Y . 0)
                                    (padding . 0.75)
 
                          (left . ((attach-dir .  ,LEFT)
                                   (Y . 0)
-                                  (stencil-offset . (0 . -0.5))
-                                  (padding . 0.5)
+                                  (stencil-offset . (-0.75 . -0.5))
+                                  (padding . 0.75)
                                   ))
                          (left-broken . ((attach-dir .  ,RIGHT)
                                   ))
        (stencil . ,ly:line-spanner::print)
        (style . dashed-line)
        (meta . ((class . Spanner)
-                (interfaces . (font-interface
-                               text-interface
+                (interfaces . (dynamic-interface
+                               dynamic-text-spanner-interface
+                               font-interface
+                               line-interface
                                line-spanner-interface
+                               spanner-interface
+                               text-interface))))))
+
+
+    (Episema
+     . (
+       (bound-details . ((left . ((Y . 0)
+                                  (padding . 0)
+                                  (attach-dir . ,LEFT)
+                                  ))
+                         (right . ((Y . 0)
+                                   (padding . 0)
+                                   (attach-dir . ,RIGHT)
+                                   ))
+                         ))
+       (direction . ,UP)
+       (left-bound-info . ,ly:line-spanner::calc-left-bound-info)
+       (quantize-position . #t)
+       (right-bound-info . ,ly:line-spanner::calc-right-bound-info)
+       (side-axis . ,Y)
+       (stencil . ,ly:line-spanner::print)
+       (style . line)
+       (Y-offset . ,ly:side-position-interface::y-aligned-side)
+       (meta . ((class . Spanner)
+                (interfaces . (episema-interface
+                               font-interface
                                line-interface
-                               dynamic-interface
-                               dynamic-text-spanner-interface
-                               spanner-interface))))))
+                               line-spanner-interface
+                               side-position-interface))))))
 
 
     (Fingering
        (avoid-slur . around)
        (cross-staff . ,ly:side-position-interface::calc-cross-staff)
        (direction . ,ly:script-interface::calc-direction)
-       (font-encoding . fetaNumber)
+       (font-encoding . fetaText)
        (font-size . -5)                ; don't overlap when next to heads.
        (padding . 0.5)
        (positioning-done . ,ly:script-interface::calc-positioning-done)
        (meta . ((class . Item)
                 (interfaces . (finger-interface
                                font-interface
-                               text-script-interface
-                               text-interface
+                               self-alignment-interface
                                side-position-interface
-                               self-alignment-interface))))))
+                               text-interface
+                               text-script-interface))))))
 
     (FretBoard
      . (
        (fret-diagram-details . ((finger-code . below-string)))
        (stencil . ,fret-board::calc-stencil)
        (meta . ((class . Item)
-                (interfaces . (fret-diagram-interface
-                               rhythmic-grob-interface
-                                chord-name-interface
-                               font-interface))))))
+                (interfaces . (chord-name-interface
+                               font-interface
+                               fret-diagram-interface
+                               rhythmic-grob-interface))))))
 
 
     (Glissando
        (zigzag-width . 0.75)
        (meta . ((class . Spanner)
                 (interfaces . (line-interface
-                               unbreakable-spanner-interface
-                               line-spanner-interface))))))
+                               line-spanner-interface
+                               unbreakable-spanner-interface))))))
 
     (GraceSpacing
      . (
                        ,(ly:make-simple-closure
                          (list ly:self-alignment-interface::x-aligned-on-self)))))
        (meta . ((class . Item)
-                (interfaces . (self-alignment-interface
-                               grid-line-interface))))))
+                (interfaces . (grid-line-interface
+                               self-alignment-interface))))))
 
     (GridPoint
      . (
        (stencil . ,ly:hairpin::print)
        (thickness . 1.0)
        (to-barline . #t)
-       (Y-extent . ,ly:hairpin::height)
        (Y-offset . ,ly:self-alignment-interface::y-aligned-on-self)
        (meta . ((class . Spanner)
-                (interfaces . (hairpin-interface
+                (interfaces . (dynamic-interface
+                               hairpin-interface
                                line-interface
                                self-alignment-interface
-                               dynamic-interface
                                spanner-interface))))))
 
     (HarmonicParenthesesItem
        (stencil . ,parentheses-item::print)
        (stencils . ,parentheses-item::calc-angled-bracket-stencils)
        (meta . ((class . Item)
-                (interfaces . (parentheses-interface font-interface))))))
+                (interfaces . (font-interface
+                               parentheses-interface))))))
 
     (HorizontalBracket
      . (
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (meta . ((class . Spanner)
                 (interfaces . (horizontal-bracket-interface
-                               side-position-interface
                                line-interface
+                               side-position-interface
                                spanner-interface))))))
 
 
        (padding . 0.3)
        (self-alignment-X . ,CENTER)
        (self-alignment-Y . ,CENTER)
-       (stencil . ,ly:system-start-text::print)
-       (X-offset . ,ly:side-position-interface::x-aligned-side)
+       (stencil . ,system-start-text::print)
+       (X-offset . ,system-start-text::calc-x-offset)
+       (Y-offset . ,system-start-text::calc-y-offset)
        (meta . ((class . Spanner)
-                (interfaces . (system-start-text-interface
-                               side-position-interface
+                (interfaces . (font-interface
                                self-alignment-interface
-                               font-interface))))))
+                               side-position-interface
+                               system-start-text-interface))))))
 
     (InstrumentSwitch
      . (
        (X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (meta . ((class . Item)
-                (interfaces . (side-position-interface
+                (interfaces . (font-interface
                                self-alignment-interface
-                               text-interface
-                               font-interface))))))
+                               side-position-interface
+                               text-interface))))))
 
 
     (KeyCancellation
        (stencil . ,ly:key-signature-interface::print)
        (Y-offset . ,ly:staff-symbol-referencer::callback)
        (meta . ((class . Item)
-                (interfaces . (key-cancellation-interface
-                               key-signature-interface
-                               staff-symbol-referencer-interface
+                (interfaces . (break-aligned-interface
                                font-interface
-                               break-aligned-interface))))))
+                               key-cancellation-interface
+                               key-signature-interface
+                               staff-symbol-referencer-interface))))))
 
     (KeySignature
      . (
        (stencil . ,ly:key-signature-interface::print)
        (Y-offset . ,ly:staff-symbol-referencer::callback)
        (meta . ((class . Item)
-                (interfaces . (key-signature-interface
-                               staff-symbol-referencer-interface
+                (interfaces . (break-aligned-interface
                                font-interface
-                               break-aligned-interface))))))
+                               key-signature-interface
+                               staff-symbol-referencer-interface))))))
 
 
    (LaissezVibrerTie
                    (height-limit . 1.0)))
        (direction . ,ly:tie::calc-direction)
        (head-direction . ,LEFT)
-       (stencil  . ,ly:tie::print)
+       (stencil  . ,laissez-vibrer::print)
        (thickness . 1.0)
+       (extra-spacing-height . (-0.5 . 0.5))
        (meta . ((class . Item)
                 (interfaces . (semi-tie-interface))))))
 
     (LaissezVibrerTieColumn
      . (
-       (head-direction . ,LEFT)
+       (head-direction . ,ly:semi-tie-column::calc-head-direction)
        (positioning-done . ,ly:semi-tie-column::calc-positioning-done)
        (X-extent . #f)
        (Y-extent . #f)
                        (clef . (extra-space . 0.8))
                        (first-note . (fixed-space . 2.0))
                        (right-edge . (extra-space . 0.0))
-                       (key-signature . (extra-space . 0.0))
+                       (key-signature . (extra-space . 0.8))
                        (key-cancellation . (extra-space . 0.0))
                        ))
        (X-extent . (0 . 0))
        (thickness . 0.8) ; line-thickness
        (Y-extent . (0 . 0))
        (meta . ((class . Spanner)
-                (interfaces . (lyric-interface
-                               lyric-extender-interface))))))
+                (interfaces . (lyric-extender-interface
+                               lyric-interface))))))
 
     (LyricHyphen
      . (
        (thickness . 1.3)
        (Y-extent . (0 . 0))
        (meta . ((class . Spanner)
-                (interfaces . (lyric-interface
-                               font-interface
+                (interfaces . (font-interface
                                lyric-hyphen-interface
+                               lyric-interface
                                spanner-interface))))))
 
     (LyricSpace
        (X-extent . #f)
        (Y-extent . #f)
        (meta . ((class . Spanner)
-                (interfaces . (spanner-interface
-                               lyric-hyphen-interface))))))
+                (interfaces . (lyric-hyphen-interface
+                               spanner-interface))))))
 
     (LyricText
      . (
        (word-space . 0.6)
        (X-offset . ,ly:self-alignment-interface::aligned-on-x-parent)
        (meta . ((class . Item)
-                (interfaces . (rhythmic-grob-interface
+                (interfaces . (font-interface
                                lyric-syllable-interface
+                               rhythmic-grob-interface
                                self-alignment-interface
-                               text-interface
-                               font-interface))))))
+                               text-interface))))))
 
 
     (MeasureGrouping
        (thickness . 1)
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (meta . ((class . Spanner)
-                (interfaces . (side-position-interface
-                               measure-grouping-interface))))))
+                (interfaces . (measure-grouping-interface
+                               side-position-interface))))))
 
     (MelodyItem
      . (
        (stencil . ,ly:mensural-ligature::print)
        (thickness . 1.4)
        (meta . ((class . Spanner)
-                (interfaces . (mensural-ligature-interface
-                               font-interface))))))
+                (interfaces . (font-interface
+                               mensural-ligature-interface))))))
 
     (MetronomeMark
      . (
+       (after-line-breaking . ,ly:side-position-interface::move-to-extremal-staff)
        (direction . ,UP)
        (extra-spacing-width . (+inf.0 . -inf.0))
        (outside-staff-priority . 1000)
        (stencil . ,ly:text-interface::print)
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (meta . ((class . Item)
-                (interfaces . (text-interface
+                (interfaces . (font-interface
+                               metronome-mark-interface
                                side-position-interface
-                               font-interface
-                               metronome-mark-interface))))))
+                               text-interface))))))
 
     (MultiMeasureRest
      . (
        (expand-limit . 10)
        (hair-thickness . 2.0)
        (padding . 1)
+       (spacing-pair . (break-alignment . staff-bar))
        (springs-and-rods . ,ly:multi-measure-rest::set-spacing-rods)
        (staff-position . 0)
        (stencil . ,ly:multi-measure-rest::print)
        (thick-thickness . 6.6)
        (Y-offset . ,ly:staff-symbol-referencer::callback)
        (meta . ((class . Spanner)
-                (interfaces . (multi-measure-rest-interface
+                (interfaces . (font-interface
                                multi-measure-interface
+                               multi-measure-rest-interface
                                rest-interface
-                               font-interface
                                staff-symbol-referencer-interface))))))
 
     (MultiMeasureRestNumber
      . (
        (bound-padding  . 2.0)
        (direction . ,UP)
-       (font-encoding . fetaNumber)
+       (font-encoding . fetaText)
        (padding . 0.4)
        (self-alignment-X . ,CENTER)
        (side-axis . ,Y)
                          (list ly:self-alignment-interface::x-centered-on-y-parent)))))
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (meta . ((class . Spanner)
-                (interfaces . (side-position-interface
+                (interfaces . (font-interface
                                multi-measure-interface
                                self-alignment-interface
-                               font-interface
+                               side-position-interface
                                text-interface))))))
 
     (MultiMeasureRestText
                          (list ly:self-alignment-interface::x-aligned-on-self)))))
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (meta . ((class . Spanner)
-                (interfaces . (side-position-interface
+                (interfaces . (font-interface
                                multi-measure-interface
                                self-alignment-interface
-                               font-interface
+                               side-position-interface
                                text-interface))))))
 
 
 
        (X-extent . ,ly:axis-group-interface::width)
        (meta . ((class . Paper_column)
-                (interfaces . (paper-column-interface
-                               axis-group-interface
+                (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-items . ,ly:axis-group-interface::calc-pure-relevant-items)
+                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)))
+                (interfaces . (axis-group-interface
+                               font-interface
+                               paper-column-interface
                                separation-item-interface
-                               spaceable-grob-interface
-                               font-interface))))))
+                               spaceable-grob-interface))))))
 
     (NoteCollision
      . (
        (X-extent . ,ly:axis-group-interface::width)
        (Y-extent . ,ly:axis-group-interface::height)
        (meta . ((class . Item)
-                (interfaces . (note-collision-interface
-                               axis-group-interface))))))
+                (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-items . ,ly:axis-group-interface::calc-pure-relevant-items)
+                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)))
+                (interfaces . (axis-group-interface
+                               note-collision-interface))))))
 
     (NoteColumn
      . (
        (X-extent . ,ly:axis-group-interface::width)
        (Y-extent . ,ly:axis-group-interface::height)
        (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-items . ,ly:axis-group-interface::calc-pure-relevant-items)
+                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)))
                 (interfaces . (axis-group-interface
-                               separation-item-interface
-                               note-column-interface))))))
+                               note-column-interface
+                               separation-item-interface))))))
 
     (NoteHead
      . (
        (duration-log . ,note-head::calc-duration-log)
+       (extra-spacing-height . ,ly:note-head::include-ledger-line-height)
        (glyph-name . ,note-head::calc-glyph-name)
        (stem-attachment . ,ly:note-head::calc-stem-attachment)
        (stencil . ,ly:note-head::print)
        (X-offset . ,ly:note-head::stem-x-shift)
        (Y-offset . ,ly:staff-symbol-referencer::callback)
        (meta . ((class . Item)
-                (interfaces . (rhythmic-grob-interface
-                               rhythmic-head-interface
-                               font-interface
-                               note-head-interface
-                               ledgered-interface
-                               staff-symbol-referencer-interface
+                (interfaces . (font-interface
                                gregorian-ligature-interface
+                               ledgered-interface
                                mensural-ligature-interface
+                               note-head-interface
+                               rhythmic-grob-interface
+                               rhythmic-head-interface
+                               staff-symbol-referencer-interface
                                vaticana-ligature-interface))))))
 
     (NoteName
      . (
        (stencil . ,ly:text-interface::print)
        (meta . ((class . Item)
-                (interfaces . (note-name-interface
-                               text-interface
-                               font-interface))))))
+                (interfaces . (font-interface
+                               note-name-interface
+                               text-interface))))))
 
     (NoteSpacing
      . (
        (space-to-barline . #t)
        (stem-spacing-correction . 0.5)
        (meta . ((class . Item)
-                (interfaces . (spacing-interface
-                               note-spacing-interface))))))
+                (interfaces . (note-spacing-interface
+                               spacing-interface))))))
 
 
     (OctavateEight
                          (list ly:self-alignment-interface::centered-on-x-parent)))))
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (meta . ((class . Item)
-                (interfaces . (text-interface
+                (interfaces . (font-interface
                                self-alignment-interface
                                side-position-interface
-                               font-interface))))))
+                               text-interface))))))
 
     (OttavaBracket
      . (
        (style . dashed-line)
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (meta . ((class . Spanner)
-                (interfaces . (ottava-bracket-interface
+                (interfaces . (font-interface
                                horizontal-bracket-interface
                                line-interface
+                               ottava-bracket-interface
                                side-position-interface
-                               font-interface
                                text-interface))))))
 
 
        ;; debugging
        ;;                       (font-size . -6) (font-name . "sans") (Y-extent . #f)
        (meta . ((class . Paper_column)
-                (interfaces . (paper-column-interface
+                (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-items . ,ly:axis-group-interface::calc-pure-relevant-items)
+                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)))
+                (interfaces . (axis-group-interface
+                               font-interface
+                               paper-column-interface
                                separation-item-interface
-                               axis-group-interface
-                               spaceable-grob-interface
-                               font-interface))))))
+                               spaceable-grob-interface))))))
 
     (ParenthesesItem
      . (
        (stencil . ,parentheses-item::print)
        (stencils . ,parentheses-item::calc-parenthesis-stencils)
        (meta . ((class . Item)
-                (interfaces . (parentheses-interface font-interface))))))
+                (interfaces . (font-interface
+                               parentheses-interface))))))
 
     (PercentRepeat
      . (
        (dot-negative-kern . 0.75)
        (font-encoding . fetaMusic)
        (slope . 1.0)
+       (spacing-pair . (break-alignment . staff-bar))
        (springs-and-rods . ,ly:multi-measure-rest::set-spacing-rods)
        (stencil . ,ly:multi-measure-rest::percent)
        (thickness . 0.48)
        (meta . ((class . Spanner)
-                (interfaces . (multi-measure-rest-interface
-                               font-interface
+                (interfaces . (font-interface
+                               multi-measure-rest-interface
                                percent-repeat-interface))))))
 
     (PercentRepeatCounter
      . (
        (direction . ,UP)
-       (font-encoding . fetaNumber)
+       (font-encoding . fetaText)
        (font-size . -2)
        (padding . 0.2)
        (self-alignment-X . ,CENTER)
                          (list ly:self-alignment-interface::x-aligned-on-self)))))
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (meta . ((class . Spanner)
-                (interfaces . (side-position-interface
-                               self-alignment-interface
+                (interfaces . (font-interface
                                percent-repeat-interface
-                               font-interface
+                               self-alignment-interface
+                               side-position-interface
                                text-interface))))))
 
     (PhrasingSlur
        (thickness .  1.0)
        (meta . ((class . Spanner)
                 (interfaces . (line-interface
-                               piano-pedal-interface
-                               piano-pedal-bracket-interface))))))
+                               piano-pedal-bracket-interface
+                               piano-pedal-interface))))))
 
 
     (RehearsalMark
      . (
+       (after-line-breaking . ,ly:side-position-interface::move-to-extremal-staff)
        (baseline-skip . 2)
        (break-align-symbols . (staff-bar clef))
        (break-visibility . ,end-of-line-invisible)
                          (list ly:self-alignment-interface::x-aligned-on-self)))))
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (meta . ((class . Item)
-                (interfaces . (text-interface
-                               side-position-interface
-                               break-alignable-interface
+                (interfaces . (break-alignable-interface
                                font-interface
                                mark-interface
-                               self-alignment-interface))))))
+                               self-alignment-interface
+                               side-position-interface
+                               text-interface))))))
 
     (RepeatSlash
      . (
        (stencil . ,ly:percent-repeat-item-interface::beat-slash)
        (thickness . 0.48)
        (meta . ((class . Item)
-                (interfaces . (rhythmic-grob-interface
-                               percent-repeat-interface
-                               percent-repeat-item-interface))))))
+                (interfaces . (percent-repeat-interface
+                               percent-repeat-item-interface
+                               rhythmic-grob-interface))))))
 
     (RepeatTie
      . (
        (head-direction . ,RIGHT)
        (stencil  . ,ly:tie::print)
        (thickness . 1.0)
+       (extra-spacing-height . (-0.5 . 0.5))
        (meta . ((class . Item)
                 (interfaces . (semi-tie-interface))))))
 
        (Y-offset . ,ly:rest::y-offset-callback)
        (meta . ((class . Item)
                 (interfaces . (font-interface
-                               rhythmic-head-interface
+                               rest-interface
                                rhythmic-grob-interface
-                               staff-symbol-referencer-interface
-                               rest-interface))))))
+                               rhythmic-head-interface
+                               staff-symbol-referencer-interface))))))
 
     (RestCollision
      . (
 
     (Script
      . (
+       (add-stem-support . #t)
        (cross-staff . ,ly:script-interface::calc-cross-staff)
        (direction . ,ly:script-interface::calc-direction)
        (font-encoding . fetaMusic)
        (X-offset . ,script-interface::calc-x-offset)
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (meta . ((class . Item)
-                (interfaces . (script-interface
-                               side-position-interface
-                               font-interface))))))
+                (interfaces . (font-interface
+                               script-interface
+                               side-position-interface))))))
 
     (ScriptColumn
      . (
        (meta . ((class . Item)
                 (interfaces . (script-column-interface))))))
 
-    (SeparationItem
-     . (
-       (avoid-slur . inside)
-       (horizontal-skylines . ,ly:separation-item::calc-skylines)
-       (stencil . ,ly:separation-item::print)
-       (X-extent . ,ly:axis-group-interface::width)
-       (Y-extent . ,ly:axis-group-interface::height)
-       (meta . ((class . Item)
-                (interfaces . (separation-item-interface))))))
-
     (Slur
      . (
        (avoid-slur . inside)
        (stencil . ,ly:text-interface::print)
        (X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
        (meta . ((class . Item)
-                (interfaces . (text-interface
-                               self-alignment-interface
+                (interfaces . (font-interface
                                piano-pedal-script-interface
-                               font-interface))))))
+                               self-alignment-interface
+                               text-interface))))))
 
     (SostenutoPedalLineSpanner
      . (
        (Y-extent . ,ly:axis-group-interface::height)
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (meta . ((class . Spanner)
-                (interfaces . (piano-pedal-interface
-                               axis-group-interface
+                (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-items . ,ly:axis-group-interface::calc-pure-relevant-items)
+                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)))
+                (interfaces . (axis-group-interface
+                               piano-pedal-interface
                                side-position-interface))))))
 
     (SpacingSpanner
        (X-extent . ,ly:span-bar::width)
        (Y-extent . ,ly:axis-group-interface::height)
        (meta . ((class . Item)
-                (interfaces . (span-bar-interface
+                (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-items . ,ly:axis-group-interface::calc-pure-relevant-items)
+                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)))
+                (interfaces . (bar-line-interface
                                font-interface
-                               bar-line-interface))))))
+                               span-bar-interface))))))
+
+    (StaffGrouper
+     . (
+       (between-staff-spacing . ((space . 9)
+                                 (minimum-distance . 7)
+                                 (padding . 1)))
+       (after-last-staff-spacing . ((space . 10.5)
+                                    (minimum-distance . 8)
+                                    (padding . 1)))
+       (meta . ((class . Spanner)
+                (interfaces . (staff-grouper-interface))))))
 
     (StaffSpacing
      . (
        (stencil . ,ly:text-interface::print)
        (X-offset . ,ly:side-position-interface::x-aligned-side)
        (meta . ((class . Item)
-                (interfaces . (side-position-interface
+                (interfaces . (font-interface
+                               side-position-interface
                                stanza-number-interface
-                               text-interface
-                               font-interface))))))
+                               text-interface))))))
 
     (Stem
      . (
        (Y-extent . ,ly:stem::height)
        (Y-offset . ,ly:staff-symbol-referencer::callback)
        (meta . ((class . Item)
-                (interfaces . (stem-interface
-                               font-interface))))))
+                (interfaces . (font-interface
+                               stem-interface))))))
 
     (StemTremolo
      . (
     (StringNumber
      . (
        (avoid-slur . around)
-       (font-encoding . fetaNumber)
+       (font-encoding . fetaText)
        (font-size . -5)                ; don't overlap when next to heads.
        (padding . 0.5)
        (script-priority . 100)
        (stencil . ,print-circled-text-callback)
        (text . ,string-number::calc-text)
        (meta . ((class . Item)
-                (interfaces . (string-number-interface
-                               font-interface
-                               text-script-interface
-                               text-interface
+                (interfaces . (font-interface
+                               self-alignment-interface
                                side-position-interface
-                               self-alignment-interface))))))
+                               string-number-interface
+                               text-interface
+                               text-script-interface))))))
 
     (StrokeFinger
      . (
        (stencil . ,ly:text-interface::print)
        (text . ,stroke-finger::calc-text)
        (meta . ((class . Item)
-                (interfaces . (stroke-finger-interface
-                               font-interface
-                               text-script-interface
-                               text-interface
+                (interfaces . (font-interface
+                               self-alignment-interface
                                side-position-interface
-                               self-alignment-interface))))))
+                               stroke-finger-interface
+                               text-interface
+                               text-script-interface))))))
 
     (SustainPedal
      . (
        (stencil . ,ly:sustain-pedal::print)
        (X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
        (meta . ((class . Item)
-                (interfaces . (piano-pedal-interface
-                               text-interface
-                               self-alignment-interface
+                (interfaces . (font-interface
+                               piano-pedal-interface
                                piano-pedal-script-interface
-                               font-interface))))))
+                               self-alignment-interface
+                               text-interface))))))
 
     (SustainPedalLineSpanner
      . (
        (Y-extent . ,ly:axis-group-interface::height)
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (meta . ((class . Spanner)
-                (interfaces . (piano-pedal-interface
-                               axis-group-interface
+                (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-items . ,ly:axis-group-interface::calc-pure-relevant-items)
+                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)))
+                (interfaces . (axis-group-interface
+                               piano-pedal-interface
                                side-position-interface))))))
 
     (System
      . (
+       (adjacent-pure-heights . ,ly:axis-group-interface::adjacent-pure-heights)
        (axes . (,X ,Y))
-       (max-stretch . ,ly:axis-group-interface::calc-max-stretch)
        (vertical-skylines . ,ly:axis-group-interface::calc-skylines)
        (X-extent . ,ly:axis-group-interface::width)
-       (Y-extent . ,ly:axis-group-interface::height)
+       (Y-extent . ,ly:system::height)
        (meta . ((class . System)
-                (interfaces . (system-interface
-                               axis-group-interface))))))
+                (object-callbacks . ((pure-relevant-grobs . ,ly:system::calc-pure-relevant-grobs)
+                                     (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items)
+                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)
+                                     (pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)))
+                (interfaces . (axis-group-interface
+                               system-interface))))))
 
     (SystemStartBar
      . (
        (X-offset . ,ly:side-position-interface::x-aligned-side)
        (Y-extent . #f)
        (meta . ((class . Spanner)
-                (interfaces . (system-start-delimiter-interface
+                (interfaces . (font-interface
                                side-position-interface
-                               font-interface))))))
+                               system-start-delimiter-interface))))))
 
     (SystemStartBracket
      . (
 
     (TabNoteHead
      . (
+       (details . ((tied-properties . ((break-visibility . ,begin-of-line-visible)
+                                       (parenthesize . #t)))
+                   (repeat-tied-properties . ((note-head-visible . #t)
+                                              (parenthesize . #t)))))
        (direction . ,CENTER)
        (duration-log . ,note-head::calc-duration-log)
        (font-series . bold)
        (font-size . -2)
        (stem-attachment . (0.0 . 1.35))
        (stencil . ,ly:text-interface::print)
+       (whiteout . #t)
        (X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
        (Y-offset . ,ly:staff-symbol-referencer::callback)
        (meta . ((class . Item)
-                (interfaces  . (rhythmic-head-interface
-                                font-interface
-                                rhythmic-grob-interface
+                (interfaces  . (font-interface
                                 note-head-interface
+                                rhythmic-grob-interface
+                                rhythmic-head-interface
                                 staff-symbol-referencer-interface
+                                tab-note-head-interface
                                 text-interface))))))
 
     (TextScript
        (X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (meta . ((class . Item)
-                (interfaces . (text-script-interface
-                               text-interface
+                (interfaces . (font-interface
                                instrument-specific-markup-interface
-                               side-position-interface
                                self-alignment-interface
-                               font-interface))))))
+                               side-position-interface
+                               text-interface
+                               text-script-interface))))))
 
     (TextSpanner
      . (
                                   (padding . 0.25)
                                   (attach-dir . ,LEFT)
                                   ))
+                         (left-broken . ((end-on-note . #t)))
                          (right . ((Y . 0)
                                    (padding . 0.25)
                                    ))
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
 
        (meta . ((class . Spanner)
-                (interfaces . (line-spanner-interface
+                (interfaces . (font-interface
                                line-interface
-                               side-position-interface
-                               font-interface))))))
+                               line-spanner-interface
+                               side-position-interface))))))
 
     (Tie
      . (
        (stencil . ,ly:time-signature::print)
        (style . C)
        (meta . ((class . Item)
-                (interfaces . (time-signature-interface
-                               break-aligned-interface
-                               font-interface))))))
+                (interfaces . (break-aligned-interface
+                               font-interface
+                               time-signature-interface))))))
 
     (TrillPitchAccidental
      . (
        (X-offset . ,ly:side-position-interface::x-aligned-side)
        (Y-extent . ,ly:accidental-interface::height)
        (meta . ((class . Item)
-                (interfaces . (trill-pitch-accidental-interface
-                               accidental-interface
+                (interfaces . (accidental-interface
+                               font-interface
                                side-position-interface
-                               font-interface))))))
+                               trill-pitch-accidental-interface))))))
 
     (TrillPitchGroup
      . (
        (stencils . ,parentheses-item::calc-parenthesis-stencils)
        (X-offset . ,ly:side-position-interface::x-aligned-side)
        (meta . ((class . Item)
-                (interfaces . (side-position-interface
-                               parentheses-interface
-                               note-head-interface
+                (interfaces . (axis-group-interface
                                font-interface
-                               axis-group-interface))))))
+                               note-head-interface
+                               parentheses-interface
+                               side-position-interface))))))
 
     (TrillPitchHead
      . (
        (stencil . ,ly:note-head::print)
        (Y-offset . ,ly:staff-symbol-referencer::callback)
        (meta . ((class . Item)
-                (interfaces . (rhythmic-head-interface
-                               font-interface
-                               pitched-trill-interface
+                (interfaces . (font-interface
                                ledgered-interface
+                               pitched-trill-interface
+                               rhythmic-head-interface
                                staff-symbol-referencer-interface))))))
 
     (TrillSpanner
      . (
        (after-line-breaking . ,ly:spanner::kill-zero-spanned-time)
-       (bound-details . ((left . ((text . ,(make-translate-scaled-markup
-                                            '(0.0 . -1.0)
-                                            (make-musicglyph-markup "scripts.trill")))
+       (bound-details . ((left . ((text . ,(make-musicglyph-markup "scripts.trill"))
                                   (Y . 0)
-                                  (stencil-offset . (-0.5 . 0))
-                                  (padding . 1.5)
+                                  (stencil-offset . (-0.5 . -1))
+                                  (padding . 0.5)
                                   (attach-dir . ,CENTER)
-                                  ;; this isn't CENTER because the trill glyph's origin
-                                  ;; is not centered in its extent; to have the trill
-                                  ;; spanner aligned the same as a trill, we need a slight offset
-                                  (anchor-alignment . 0.15)
                                   ))
                          (left-broken . ((end-on-note . #t)))
                          (right . ((Y . 0)))
        (style . trill)
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (meta . ((class . Spanner)
-                (interfaces . (line-spanner-interface
+                (interfaces . (font-interface
                                line-interface
-                               trill-spanner-interface
+                               line-spanner-interface
                                side-position-interface
-                               font-interface))))))
+                               trill-spanner-interface))))))
 
     (TupletBracket
      . (
        (stencil . ,ly:tuplet-number::print)
        (text . ,tuplet-number::calc-denominator-text)
        (meta . ((class . Spanner)
-                (interfaces . (text-interface tuplet-number-interface
-                               font-interface))))))
+                (interfaces . (font-interface
+                               text-interface
+                               tuplet-number-interface))))))
 
 
     (UnaCordaPedal
        (stencil . ,ly:text-interface::print)
        (X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
        (meta . ((class . Item)
-                (interfaces . (text-interface
+                (interfaces . (font-interface
                                piano-pedal-script-interface
                                self-alignment-interface
-                               font-interface))))))
+                               text-interface))))))
 
     (UnaCordaPedalLineSpanner
      . (
        (Y-extent . ,ly:axis-group-interface::height)
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (meta . ((class . Spanner)
-                (interfaces . (piano-pedal-interface
-                               axis-group-interface
+                (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-items . ,ly:axis-group-interface::calc-pure-relevant-items)
+                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)))
+                (interfaces . (axis-group-interface
+                               piano-pedal-interface
                                side-position-interface))))))
 
 
        (stencil . ,ly:vaticana-ligature::print)
        (thickness . 0.6)
        (meta . ((class . Spanner)
-                (interfaces . (vaticana-ligature-interface
-                               font-interface))))))
+                (interfaces . (font-interface
+                               vaticana-ligature-interface))))))
 
     (VerticalAlignment
      . (
-       (after-line-breaking . ,ly:align-interface::stretch-after-break)
        (axes . (,Y))
-       (max-stretch . 0)
-       (padding . 0.5)
-       (positioning-done . ,ly:align-interface::calc-positioning-done)
+       (positioning-done . ,ly:align-interface::align-to-ideal-distances)
        (stacking-dir . -1)
        (vertical-skylines . ,ly:axis-group-interface::combine-skylines)
        (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 . ((Y-common . ,ly:axis-group-interface::calc-y-common)
+                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)
+                                     (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items)
+                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)
+                                     (pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)))
                 (interfaces . (align-interface
                                axis-group-interface))))))
 
      . (
        (adjacent-pure-heights . ,ly:axis-group-interface::adjacent-pure-heights)
        (axes . (,Y))
-       (max-stretch . ,ly:axis-group-interface::calc-max-stretch)
+       (default-next-staff-spacing . ((space . 9)
+                                      (minimum-distance . 8)
+                                      (padding . 1)))
+       (next-staff-spacing . ,ly:axis-group-interface::calc-next-staff-spacing)
+       (non-affinity-spacing . ((padding . 0.5)))
        (stencil . ,ly:axis-group-interface::print)
        (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)
        (Y-offset . ,ly:hara-kiri-group-spanner::force-hara-kiri-callback)
        (meta . ((class . Spanner)
-                (object-callbacks . ((X-common . ,ly:axis-group-interface::calc-x-common)))
+                (object-callbacks . (
+                                     (X-common . ,ly:axis-group-interface::calc-x-common)
+                                     (pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common)
+                                     (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs)
+                                     (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items)
+                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)))
+
                 (interfaces . (axis-group-interface
-                               hara-kiri-group-spanner-interface
-                               vertically-spaceable-interface))))))
+                               hara-kiri-group-spanner-interface))))))
 
     (VoiceFollower
      . (
        (X-extent . #f)
        (Y-extent . #f)
        (meta . ((class . Spanner)
-                (interfaces . (line-spanner-interface
-                               line-interface))))))
+                (interfaces . (line-interface
+                               line-spanner-interface))))))
 
     (VoltaBracket
      . (
        (direction . ,UP)
        (edge-height . (2.0 . 2.0)) ;; staff-space;
-       (font-encoding . fetaNumber)
+       (font-encoding . fetaText)
        (font-size . -4)
        (stencil . ,ly:volta-bracket-interface::print)
-       (thickness . 1.6)  ;;  line-thickness
+       (thickness . 1.6) ;; line-thickness
        (word-space . 0.6)
        (meta . ((class . Spanner)
-                (interfaces . (volta-bracket-interface
+                (interfaces . (font-interface
                                horizontal-bracket-interface
                                line-interface
-                               text-interface
                                side-position-interface
-                               font-interface))))))
+                               text-interface
+                               volta-bracket-interface
+                               volta-interface))))))
 
     (VoltaBracketSpanner
      . (
+       (after-line-breaking . ,ly:side-position-interface::move-to-extremal-staff)
        (axes . (,Y))
        (direction . ,UP)
-       (no-alignment . ,#t)
-       (outside-staff-priority . 100)
+       (no-alignment . #t)
+       (outside-staff-priority . 600)
        (padding . 1)
        (side-axis . ,Y)
        (X-extent . ,ly:axis-group-interface::width)
        (Y-extent . ,ly:axis-group-interface::height)
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (meta . ((class . Spanner)
-                (interfaces . (side-position-interface
-                               axis-group-interface))))))
+                (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-items . ,ly:axis-group-interface::calc-pure-relevant-items)
+                                     (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners)))
+                (interfaces . (axis-group-interface
+                               side-position-interface
+                               volta-interface))))))
 
 ))
 
   ;;  (newline)
   (let* ((name-sym  (car x))
         (grob-entry (cdr x))
-        (meta-entry (cdr (assoc 'meta grob-entry)))
-        (class (cdr (assoc 'class meta-entry)))
+        (meta-entry (assoc-get 'meta grob-entry))
+        (class (assoc-get 'class meta-entry))
         (ifaces-entry
-         (cdr (assoc 'interfaces meta-entry))))
+         (assoc-get 'interfaces meta-entry)))
 
     (cond
      ((eq? 'Item class)
 
 (set! all-grob-descriptions (sort all-grob-descriptions alist<?))
 
+(define (volta-bracket-interface::pure-height grob start end)
+  (let ((edge-height (ly:grob-property grob 'edge-height)))
+    (if (number-pair? edge-height)
+       (let ((smaller (min (car edge-height) (cdr edge-height)))
+             (larger (max (car edge-height) (cdr edge-height))))
+         (interval-union '(0 . 0) (cons smaller larger)))
+       '(0 . 0))))
+
 (define pure-print-callbacks
   (list
    fret-board::calc-stencil
+   note-head::brew-ez-stencil
    print-circled-text-callback
+   laissez-vibrer::print
    lyric-text::print
-   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
+   ly:percent-repeat-item-interface::beat-slash
    ly:text-interface::print
-   ly:script-interface::print))
+   ly:script-interface::print
+   ly:sustain-pedal::print))
+
+;; Sometimes we have grobs with (Y-extent . ,ly:grob::stencil-height)
+;; and the print function is not pure, but there is a easy way to
+;; figure out the Y-extent from the print function.
+(define pure-print-to-height-conversions
+  `(
+    (,ly:arpeggio::print . ,ly:arpeggio::pure-height)
+    (,ly:arpeggio::brew-chord-bracket . ,ly:arpeggio::pure-height)
+    (,ly:hairpin::print . ,ly:hairpin::pure-height)
+    (,ly:volta-bracket-interface::print . ,volta-bracket-interface::pure-height)))
 
-;; ly:grob::stencil-extent is safe iff the print callback is safe too
+;; ly:grob::stencil-extent is safe if the print callback is safe too
 (define (pure-stencil-height grob start stop)
-  (let ((sten (ly:grob-property-data grob 'stencil)))
-    (if (or
-        (ly:stencil? sten)
-        (memq sten pure-print-callbacks))
-       (ly:grob::stencil-height grob)
-       '(0 . 0))))
+  (let* ((sten (ly:grob-property-data grob 'stencil))
+        (pure-height-callback (assoc-get sten pure-print-to-height-conversions)))
+    (cond ((or
+           (ly:stencil? sten)
+           (memq sten pure-print-callbacks))
+          (ly:grob::stencil-height grob))
+         ((procedure? pure-height-callback)
+          (pure-height-callback grob start stop))
+         (else
+          '(0 . 0)))))
+
+;; Sometimes, a pure callback will be chained to a non-pure callback via
+;; chain_offset_callback, in which case this provides a default by simply
+;; passing through the value from the pure callback.
+(define (pure-chain-offset-callback grob start end prev-offset) prev-offset)
 
 (define pure-conversions-alist
   `(
     (,ly:accidental-interface::height . ,ly:accidental-interface::pure-height)
-    (,ly:arpeggio::height . ,ly:arpeggio::pure-height)
-    (,ly:slur::outside-slur-callback . ,ly:slur::pure-outside-slur-callback)
-    (,ly:hairpin::height . ,ly:hairpin::pure-height)
-    (,ly:stem::height . ,ly:stem::pure-height)
-    (,ly:rest::height . ,ly:rest::pure-height)
+    (,ly:axis-group-interface::calc-next-staff-spacing . ,ly:axis-group-interface::calc-pure-next-staff-spacing)
+    (,ly:axis-group-interface::height . ,ly:axis-group-interface::pure-height)
     (,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)
+    (,ly:rest::height . ,ly:rest::pure-height)
     (,ly:self-alignment-interface::y-aligned-on-self . ,ly:self-alignment-interface::pure-y-aligned-on-self)
     (,ly:side-position-interface::y-aligned-side . ,ly:side-position-interface::pure-y-aligned-side)
-    (,ly:axis-group-interface::height . ,ly:axis-group-interface::pure-height)
-    (,ly:hara-kiri-group-spanner::y-extent . ,ly:hara-kiri-group-spanner::pure-height)
     (,ly:slur::height . ,ly:slur::pure-height)
-    (,ly:side-position-interface::y-aligned-side . ,ly:side-position-interface::pure-y-aligned-side)))
+    (,ly:slur::outside-slur-callback . ,ly:slur::pure-outside-slur-callback)
+    (,ly:stem::height . ,ly:stem::pure-height)
+    (,ly:system::height . ,ly:system::calc-pure-height)))
 
 (define pure-functions
   (list
    parenthesize-elements
+   laissez-vibrer::print
    ly:rest::y-offset-callback
    ly:staff-symbol-referencer::callback
    ly:staff-symbol::height))
               (memq extent-callback pure-functions)
               (and
                (pair? (assq extent-callback pure-conversions-alist))
-               (begin
+               (let ((stencil (ly:grob-property-data grob 'stencil)))
                  (or
                   (not (eq? extent-callback ly:grob::stencil-height))
-                  (memq (ly:grob-property-data grob 'stencil) pure-print-callbacks)
-                  (ly:stencil? (ly:grob-property-data grob 'stencil))
-
-                  ))))))))
+                  (memq stencil pure-print-callbacks)
+                  (assq stencil pure-print-to-height-conversions)
+                  (ly:stencil? stencil)))))))))
 
 (define-public (call-pure-function unpure args start end)
   (if (ly:simple-closure? unpure)