Metronome-mark: align on key-signature too.

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

diff --git a/lily/metronome-engraver.cc b/lily/metronome-engraver.cc
index f3f04f1d3cd7d0f60f9ca30e8492a4ea471e2af2..d71452e286bf067eb29cef184b638ced6f2eaa53 100644 (file)
--- a/lily/metronome-engraver.cc
+++ b/lily/metronome-engraver.cc
@@ -35,17 +35,18 @@ class Metronome_mark_engraver : public Engraver
 {
 public:
   TRANSLATOR_DECLARATIONS (Metronome_mark_engraver);
+
 protected:
   Item *text_;
-  Grob *bar_line_;
+  Grob *support_;
 
   SCM last_duration_;
   SCM last_count_;
   SCM last_text_;
 
   DECLARE_ACKNOWLEDGER (break_aligned);
-  DECLARE_ACKNOWLEDGER (break_alignment);
-  
+  DECLARE_ACKNOWLEDGER (grob);
+
 protected:
   virtual void derived_mark () const;
   void stop_translation_timestep ();
@@ -55,6 +56,7 @@ protected:
 Metronome_mark_engraver::Metronome_mark_engraver ()
 {
   text_ = 0;
+  support_ = 0;
   last_duration_ = SCM_EOL;
   last_count_ = SCM_EOL;
   last_text_ = SCM_EOL;
@@ -69,45 +71,66 @@ Metronome_mark_engraver::derived_mark () const
 }
 
 void
-Metronome_mark_engraver::acknowledge_break_aligned (Grob_info inf)
+Metronome_mark_engraver::acknowledge_break_aligned (Grob_info info)
 {
-  Grob *s = inf.grob ();
+  Grob *g = info.grob ();
+
   if (text_
-      && !text_->get_parent (X_AXIS)
-      && dynamic_cast<Item *> (s)
-      && (s->get_property_data ("break-align-symbol")
-         == text_->get_property_data ("break-align-symbol")))
-    text_->set_parent (s, X_AXIS);
+      && !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);
+    }
+}
+
+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_break_alignment (Grob_info inf)
+Metronome_mark_engraver::acknowledge_grob (Grob_info info)
 {
-  Grob *s = inf.grob ();
+  Grob *g = info.grob ();
+
   if (text_
-      && dynamic_cast<Item *> (s))
+      && !support_
+      && scm_member (grob_name_scm (g),
+                    text_->get_property_data ("non-break-align-symbols"))
+      != SCM_BOOL_F)
     {
-      text_->set_parent (s, X_AXIS);
+      text_->set_parent (g, X_AXIS);
     }
 }
 
-
 void
 Metronome_mark_engraver::stop_translation_timestep ()
 {
   if (text_)
     {
-      /*
-       Problem: how to set musical columns as parent
-       when there's no breakable object of interest nearby?
-       We don't want metronome marks aligned to paper columns.
-       
-       Grob *mc = unsmob_grob (get_property ("currentMusicalColumn"));
-       text_->set_parent (mc, X_AXIS);
-      */
+      if (!support_)
+       {
+         /*
+           Gardner Read "Music Notation", p.278
+
+           Align the metronome mark over the time signature (or the
+           first notational element of the measure if no time
+           signature is present in that measure).
+         */
+         if (Grob *mc = unsmob_grob (get_property ("currentMusicalColumn")))
+           text_->set_parent (mc, X_AXIS);
+         else if (Grob *cc = unsmob_grob (get_property ("currentCommandColumn")))
+           text_->set_parent (cc, X_AXIS);
+       }
       text_->set_object ("side-support-elements",
                         grob_list_to_grob_array (get_property ("stavesFound")));
       text_ = 0;
+      support_ = 0;
     }
 }
 
@@ -144,7 +167,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,
                /* doc */