Merge branch 'lilypond/translation'

[lilypond.git] / lily / metronome-engraver.cc

diff --git a/lily/metronome-engraver.cc b/lily/metronome-engraver.cc
index 10935953f9b28716934b0baad4945ef75096b2f6..d55455f23d36533c6e1131971ed8b0d9a53b9ab7 100644 (file)
--- a/lily/metronome-engraver.cc
+++ b/lily/metronome-engraver.cc
@@ -47,6 +47,7 @@ protected:
   SCM last_text_;
 
   DECLARE_ACKNOWLEDGER (break_aligned);
+  DECLARE_ACKNOWLEDGER (break_alignment);
   DECLARE_ACKNOWLEDGER (grob);
 
 protected:
@@ -73,33 +74,39 @@ Metronome_mark_engraver::derived_mark () const
   scm_gc_mark (last_text_);
 }
 
+static bool
+safe_is_member (SCM scm, SCM lst)
+{
+  return scm_list_p (lst) == SCM_BOOL_T
+    && scm_member (scm, lst) != SCM_BOOL_F;
+}
+
 void
 Metronome_mark_engraver::acknowledge_break_aligned (Grob_info info)
 {
   Grob *g = info.grob ();
 
   if (text_
-      && g->get_property_data ("break-align-symbol")
+      && g->get_property ("break-align-symbol")
       == ly_symbol2scm ("staff-bar"))
       bar_ = g;
   else if (text_
           && !support_
-          && scm_member (g->get_property_data ("break-align-symbol"),
-                         text_->get_property_data ("break-align-symbols"))
-          != SCM_BOOL_F)
-    {
-      support_ = g;
-      text_->set_parent (g, X_AXIS);
-    }
+          && safe_is_member (g->get_property ("break-align-symbol"),
+                             text_->get_property ("break-align-symbols"))
+          && Item::break_visible (g))
+    support_ = g;
 }
 
-SCM
-grob_name_scm (Grob *g)
+void
+Metronome_mark_engraver::acknowledge_break_alignment (Grob_info info)
 {
-  SCM name_pair = scm_assq (ly_symbol2scm ("name"), g->get_property ("meta"));
-  return (scm_is_pair (name_pair)
-         ? ly_camel_case_2_lisp_identifier (scm_cdr (name_pair))
-         : SCM_EOL);
+  Grob *g = info.grob ();
+
+  if (text_
+      && support_
+      && dynamic_cast<Item *> (g))
+    text_->set_parent (g, X_AXIS);
 }
 
 void
@@ -107,11 +114,12 @@ Metronome_mark_engraver::acknowledge_grob (Grob_info info)
 {
   Grob *g = info.grob ();
 
-  if (text_
-      && scm_member (grob_name_scm (g),
-                    text_->get_property_data ("non-break-align-symbols"))
-      != SCM_BOOL_F)
-      text_->set_parent (g, X_AXIS);
+  if (text_)
+    for (SCM s = text_->get_property ("non-break-align-symbols");
+        scm_is_pair (s);
+        s = scm_cdr (s))
+      if (g->internal_has_interface (scm_car (s)))
+       text_->set_parent (g, X_AXIS);
 }
 
 void
@@ -178,6 +186,7 @@ Metronome_mark_engraver::process_music ()
 
 
 ADD_ACKNOWLEDGER (Metronome_mark_engraver, break_aligned);
+ADD_ACKNOWLEDGER (Metronome_mark_engraver, break_alignment);
 ADD_ACKNOWLEDGER (Metronome_mark_engraver, grob);
 
 ADD_TRANSLATOR (Metronome_mark_engraver,