Break-alignable metronome marks: remove hardcoding of time signature.

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index c13e099a0a4e5a2f7bc2e2fb458ad387f8ff9ec0..8b9a1f1dc399699dfd3651dac5f010781b6fe6f5 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1162,10 +1162,20 @@
        (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 . -1)
+       (break-align-symbol . time-signature)
+       (break-align-symbols . (time-signature))
        (meta . ((class . Item)
                 (interfaces . (font-interface
                                metronome-mark-interface
                                side-position-interface
+                               break-alignable-interface
                                text-interface))))))
 
     (MultiMeasureRest
@@ -2091,6 +2101,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)
@@ -2436,7 +2447,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