*** empty log message ***

[lilypond.git] / lily / metronome-engraver.cc

diff --git a/lily/metronome-engraver.cc b/lily/metronome-engraver.cc
index 3fbaf3b48c84e2d23824304756148affc00bff8e..2f0cdf5804d00b29c4a8d8d1129806ba0e83693d 100644 (file)
--- a/lily/metronome-engraver.cc
+++ b/lily/metronome-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2003 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include <ctype.h>
@@ -13,6 +13,7 @@
 #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,
@@ -21,7 +22,7 @@
 class Metronome_mark_engraver : public Engraver
 {
 public:
-  TRANSLATOR_DECLARATIONS(Metronome_mark_engraver);
+  TRANSLATOR_DECLARATIONS (Metronome_mark_engraver);
 protected:
   Item *text_;
   Grob *bar_line_;
@@ -64,8 +65,8 @@ Metronome_mark_engraver::stop_translation_timestep ()
       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_->set_property ("side-support-elements" , get_property ("stavesFound"));
+      
       text_ =0;
     }
   mark_ev_ = 0;
@@ -78,9 +79,8 @@ Metronome_mark_engraver::create_items (Music *rq)
   if (text_)
     return;
 
-  text_ = make_item ("MetronomeMark");
+  text_ = make_item ("MetronomeMark", rq->self_scm () );
 
-  announce_grob(text_, rq->self_scm());
 }
 
 
@@ -100,14 +100,20 @@ Metronome_mark_engraver::process_music ()
 
       SCM proc = get_property ("metronomeMarkFormatter");
       SCM result= scm_call_2 (proc, mark_ev_->self_scm (),
-                             daddy_trans_->self_scm()); 
+                             context ()->self_scm ()); 
       
-      text_->set_grob_property ("text", result);
+      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",
+ENTER_DESCRIPTION (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  */       "time-signature-interface bar-line-interface",