Metronome-mark: Neil's comments[2]; more cleanups.

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

diff --git a/lily/metronome-engraver.cc b/lily/metronome-engraver.cc
index d71452e286bf067eb29cef184b638ced6f2eaa53..7eaf3145ad2086308997e38c09bf5d10a2fd0b6f 100644 (file)
--- a/lily/metronome-engraver.cc
+++ b/lily/metronome-engraver.cc
@@ -26,6 +26,7 @@ using namespace std;
 #include "duration.hh"
 #include "grob-array.hh"
 #include "item.hh"
+#include "music.hh"
 #include "stream-event.hh"
 #include "text-interface.hh"
 
@@ -39,6 +40,7 @@ public:
 protected:
   Item *text_;
   Grob *support_;
+  Grob *bar_;
 
   SCM last_duration_;
   SCM last_count_;
@@ -57,6 +59,7 @@ Metronome_mark_engraver::Metronome_mark_engraver ()
 {
   text_ = 0;
   support_ = 0;
+  bar_ = 0;
   last_duration_ = SCM_EOL;
   last_count_ = SCM_EOL;
   last_text_ = SCM_EOL;
@@ -70,16 +73,26 @@ 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_
-      && !support_
-      && scm_member (g->get_property_data ("break-align-symbol"),
-                    text_->get_property_data ("break-align-symbols"))
-      != SCM_BOOL_F)
+      && g->get_property ("break-align-symbol")
+      == ly_symbol2scm ("staff-bar"))
+      bar_ = g;
+  else if (text_
+          && !support_
+          && safe_is_member (g->get_property ("break-align-symbol"),
+                             text_->get_property ("break-align-symbols")))
     {
       support_ = g;
       text_->set_parent (g, X_AXIS);
@@ -90,7 +103,9 @@ 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;
+  return (scm_is_pair (name_pair)
+         ? ly_camel_case_2_lisp_identifier (scm_cdr (name_pair))
+         : SCM_EOL);
 }
 
 void
@@ -99,13 +114,9 @@ Metronome_mark_engraver::acknowledge_grob (Grob_info info)
   Grob *g = info.grob ();
 
   if (text_
-      && !support_
-      && scm_member (grob_name_scm (g),
-                    text_->get_property_data ("non-break-align-symbols"))
-      != SCM_BOOL_F)
-    {
-      text_->set_parent (g, X_AXIS);
-    }
+      && safe_is_member (grob_name_scm (g),
+                        text_->get_property ("non-break-align-symbols")))
+    text_->set_parent (g, X_AXIS);
 }
 
 void
@@ -113,7 +124,11 @@ Metronome_mark_engraver::stop_translation_timestep ()
 {
   if (text_)
     {
-      if (!support_)
+      if (text_->get_parent (X_AXIS)
+         && text_->get_parent (X_AXIS)->internal_has_interface (ly_symbol2scm ("multi-measure-rest-interface"))
+         && bar_)
+       text_->set_parent (bar_, X_AXIS);
+      else if (!support_)
        {
          /*
            Gardner Read "Music Notation", p.278
@@ -131,6 +146,7 @@ Metronome_mark_engraver::stop_translation_timestep ()
                         grob_list_to_grob_array (get_property ("stavesFound")));
       text_ = 0;
       support_ = 0;
+      bar_ = 0;
     }
 }