X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Finclude%2Fscore-engraver.hh;h=d2de464f6004b8cfa9c18000eb6801a346f382be;hb=8dfabc02615ad25d5450cb5f42e194ce50a7be18;hp=a58b2b6efda44532179e25fd7f47b19628adbdf5;hpb=1855cf7137149c0bd27b5851fd9db498385591b3;p=lilypond.git

diff --git a/lily/include/score-engraver.hh b/lily/include/score-engraver.hh
index a58b2b6efd..d2de464f60 100644
--- 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--2004 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-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_;
-  int breaks_;			// used for stat printing
-  
-  Link_array<Grob> elems_;
-  Paper_column* command_column_;
-  Paper_column* musical_column_;
-  Paper_score * pscore_;
-
-  void make_columns ();
-  void set_columns (Paper_column*,Paper_column*);
+
+  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 acknowledge_grob (Grob_info);
-  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);
-  virtual void stop_translation_timestep ();
+  void stop_translation_timestep ();
+
+  /*
+    Translator interface
+  */
+  virtual void derived_mark () const;
 
 public:
-  TRANSLATOR_DECLARATIONS(Score_engraver);
-  void forbid_breaks ();
-  virtual Music_output *get_output ();  
+  Score_engraver ();
 };
 
 #endif /* SCORE_ENGRAVER_HH */