* lily/spacing-spanner.cc (calc_common_shortest_duration): use

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

diff --git a/lily/include/score-engraver.hh b/lily/include/score-engraver.hh
index fdd89da74fd459d2311ff16e7bb9303ef128f491..47f7604f1aaf0c79cc0d56970c0a0ef93e146b90 100644 (file)
--- a/lily/include/score-engraver.hh
+++ b/lily/include/score-engraver.hh
@@ -3,32 +3,31 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SCORE_ENGRAVER_HH
 #define SCORE_ENGRAVER_HH
 
 #include "engraver-group.hh"
-#include "score-translator.hh"
 
-class Score_engraver : public virtual Score_translator,
-                      public virtual Engraver_group
+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 void connect_to_context (Context *);
+  virtual void disconnect_from_context ();
   virtual bool try_music (Music *);
   virtual void initialize ();
   virtual void finalize ();
@@ -42,8 +41,6 @@ protected:
 
 public:
   Score_engraver ();
-  void forbid_breaks ();
-  virtual SCM get_output ();
 };
 
 #endif /* SCORE_ENGRAVER_HH */