X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmetronome-engraver.cc;h=21eb711a24636c21f8c480c8238ead3397b5f8fa;hb=58a112d5df3f1a8313ee721cea5cd9ce479e2f48;hp=510fcff8742379d51dda7e59898dac64df672090;hpb=14d74ac262744d16fc753ee41042d32860d58633;p=lilypond.git

diff --git a/lily/metronome-engraver.cc b/lily/metronome-engraver.cc
index 510fcff874..21eb711a24 100644
--- a/lily/metronome-engraver.cc
+++ b/lily/metronome-engraver.cc
@@ -3,21 +3,22 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include <cctype>
+using namespace std;
+
+#include "engraver.hh"
 
 #include "note-column.hh"
-#include "bar-line.hh"
-#include "time-signature.hh"
-#include "engraver-group-engraver.hh"
 #include "context.hh"
+#include "grob-array.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:
@@ -26,12 +27,12 @@ protected:
   Item *text_;
   Grob *bar_line_;
   Music *mark_ev_;
-  
-  void create_items (Music*);
+
+  void create_items (Music *);
 protected:
-  virtual void stop_translation_timestep ();
+  void stop_translation_timestep ();
   virtual bool try_music (Music *ev);
-  virtual void process_music ();
+  void process_music ();
 };
 
 Metronome_mark_engraver::Metronome_mark_engraver ()
@@ -40,34 +41,32 @@ Metronome_mark_engraver::Metronome_mark_engraver ()
   mark_ev_ = 0;
 }
 
-void 
+void
 Metronome_mark_engraver::stop_translation_timestep ()
 {
   if (text_)
     {
-      Grob*mc = unsmob_grob (get_property( "currentMusicalColumn"));
+      Grob *mc = unsmob_grob (get_property ("currentMusicalColumn"));
       text_->set_parent (mc, X_AXIS);
-      text_->set_property ("side-support-elements" , get_property ("stavesFound"));
-      
+      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", 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;
@@ -82,22 +81,21 @@ Metronome_mark_engraver::process_music ()
 
       SCM proc = get_property ("metronomeMarkFormatter");
       SCM result = scm_call_2 (proc, mark_ev_->self_scm (),
-			      context ()->self_scm ()); 
-      
+			       context ()->self_scm ());
+
       text_->set_property ("text", result);
     }
 }
 
+#include "translator.icc"
+
 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 */       "");
+		/* 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 */ "metronome-change-event",
+		/* read */ "stavesFound metronomeMarkFormatter",
+		/* write */ "");