]> git.donarmstrong.com Git - lilypond.git/blobdiff - lily/metronome-engraver.cc
Imported Upstream version 2.14.2
[lilypond.git] / lily / metronome-engraver.cc
index aa75bcb9934b48ec11ad9c55c0f455c0efe09f8e..09606c261e655185bee87ee4d76ab277d4cd02c1 100644 (file)
@@ -1,9 +1,20 @@
 /*
-  metronome-engraver.cc -- implement Metronome_mark_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1998--2011 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 1998--2009 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <cctype>
@@ -15,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"
 
@@ -22,36 +34,91 @@ using namespace std;
 
 class Metronome_mark_engraver : public Engraver
 {
+  Item *text_;
+  Grob *support_;
+  Grob *bar_;
+  Stream_event *tempo_ev_;
+
 public:
   TRANSLATOR_DECLARATIONS (Metronome_mark_engraver);
-protected:
-  Item *text_;
-  Grob *bar_line_;
 
-  SCM last_duration_;
-  SCM last_count_;
-  SCM last_text_;
-  
 protected:
-  virtual void derived_mark () const;
   void stop_translation_timestep ();
   void process_music ();
+
+  DECLARE_ACKNOWLEDGER (break_aligned);
+  DECLARE_ACKNOWLEDGER (break_alignment);
+  DECLARE_ACKNOWLEDGER (grob);
+
+  DECLARE_TRANSLATOR_LISTENER (tempo_change);
 };
 
 Metronome_mark_engraver::Metronome_mark_engraver ()
 {
   text_ = 0;
-  last_duration_ = SCM_EOL;
-  last_count_ = SCM_EOL;
-  last_text_ = SCM_EOL;
+  support_ = 0;
+  bar_ = 0;
+  tempo_ev_ = 0;
+}
+
+IMPLEMENT_TRANSLATOR_LISTENER (Metronome_mark_engraver, tempo_change);
+void
+Metronome_mark_engraver::listen_tempo_change (Stream_event *ev)
+{
+  ASSIGN_EVENT_ONCE (tempo_ev_, ev);
+}
+
+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 ("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);
+    }
+  if (bar_ || support_)
+    text_->set_property ("non-musical", SCM_BOOL_T);
+}
+
+void
+Metronome_mark_engraver::acknowledge_break_alignment (Grob_info info)
+{
+  Grob *g = info.grob ();
+
+  if (text_
+      && support_
+      && dynamic_cast<Item *> (g))
+    text_->set_parent (g, X_AXIS);
 }
 
 void
-Metronome_mark_engraver::derived_mark () const
+Metronome_mark_engraver::acknowledge_grob (Grob_info info)
 {
-  scm_gc_mark (last_count_);
-  scm_gc_mark (last_duration_);
-  scm_gc_mark (last_text_);
+  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
@@ -59,44 +126,53 @@ Metronome_mark_engraver::stop_translation_timestep ()
 {
   if (text_)
     {
-      Grob *mc = unsmob_grob (get_property ("currentMusicalColumn"));
-      text_->set_parent (mc, X_AXIS);
+      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
+
+           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;
+      bar_ = 0;
+      tempo_ev_ = 0;
     }
 }
 
 void
 Metronome_mark_engraver::process_music ()
 {
-  SCM count = get_property ("tempoUnitCount");
-  SCM duration = get_property ("tempoUnitDuration");
-  SCM text = get_property ("tempoText");
-
-  if ( ( (unsmob_duration (duration) && scm_is_number (count))
-        || Text_interface::is_markup (text) )
-      && !(ly_is_equal (count, last_count_)
-          && ly_is_equal (duration, last_duration_)
-          && ly_is_equal (text, last_text_)))
+  if (tempo_ev_)
     {
-      text_ = make_item ("MetronomeMark", SCM_EOL);
+      text_ = make_item ("MetronomeMark", tempo_ev_->self_scm ());
 
       SCM proc = get_property ("metronomeMarkFormatter");
-      SCM result = scm_call_4 (proc,
-                              text,
-                              duration,
-                              count,
+      SCM result = scm_call_2 (proc,
+                              tempo_ev_->self_scm (),
                               context ()->self_scm ());
 
       text_->set_property ("text", result);
     }
-
-  last_duration_ = duration;
-  last_count_ = count;
-  last_text_ = text;
 }
 
+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 */
                "Engrave metronome marking.  This delegates the formatting"
@@ -109,11 +185,10 @@ ADD_TRANSLATOR (Metronome_mark_engraver,
                "MetronomeMark ",
 
                /* read */
-               "stavesFound "
+               "currentCommandColumn "
+               "currentMusicalColumn "
                "metronomeMarkFormatter "
-               "tempoUnitDuration "
-               "tempoUnitCount "
-               "tempoText "
+               "stavesFound "
                "tempoHideNote ",
 
                /* write */