Remove any broken lily-*.tex files before

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

diff --git a/lily/include/score-engraver.hh b/lily/include/score-engraver.hh
index 5168f9c72cefbe01a144a309a4381c946f880ae2..bb9af2f5a44945c524b17fb0a94ec8526cf242d5 100644 (file)
--- a/lily/include/score-engraver.hh
+++ b/lily/include/score-engraver.hh
@@ -11,13 +11,10 @@
 #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_;                 // used for stat printing
@@ -31,11 +28,11 @@ class Score_engraver :
   void set_columns (Paper_column*,Paper_column*);
   void typeset_all ();
 protected:
-  /* Global_translator */
-  virtual void prepare (Moment);
+  /* Score_translator */
   virtual void finish ();
+  virtual void prepare (Moment);
   virtual void one_time_step ();
-
+  
   /* Engraver_group_engraver interface */
   virtual void acknowledge_grob (Grob_info);
   virtual bool try_music (Music*);