X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmetronome-engraver.cc;h=9d585af827c16465d058cd163493993cf1c2d473;hb=628ff1f709a0a06d3a544b1feaa544fe16134911;hp=21eb711a24636c21f8c480c8238ead3397b5f8fa;hpb=9f3572d98bb948c9689cd1f75401a029451fa001;p=lilypond.git

diff --git a/lily/metronome-engraver.cc b/lily/metronome-engraver.cc
index 21eb711a24..9d585af827 100644
--- a/lily/metronome-engraver.cc
+++ b/lily/metronome-engraver.cc
@@ -1,9 +1,20 @@
 /*
-  mark-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--2010 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 1998--2006 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>
@@ -11,14 +22,15 @@ using namespace std;
 
 #include "engraver.hh"
 
-#include "note-column.hh"
 #include "context.hh"
+#include "duration.hh"
 #include "grob-array.hh"
+#include "item.hh"
+#include "stream-event.hh"
+#include "text-interface.hh"
+
+#include "translator.icc"
 
-/**
-   put stuff over or next to  bars.  Examples: bar numbers, marginal notes,
-   rehearsal marks.
-*/
 class Metronome_mark_engraver : public Engraver
 {
 public:
@@ -26,19 +38,31 @@ public:
 protected:
   Item *text_;
   Grob *bar_line_;
-  Music *mark_ev_;
 
-  void create_items (Music *);
+  SCM last_duration_;
+  SCM last_count_;
+  SCM last_text_;
+  
 protected:
+  virtual void derived_mark () const;
   void stop_translation_timestep ();
-  virtual bool try_music (Music *ev);
   void process_music ();
 };
 
 Metronome_mark_engraver::Metronome_mark_engraver ()
 {
   text_ = 0;
-  mark_ev_ = 0;
+  last_duration_ = SCM_EOL;
+  last_count_ = SCM_EOL;
+  last_text_ = SCM_EOL;
+}
+
+void
+Metronome_mark_engraver::derived_mark () const
+{
+  scm_gc_mark (last_count_);
+  scm_gc_mark (last_duration_);
+  scm_gc_mark (last_text_);
 }
 
 void
@@ -50,52 +74,59 @@ Metronome_mark_engraver::stop_translation_timestep ()
       text_->set_parent (mc, X_AXIS);
       text_->set_object ("side-support-elements",
 			 grob_list_to_grob_array (get_property ("stavesFound")));
-
       text_ = 0;
     }
-  mark_ev_ = 0;
-}
-
-void
-Metronome_mark_engraver::create_items (Music *rq)
-{
-  if (text_)
-    return;
-
-  text_ = make_item ("MetronomeMark", rq->self_scm ());
-}
-
-bool
-Metronome_mark_engraver::try_music (Music *r)
-{
-  mark_ev_ = r;
-  return true;
 }
 
 void
 Metronome_mark_engraver::process_music ()
 {
-  if (mark_ev_)
+  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_)))
     {
-      create_items (mark_ev_);
+      text_ = make_item ("MetronomeMark", SCM_EOL);
 
       SCM proc = get_property ("metronomeMarkFormatter");
-      SCM result = scm_call_2 (proc, mark_ev_->self_scm (),
+      SCM result = scm_call_4 (proc,
+			       text,
+			       duration,
+			       count,
 			       context ()->self_scm ());
 
       text_->set_property ("text", result);
     }
-}
 
-#include "translator.icc"
+  last_duration_ = duration;
+  last_count_ = count;
+  last_text_ = text;
+}
 
 ADD_TRANSLATOR (Metronome_mark_engraver,
-		/* doc */ "Engrave metro nome marking. This delegates the formatting work "
-		"to the function in the metronomeMarkFormatter property. "
-		"The mark is put over all staves. "
-		"The staves are taken from the @code{stavesFound} property, "
-		"which is maintained by @code{@ref{Staff_collecting_engraver}}. ",
-		/* create */ "MetronomeMark",
-		/* accept */ "metronome-change-event",
-		/* read */ "stavesFound metronomeMarkFormatter",
-		/* write */ "");
+		/* doc */
+		"Engrave metronome marking.  This delegates the formatting"
+		" work to the function in the @code{metronomeMarkFormatter}"
+		" property.  The mark is put over all staves.  The staves are"
+		" taken from the @code{stavesFound} property, which is"
+		" maintained by @ref{Staff_collecting_engraver}.",
+
+		/* create */
+		"MetronomeMark ",
+
+		/* read */
+		"stavesFound "
+		"metronomeMarkFormatter "
+		"tempoUnitDuration "
+		"tempoUnitCount "
+		"tempoText "
+		"tempoHideNote ",
+
+		/* write */
+		""
+		);