X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmetronome-engraver.cc;h=069e67d1e125a516b535cae52223222bb631da4a;hb=96e14d746b102f223acf6b6f4cdb8b0f0a11cd24;hp=40be81e22181a15f51b3505c49fdb9b67b900162;hpb=7dcae7597fae14ce5c4e2e7d50c2709d162b7332;p=lilypond.git

diff --git a/lily/metronome-engraver.cc b/lily/metronome-engraver.cc
index 40be81e221..069e67d1e1 100644
--- a/lily/metronome-engraver.cc
+++ b/lily/metronome-engraver.cc
@@ -1,9 +1,9 @@
 /*
-  mark-engraver.cc -- implement Metronome_mark_engraver
+  metronome-engraver.cc -- implement Metronome_mark_engraver
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2007 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include <cctype>
@@ -11,15 +11,15 @@ using namespace std;
 
 #include "engraver.hh"
 
-#include "item.hh"
 #include "context.hh"
-#include "grob-array.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:
@@ -30,6 +30,7 @@ protected:
 
   SCM last_duration_;
   SCM last_count_;
+  SCM last_text_;
   
 protected:
   virtual void derived_mark () const;
@@ -42,6 +43,7 @@ Metronome_mark_engraver::Metronome_mark_engraver ()
   text_ = 0;
   last_duration_ = SCM_EOL;
   last_count_ = SCM_EOL;
+  last_text_ = SCM_EOL;
 }
 
 void
@@ -49,6 +51,7 @@ Metronome_mark_engraver::derived_mark () const
 {
   scm_gc_mark (last_count_);
   scm_gc_mark (last_duration_);
+  scm_gc_mark (last_text_);
 }
 
 void
@@ -60,7 +63,6 @@ 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;
     }
 }
@@ -70,43 +72,50 @@ Metronome_mark_engraver::process_music ()
 {
   SCM count = get_property ("tempoUnitCount");
   SCM duration = get_property ("tempoUnitDuration");
-  
-  if (unsmob_duration (duration)
-      && scm_is_number (count)
+  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 (duration, last_duration_)
+	   && ly_is_equal (text, last_text_)))
     {
       text_ = make_item ("MetronomeMark", SCM_EOL);
 
       SCM proc = get_property ("metronomeMarkFormatter");
-      SCM result = scm_call_3 (proc,
+      SCM result = scm_call_4 (proc,
+			       text,
 			       duration,
 			       count,
 			       context ()->self_scm ());
 
       text_->set_property ("text", result);
-
-      last_duration_ = duration;
-      last_count_ = count;
     }
-}
 
-#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 */ "",
+		/* 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 */ "");
+		/* write */
+		""
+		);