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 390a4451e5a3abf9402748d59dd7187e3ce68e8d..c65c5980bceeaf88a22e0bfbfd65ce93f345cfd9 100644 (file)
--- a/lily/include/score-engraver.hh
+++ b/lily/include/score-engraver.hh
@@ -3,58 +3,43 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 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 "global-translator.hh"
+#include "engraver-group.hh"
 
-/**
-  Top level engraver. Puts elements into appropriate columns.
- */
-class Score_engraver : 
-  public Engraver_group_engraver, public Global_translator 
+class Score_engraver : public Engraver_group
 {
   System *system_;
-  int breaks_;
-  
-  
-  Link_array<Grob> elems_;
-    
-  Paper_column* command_column_;
-  Paper_column* musical_column_;
-  void make_columns ();
-  void set_columns (Paper_column*,Paper_column*);
+
+  vector<Grob*> elems_;
+  Paper_score *pscore_;
+
   void typeset_all ();
-    
-public:
-  TRANSLATOR_DECLARATIONS(Score_engraver);
-  Paper_score * pscore_;
-  
-  void forbid_breaks ();
-
-  virtual Music_output *get_output ();  
-protected:   
-  virtual void prepare (Moment);
-  virtual void finish ();
-  virtual void one_time_step ();
-  virtual int get_depth () const { return Global_translator::get_depth ();}
 
 protected:
-  /* Engraver_group_engraver interface */
-  virtual void acknowledge_grob (Grob_info);
+  DECLARE_LISTENER (finish);
+  DECLARE_LISTENER (prepare);
+  DECLARE_LISTENER (one_time_step);
 
-  virtual bool try_music (Music*);
+  /* Engraver_group_engraver interface */
+  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 typeset_grob (Grob*elem);
+  void stop_translation_timestep ();
 
-  virtual void stop_translation_timestep ();
+  /*
+    Translator interface
+  */
+  virtual void derived_mark () const;
+
+public:
+  Score_engraver ();
 };
 
 #endif /* SCORE_ENGRAVER_HH */