* lily/include/grob-info.hh: origin_contexts() now does not

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

diff --git a/lily/metronome-engraver.cc b/lily/metronome-engraver.cc
index 80fe67837bca915bf9b83e59ed868f7585567215..b892ed32c7692bc343551f33dbc361bf35e925ca 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,
@@ -23,25 +24,24 @@ class Metronome_mark_engraver : public Engraver
 public:
   TRANSLATOR_DECLARATIONS(Metronome_mark_engraver);
 protected:
-  Item* text_;
-  Grob *   bar_line_;
+  Item *text_;
+  Grob *bar_line_;
   
 protected:
   virtual void stop_translation_timestep ();
   virtual void acknowledge_grob (Grob_info);
   void create_items (Music*);
-  virtual bool try_music (Music *req);
-  virtual void start_translation_timestep ();
+  virtual bool try_music (Music *ev);
   virtual void process_music ();
   
 private:
-  Music * mark_req_;
+  Music *mark_ev_;
 };
 
 Metronome_mark_engraver::Metronome_mark_engraver ()
 {
   text_ =0;
-  mark_req_ = 0;
+  mark_ev_ = 0;
 }
 
 void
@@ -69,7 +69,7 @@ Metronome_mark_engraver::stop_translation_timestep ()
       typeset_grob (text_);
       text_ =0;
     }
-  mark_req_ = 0;
+  mark_ev_ = 0;
 }
 
 
@@ -79,8 +79,7 @@ Metronome_mark_engraver::create_items (Music *rq)
   if (text_)
     return;
 
-  SCM s = get_property ("MetronomeMark");
-  text_ = new Item (s);
+  text_ = make_item ("MetronomeMark");
 
   announce_grob(text_, rq->self_scm());
 }
@@ -89,20 +88,20 @@ Metronome_mark_engraver::create_items (Music *rq)
 bool
 Metronome_mark_engraver::try_music (Music* r)
 {
-  mark_req_ = r;
+  mark_ev_ = r;
   return true;
 }
 
 void
 Metronome_mark_engraver::process_music ()
 {
-  if (mark_req_)
+  if (mark_ev_)
     {
-      create_items (mark_req_);
+      create_items (mark_ev_);
 
       SCM proc = get_property ("metronomeMarkFormatter");
-      SCM result= scm_call_2 (proc, mark_req_->self_scm (),
-                             daddy_trans_->self_scm()); 
+      SCM result= scm_call_2 (proc, mark_ev_->self_scm (),
+                             daddy_context_->self_scm()); 
       
       text_->set_grob_property ("text", result);
     }