Metronome-mark: process Neil's comments: cleanups and fixing warnings.

[lilypond.git] / scm / define-grobs.scm

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 3f3bcc6410b0dc41c91b756034b260f16defe7fa..8a7689a6a6d221389a4999e0ae1133c02a61a832 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -53,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
@@ -431,6 +430,7 @@
                               key-cancellation
                               key-signature
                               time-signature
+                              metronome-mark
                               custos)
 
                              ;; unbroken
@@ -443,6 +443,7 @@
                               key-cancellation
                               key-signature
                               time-signature
+                              metronome-mark
                               custos)
 
                              ;; begin of line
@@ -455,6 +456,7 @@
                               key-signature
                               staff-bar
                               time-signature
+                              metronome-mark
                               custos)))
        (non-musical . #t)
        (positioning-done . ,ly:break-alignment-interface::calc-positioning-done)
@@ -1156,6 +1158,7 @@
     (MetronomeMark
      . (
        (after-line-breaking . ,ly:side-position-interface::move-to-extremal-staff)
+       (break-visibility . ,end-of-line-invisible)
        (direction . ,UP)
        (extra-spacing-width . (+inf.0 . -inf.0))
        (outside-staff-priority . 1000)
@@ -1163,9 +1166,22 @@
        (side-axis . ,Y)
        (stencil . ,ly:text-interface::print)
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
+       (X-offset . ,(ly:make-simple-closure
+                     `(,+
+                       ,(ly:make-simple-closure
+                         (list ly:break-alignable-interface::self-align-callback))
+                       ,(ly:make-simple-closure
+                         (list ly:self-alignment-interface::x-aligned-on-self)))))
+       (self-alignment-X . ,LEFT)
+       (break-align-symbol . metronome-mark)
+       (break-align-symbols . (key-signature time-signature metronome-mark))
+       (non-break-align-symbols . (multi-measure-rest))
        (meta . ((class . Item)
-                (interfaces . (font-interface
+                (interfaces . (break-alignable-interface
+                               break-aligned-interface
+                               font-interface
                                metronome-mark-interface
+                               self-alignment-interface
                                side-position-interface
                                text-interface))))))
 
@@ -1174,6 +1190,7 @@
        (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)
@@ -1295,6 +1312,7 @@
     (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)
@@ -1413,6 +1431,7 @@
        (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)
@@ -1565,6 +1584,7 @@
 
     (Script
      . (
+       (add-stem-support . #t)
        (cross-staff . ,ly:script-interface::calc-cross-staff)
        (direction . ,ly:script-interface::calc-direction)
        (font-encoding . fetaMusic)
@@ -2088,6 +2108,7 @@
        (break-align-anchor
         . ,ly:break-aligned-interface::calc-extent-aligned-anchor)
        (break-align-symbol . time-signature)
+       (break-align-anchor-alignment . ,LEFT)
        (break-visibility . ,all-visible)
        (extra-spacing-height . (-1.0 . 1.0))
        (non-musical . #t)
@@ -2296,8 +2317,7 @@
                                      (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
      . (
@@ -2434,7 +2454,8 @@
    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
@@ -2475,7 +2496,6 @@
     (,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:side-position-interface::y-aligned-side . ,ly:side-position-interface::pure-y-aligned-side)
     (,ly:slur::height . ,ly:slur::pure-height)
     (,ly:slur::outside-slur-callback . ,ly:slur::pure-outside-slur-callback)
     (,ly:stem::height . ,ly:stem::pure-height)