Metronome mark: do away with break-align-symbol . multi-measure-rest.

Rather, check directly on class name.  This fixes stray warnings.

diff --git a/lily/metronome-engraver.cc b/lily/metronome-engraver.cc
index a1024049d52ef3323349749f5d17d341d92187d5..db6c66df01b8216f8a5e7d67afd76634edf1a4e2 100644 (file)
--- a/lily/metronome-engraver.cc
+++ b/lily/metronome-engraver.cc
@@ -84,6 +84,13 @@ Metronome_mark_engraver::acknowledge_break_aligned (Grob_info info)
     }
 }
 
+SCM
+grob_name_scm (Grob *g)
+{
+  SCM name_pair = scm_assq (ly_symbol2scm ("name"), g->get_property ("meta"));
+  return scm_is_pair (name_pair) ? scm_cdr (name_pair) : SCM_EOL;
+}
+
 void
 Metronome_mark_engraver::acknowledge_grob (Grob_info info)
 {
@@ -91,8 +98,8 @@ Metronome_mark_engraver::acknowledge_grob (Grob_info info)
 
   if (text_
       && !support_
-      && scm_member (g->get_property_data ("break-align-symbol"),
-                    text_->get_property_data ("break-align-symbols"))
+      && scm_member (grob_name_scm (g),
+                    text_->get_property_data ("non-break-align-symbols"))
       != SCM_BOOL_F)
     {
       text_->set_parent (g, X_AXIS);

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 39a2abd8f38a3c5716a0cda0ca86f6a1e154ac32..d4e3863c03692cdb9001d11759b90d96adb36b52 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1171,7 +1171,8 @@
                          (list ly:self-alignment-interface::x-aligned-on-self)))))
        (self-alignment-X . -1)
        (break-align-symbol . time-signature)
-       (break-align-symbols . (time-signature multi-measure-rest))
+       (break-align-symbols . (time-signature))
+       (non-break-align-symbols . (MultiMeasureRest))
        (meta . ((class . Item)
                 (interfaces . (font-interface
                                metronome-mark-interface
@@ -1181,7 +1182,6 @@
 
     (MultiMeasureRest
      . (
-       (break-align-symbol . multi-measure-rest)
        (expand-limit . 10)
        (hair-thickness . 2.0)
        (padding . 1)