]> git.donarmstrong.com Git - lilypond.git/commitdiff
Break-alignable metronome marks: remove hardcoding of time signature.
authorJan Nieuwenhuizen <janneke@gnu.org>
Mon, 7 Jun 2010 10:40:09 +0000 (12:40 +0200)
committerJan Nieuwenhuizen <janneke@gnu.org>
Tue, 24 Aug 2010 13:24:25 +0000 (15:24 +0200)
lily/metronome-engraver.cc
scm/define-grobs.scm

index 24c5664f14ecc2f5cfd945ccdbde83c1debf678f..a37a9475fb34e5329eb7e109d8ecaf0c13e760d1 100644 (file)
@@ -28,7 +28,6 @@ using namespace std;
 #include "item.hh"
 #include "stream-event.hh"
 #include "text-interface.hh"
-#include "time-signature.hh"
 
 #include "translator.icc"
 
@@ -74,8 +73,12 @@ void
 Metronome_mark_engraver::acknowledge_break_aligned (Grob_info inf)
 {
   Grob *s = inf.grob ();
-  if (text_ && Time_signature::has_interface (s))
-    support_ = s;
+  if (text_
+      && (s->get_property_data ("break-align-symbol")
+         == text_->get_property_data ("break-align-symbol")))
+    {
+      support_ = s;
+    }
 }
 
 void
index 88883dc48ef4974013216660628851b893c26340..8b9a1f1dc399699dfd3651dac5f010781b6fe6f5 100644 (file)
                        ,(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