Merge branch 'master' of ssh+git://gpercival@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/lily/metronome-engraver.cc b/lily/metronome-engraver.cc
index 40be81e22181a15f51b3505c49fdb9b67b900162..897948d88b652a8de29aea4fb368212692ab2a45 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--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2007 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include <cctype>
@@ -11,10 +11,13 @@ using namespace std;
 
 #include "engraver.hh"
 
-#include "item.hh"
 #include "context.hh"
-#include "grob-array.hh"
 #include "duration.hh"
+#include "grob-array.hh"
+#include "item.hh"
+#include "stream-event.hh"
+
+#include "translator.icc"
 
 /**
    put stuff over or next to  bars.  Examples: bar numbers, marginal notes,
@@ -58,9 +61,6 @@ Metronome_mark_engraver::stop_translation_timestep ()
     {
       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;
     }
 }
@@ -85,13 +85,11 @@ Metronome_mark_engraver::process_music ()
                               context ()->self_scm ());
 
       text_->set_property ("text", result);
-
-      last_duration_ = duration;
-      last_count_ = count;
     }
-}
 
-#include "translator.icc"
+  last_duration_ = duration;
+  last_count_ = count;
+}
 
 ADD_TRANSLATOR (Metronome_mark_engraver,
                /* doc */ "Engrave metro nome marking. This delegates the formatting work "
@@ -100,7 +98,6 @@ ADD_TRANSLATOR (Metronome_mark_engraver,
                "The staves are taken from the @code{stavesFound} property, "
                "which is maintained by @code{@ref{Staff_collecting_engraver}}. ",
                /* create */ "MetronomeMark",
-               /* accept */ "",
 
                /* read */
                "stavesFound "