X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fscore-engraver.hh;h=52b652235315b4a86273cdfe1d8a294cd93c5b02;hb=f9214bac21e9926dc3248416f58190c98c4167a9;hp=0f0218ddc895f2656c1ba4b542f441279eea4f1f;hpb=352fd1005d930ced9e8631cd69f6ce439ceff512;p=lilypond.git

diff --git a/lily/include/score-engraver.hh b/lily/include/score-engraver.hh
index 0f0218ddc8..52b6522353 100644
--- a/lily/include/score-engraver.hh
+++ b/lily/include/score-engraver.hh
@@ -3,57 +3,43 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
+#ifndef SCORE_ENGRAVER_HH
+#define SCORE_ENGRAVER_HH
 
-#ifndef SCORE_GRAV_HH
-#define SCORE_GRAV_HH
+#include "engraver-group.hh"
 
-#include "engraver-group-engraver.hh"
-#include "global-translator.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 * scoreline_l_;
-  int breaks_i_;
-
-  Link_array<Grob> elem_p_arr_;
-    
-  Paper_column* command_column_l_;
-  Paper_column* musical_column_l_;
-  void make_columns ();
-  void set_columns (Paper_column*,Paper_column*);
+  System *system_;
+
+  vector<Grob*> elems_;
+  Paper_score *pscore_;
+
   void typeset_all ();
-    
-public:
-  TRANSLATOR_DECLARATIONS(Score_engraver);
-  Paper_score * pscore_p_;
-  
-  void forbid_breaks ();
-
-  virtual Music_output *get_output_p ();  
-protected:   
-  virtual void prepare (Moment);
-  virtual void finish ();
-  virtual void one_time_step ();
-  virtual int depth_i () const { return Global_translator::depth_i ();}
 
 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_p);
+  void stop_translation_timestep ();
 
-  virtual void stop_translation_timestep ();
+  /*
+    Translator interface
+  */
+  virtual void derived_mark () const;
+
+public:
+  Score_engraver ();
 };
 
-#endif // SCORE_GRAV_HH
+#endif /* SCORE_ENGRAVER_HH */