Run `make grand-replace'.

[lilypond.git] / lily / include / score-engraver.hh

diff --git a/lily/include/score-engraver.hh b/lily/include/score-engraver.hh
index c045994d5b138e330aa3eeab604424946f5a441f..c65c5980bceeaf88a22e0bfbfd65ce93f345cfd9 100644 (file)
--- a/lily/include/score-engraver.hh
+++ b/lily/include/score-engraver.hh
@@ -3,48 +3,43 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SCORE_ENGRAVER_HH
 #define SCORE_ENGRAVER_HH
 
-#include "engraver-group-engraver.hh"
-#include "score-translator.hh"
+#include "engraver-group.hh"
 
-class Score_engraver : public virtual Score_translator,
-                      public virtual Engraver_group_engraver
+class Score_engraver : public Engraver_group
 {
   System *system_;
 
-  Link_array<Grob> elems_;
+  vector<Grob*> elems_;
   Paper_score *pscore_;
 
   void typeset_all ();
 
 protected:
-  /* Score_translator */
-  virtual void finish ();
-  virtual void prepare (Moment);
-  virtual void one_time_step ();
+  DECLARE_LISTENER (finish);
+  DECLARE_LISTENER (prepare);
+  DECLARE_LISTENER (one_time_step);
 
-  
   /* Engraver_group_engraver interface */
-  virtual bool try_music (Music *);
+  virtual void connect_to_context (Context *);
+  virtual void disconnect_from_context ();
   virtual void initialize ();
   virtual void finalize ();
   virtual void announce_grob (Grob_info);
-  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
+  void stop_translation_timestep ();
 
   /*
     Translator interface
-   */
+  */
   virtual void derived_mark () const;
 
 public:
   Score_engraver ();
-  void forbid_breaks ();
-  virtual SCM get_output ();
 };
 
 #endif /* SCORE_ENGRAVER_HH */