X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmetronome-engraver.cc;h=897bb909fd70a5a2c6f5e426af754a2b8ad59d79;hb=84aa0dad3e436409f734cca40f475d3808cfdfeb;hp=058994f906753317dabfe5efccafb1f1ba418d3a;hpb=7e72a1e50e94a7f9738d62599de79fe7745f600c;p=lilypond.git

diff --git a/lily/metronome-engraver.cc b/lily/metronome-engraver.cc
index 058994f906..897bb909fd 100644
--- a/lily/metronome-engraver.cc
+++ b/lily/metronome-engraver.cc
@@ -3,89 +3,68 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include <ctype.h>
+#include <cctype>
 
+#include "note-column.hh"
 #include "bar-line.hh"
 #include "time-signature.hh"
-#include "engraver.hh"
 #include "engraver-group-engraver.hh"
-#include "item.hh"
+#include "context.hh"
 
 /**
-  put stuff over or next to  bars.  Examples: bar numbers, marginal notes,
-  rehearsal marks.
- */
+   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_;
-  
+  Music *mark_ev_;
+
+  void create_items (Music *);
 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_;
 };
 
 Metronome_mark_engraver::Metronome_mark_engraver ()
 {
-  text_ =0;
+  text_ = 0;
   mark_ev_ = 0;
 }
 
 void
-Metronome_mark_engraver::acknowledge_grob (Grob_info inf)
-{
-  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);
-    }
-}
-
-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_property ("side-support-elements", 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());
+  text_ = make_item ("MetronomeMark", rq->self_scm ());
 }
 
-
 bool
-Metronome_mark_engraver::try_music (Music* r)
+Metronome_mark_engraver::try_music (Music *r)
 {
   mark_ev_ = r;
   return true;
@@ -99,17 +78,21 @@ Metronome_mark_engraver::process_music ()
       create_items (mark_ev_);
 
       SCM proc = get_property ("metronomeMarkFormatter");
-      SCM result= scm_call_2 (proc, mark_ev_->self_scm (),
-			      daddy_trans_->self_scm()); 
-      
-      text_->set_grob_property ("text", result);
+      SCM result = scm_call_2 (proc, mark_ev_->self_scm (),
+			       context ()->self_scm ());
+
+      text_->set_property ("text", result);
     }
 }
 
-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,
+		/* descr */ "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}}. ",
+		/* creats*/ "MetronomeMark",
+		/* accepts */ "metronome-change-event",
+		/* acks  */ "",
+		/* reads */ "stavesFound metronomeMarkFormatter",
+		/* write */ "");