X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmetronome-engraver.cc;h=aa75bcb9934b48ec11ad9c55c0f455c0efe09f8e;hb=2459c66ea8366f6541be25728973975ee0bc4d62;hp=b892ed32c7692bc343551f33dbc361bf35e925ca;hpb=e37010af17faa8b185de836664b6544bd29dc1d0;p=lilypond.git

diff --git a/lily/metronome-engraver.cc b/lily/metronome-engraver.cc
index b892ed32c7..aa75bcb993 100644
--- a/lily/metronome-engraver.cc
+++ b/lily/metronome-engraver.cc
@@ -1,116 +1,121 @@
 /*
-  mark-engraver.cc -- implement Metronome_mark_engraver
+  metronome-engraver.cc -- implement Metronome_mark_engraver
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include <ctype.h>
+#include <cctype>
+using namespace std;
 
-#include "bar-line.hh"
-#include "time-signature.hh"
 #include "engraver.hh"
-#include "engraver-group-engraver.hh"
-#include "item.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:
-  TRANSLATOR_DECLARATIONS(Metronome_mark_engraver);
+  TRANSLATOR_DECLARATIONS (Metronome_mark_engraver);
 protected:
   Item *text_;
   Grob *bar_line_;
+
+  SCM last_duration_;
+  SCM last_count_;
+  SCM last_text_;
   
 protected:
-  virtual void stop_translation_timestep ();
-  virtual void acknowledge_grob (Grob_info);
-  void create_items (Music*);
-  virtual bool try_music (Music *ev);
-  virtual void process_music ();
-  
-private:
-  Music *mark_ev_;
+  virtual void derived_mark () const;
+  void stop_translation_timestep ();
+  void process_music ();
 };
 
 Metronome_mark_engraver::Metronome_mark_engraver ()
 {
-  text_ =0;
-  mark_ev_ = 0;
+  text_ = 0;
+  last_duration_ = SCM_EOL;
+  last_count_ = SCM_EOL;
+  last_text_ = SCM_EOL;
 }
 
 void
-Metronome_mark_engraver::acknowledge_grob (Grob_info inf)
+Metronome_mark_engraver::derived_mark () const
 {
-  if (Bar_line::has_interface (inf.grob_))
-    {
-      bar_line_ = inf.grob_;
-    }
-  else if (text_ && Time_signature::has_interface (inf.grob_))
-    {
-      text_->set_parent (inf.grob_, X_AXIS);
-    }
+  scm_gc_mark (last_count_);
+  scm_gc_mark (last_duration_);
+  scm_gc_mark (last_text_);
 }
 
-void 
+void
 Metronome_mark_engraver::stop_translation_timestep ()
 {
   if (text_)
     {
-      if (bar_line_ && !text_->get_parent (X_AXIS))
-	text_->set_parent (bar_line_, X_AXIS);
-      
-      text_->set_grob_property ("side-support-elements" , get_property ("stavesFound"));
-      typeset_grob (text_);
-      text_ =0;
+      Grob *mc = unsmob_grob (get_property ("currentMusicalColumn"));
+      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");
-
-  announce_grob(text_, 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 (),
-			      daddy_context_->self_scm()); 
-      
-      text_->set_grob_property ("text", result);
+      SCM result = scm_call_4 (proc,
+			       text,
+			       duration,
+			       count,
+			       context ()->self_scm ());
+
+      text_->set_property ("text", result);
     }
+
+  last_duration_ = duration;
+  last_count_ = count;
+  last_text_ = text;
 }
 
-ENTER_DESCRIPTION(Metronome_mark_engraver,
-/* descr */       "Engrave metro nome marking. This delegates the real work to the function in the metronomeMarkFormatter property",
-/* creats*/       "MetronomeMark",
-/* accepts */     "metronome-change-event",
-/* acks  */       "time-signature-interface bar-line-interface",
-/* reads */       "stavesFound metronomeMarkFormatter",
-/* write */       "");
+ADD_TRANSLATOR (Metronome_mark_engraver,
+		/* 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 */
+		""
+		);