* lily/span-dynamic-performer.cc (process_music): remove spurious

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

diff --git a/lily/include/score-engraver.hh b/lily/include/score-engraver.hh
index 390a4451e5a3abf9402748d59dd7187e3ce68e8d..bb9af2f5a44945c524b17fb0a94ec8526cf242d5 100644 (file)
--- a/lily/include/score-engraver.hh
+++ b/lily/include/score-engraver.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -11,50 +11,41 @@
 #define SCORE_ENGRAVER_HH
 
 #include "engraver-group-engraver.hh"
-#include "global-translator.hh"
+#include "score-translator.hh"
 
-/**
-  Top level engraver. Puts elements into appropriate columns.
- */
-class Score_engraver : 
-  public Engraver_group_engraver, public Global_translator 
+class Score_engraver : public virtual Score_translator,
+                      public virtual Engraver_group_engraver
 {
   System *system_;
-  int breaks_;
-  
+  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*);
   void typeset_all ();
-    
-public:
-  TRANSLATOR_DECLARATIONS(Score_engraver);
-  Paper_score * pscore_;
-  
-  void forbid_breaks ();
-
-  virtual Music_output *get_output ();  
-protected:   
-  virtual void prepare (Moment);
+protected:
+  /* Score_translator */
   virtual void finish ();
+  virtual void prepare (Moment);
   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);
-
   virtual bool try_music (Music*);
   virtual void initialize ();
   virtual void finalize ();
   virtual void announce_grob (Grob_info);
   virtual void typeset_grob (Grob*elem);
-
   virtual void stop_translation_timestep ();
+
+public:
+  TRANSLATOR_DECLARATIONS(Score_engraver);
+  void forbid_breaks ();
+  virtual Music_output *get_output ();  
 };
 
 #endif /* SCORE_ENGRAVER_HH */