]> git.donarmstrong.com Git - lilypond.git/commitdiff
define-grobs.scm: Sort interfaces.
authorMark Polesky <markpolesky@yahoo.com>
Wed, 22 Jul 2009 23:12:40 +0000 (16:12 -0700)
committerMark Polesky <markpolesky@yahoo.com>
Wed, 22 Jul 2009 23:33:00 +0000 (16:33 -0700)
* Sort interfaces.
* Remove "reorder sensibly" comment.

scm/define-grobs.scm

index 30b1d8ae6d8702ad29c1bee766f28049261ce373..259a4be74f9acb65dcf27adece1126f422663c11 100644 (file)
@@ -13,8 +13,6 @@
 
 ;; TODO: junk the meta field in favor of something more compact?
 
-;;; todo:: reorder sensibly.
-
 (define-public all-grob-descriptions
   `(
     (Accidental
        (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))))))
+                (interfaces . (ambitus-interface
+                               axis-group-interface
+                               break-aligned-interface))))))
 
     (AmbitusAccidental
      . (
        (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
      . (
        (X-offset . ,ly:self-alignment-interface::centered-on-x-parent)
        (meta . ((class . Item)
                 (interfaces . (ambitus-interface
-                               staff-symbol-referencer-interface
-                               font-interface))))))
+                               font-interface
+                               staff-symbol-referencer-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
      . (
        (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
      . (
        (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
      . (
        (Y-extent . ,ly:axis-group-interface::height)
        (meta . ((class . Spanner)
                 (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))))))
+                (interfaces . (axis-group-interface
+                               side-position-interface))))))
 
     (BassFigureBracket
      . (
 
        (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
      . (
        (stencil . ,ly:clef::print)
        (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
      . (
        (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
      . (
        (staff-position . ,dots::calc-staff-position)
        (stencil . ,ly:dots::print)
        (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))))))
 
                          (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
        (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
+                               font-interface
+                               script-interface
                                self-alignment-interface
-                               dynamic-interface
-                               script-interface))))))
+                               text-interface))))))
 
     (DynamicTextSpanner
      . (
        (stencil . ,ly:line-spanner::print)
        (style . dashed-line)
        (meta . ((class . Spanner)
-                (interfaces . (font-interface
-                               text-interface
-                               line-spanner-interface
-                               line-interface
-                               dynamic-interface
+                (interfaces . (dynamic-interface
                                dynamic-text-spanner-interface
-                               spanner-interface))))))
+                               font-interface
+                               line-interface
+                               line-spanner-interface
+                               spanner-interface
+                               text-interface))))))
 
 
     (Fingering
        (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
      . (
        (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))))))
 
 
        (stencil . ,ly:system-start-text::print)
        (X-offset . ,ly:side-position-interface::x-aligned-side)
        (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
        (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
      . (
        (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
      . (
        (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
                          (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
+                (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))))))
+                (interfaces . (axis-group-interface
+                               note-collision-interface))))))
 
     (NoteColumn
      . (
        (Y-extent . ,ly:axis-group-interface::height)
        (meta . ((class . Item)
                 (interfaces . (axis-group-interface
-                               separation-item-interface
-                               note-column-interface))))))
+                               note-column-interface
+                               separation-item-interface))))))
 
     (NoteHead
      . (
        (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
+                (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
      . (
        (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
                          (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
                          (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
      . (
        (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
      . (
        (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
      . (
        (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
+                (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
+                (interfaces . (bar-line-interface
                                font-interface
-                               bar-line-interface))))))
+                               span-bar-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
      . (
        (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
+                (interfaces . (axis-group-interface
+                               piano-pedal-interface
                                side-position-interface))))))
 
     (System
        (X-extent . ,ly:axis-group-interface::width)
        (Y-extent . ,ly:axis-group-interface::height)
        (meta . ((class . System)
-                (interfaces . (system-interface
-                               axis-group-interface))))))
+                (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
      . (
        (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
                                 text-interface))))))
 
        (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
      . (
        (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
        (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
+                (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
      . (
        (X-extent . #f)
        (Y-extent . #f)
        (meta . ((class . Spanner)
-                (interfaces . (line-spanner-interface
-                               line-interface))))))
+                (interfaces . (line-interface
+                               line-spanner-interface))))))
 
     (VoltaBracket
      . (
        (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))))))
 
     (VoltaBracketSpanner
      . (
        (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))))))
+                (interfaces . (axis-group-interface
+                               side-position-interface))))))
 
 ))