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 f984a5f6ccb1d8ee03a7dfc18ca1b2566872d8e3..bb9af2f5a44945c524b17fb0a94ec8526cf242d5 100644 (file)
--- a/lily/include/score-engraver.hh
+++ b/lily/include/score-engraver.hh
@@ -3,57 +3,49 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
-#ifndef SCORE_GRAV_HH
-#define SCORE_GRAV_HH
+#ifndef SCORE_ENGRAVER_HH
+#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
 {
-  Line_of_score * scoreline_l_;
-  int breaks_i_;
+  System *system_;
+  int breaks_;                 // used for stat printing
+  
+  Link_array<Grob> elems_;
+  Paper_column* command_column_;
+  Paper_column* musical_column_;
+  Paper_score * pscore_;
 
-  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*);
   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);
+protected:
+  /* Score_translator */
   virtual void finish ();
+  virtual void prepare (Moment);
   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);
-
   virtual bool try_music (Music*);
   virtual void initialize ();
   virtual void finalize ();
   virtual void announce_grob (Grob_info);
-  virtual void typeset_grob (Grob*elem_p);
-
+  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_GRAV_HH
+#endif /* SCORE_ENGRAVER_HH */