Midi2ly: bug fix for --allow-tuplets.

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

diff --git a/lily/metronome-engraver.cc b/lily/metronome-engraver.cc
index a1024049d52ef3323349749f5d17d341d92187d5..7b472d3e220f99d451b0af952b2458ddd290aec0 100644 (file)
--- a/lily/metronome-engraver.cc
+++ b/lily/metronome-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1998--2010 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1998--2011 Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -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,12 +40,14 @@ public:
 protected:
   Item *text_;
   Grob *support_;
+  Grob *bar_;
 
   SCM last_duration_;
   SCM last_count_;
   SCM last_text_;
 
   DECLARE_ACKNOWLEDGER (break_aligned);
+  DECLARE_ACKNOWLEDGER (break_alignment);
   DECLARE_ACKNOWLEDGER (grob);
 
 protected:
@@ -57,6 +60,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,14 +74,27 @@ 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_
-      && (g->get_property_data ("break-align-symbol")
-         == text_->get_property_data ("break-align-symbol")))
+      && 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"))
+          && Item::break_visible (g))
     {
       support_ = g;
       text_->set_parent (g, X_AXIS);
@@ -85,18 +102,27 @@ Metronome_mark_engraver::acknowledge_break_aligned (Grob_info info)
 }
 
 void
-Metronome_mark_engraver::acknowledge_grob (Grob_info info)
+Metronome_mark_engraver::acknowledge_break_alignment (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)
-    {
-      text_->set_parent (g, X_AXIS);
-    }
+      && support_
+      && dynamic_cast<Item *> (g))
+    text_->set_parent (g, X_AXIS);
+}
+
+void
+Metronome_mark_engraver::acknowledge_grob (Grob_info info)
+{
+  Grob *g = info.grob ();
+
+  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
@@ -104,7 +130,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
@@ -122,6 +152,7 @@ Metronome_mark_engraver::stop_translation_timestep ()
                         grob_list_to_grob_array (get_property ("stavesFound")));
       text_ = 0;
       support_ = 0;
+      bar_ = 0;
     }
 }
 
@@ -132,7 +163,7 @@ Metronome_mark_engraver::process_music ()
   SCM duration = get_property ("tempoUnitDuration");
   SCM text = get_property ("tempoText");
 
-  if ( ( (unsmob_duration (duration) && scm_is_number (count))
+  if ( ( (unsmob_duration (duration) && scm_is_true (count))
         || Text_interface::is_markup (text) )
       && !(ly_is_equal (count, last_count_)
           && ly_is_equal (duration, last_duration_)
@@ -158,6 +189,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,