X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fscore-engraver.hh;h=c822ecb355b48441e19f4e4a8571e3af7158b09f;hb=7e72a1e50e94a7f9738d62599de79fe7745f600c;hp=faeecc91277aca0774d1af291efac08f81a81874;hpb=669494d7e9ab0156a1ebc8804a24f136f551d803;p=lilypond.git

diff --git a/lily/include/score-engraver.hh b/lily/include/score-engraver.hh
index faeecc9127..c822ecb355 100644
--- a/lily/include/score-engraver.hh
+++ b/lily/include/score-engraver.hh
@@ -3,12 +3,12 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 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"
@@ -19,42 +19,42 @@
 class Score_engraver : 
   public Engraver_group_engraver, public Global_translator 
 {
-  Line_of_score * scoreline_l_;
-  int breaks_i_;
-
-  Link_array<Grob> elem_p_arr_;
+  System *system_;
+  int breaks_;
+  
+  
+  Link_array<Grob> elems_;
     
-  Paper_column* command_column_l_;
-  Paper_column* musical_column_l_;
-  void make_columns (Moment);
+  Paper_column* command_column_;
+  Paper_column* musical_column_;
+  void make_columns ();
   void set_columns (Paper_column*,Paper_column*);
-  void typeset_all();
+  void typeset_all ();
     
 public:
-  VIRTUAL_COPY_CONS(Translator);
-  Paper_score * pscore_p_;
+  TRANSLATOR_DECLARATIONS(Score_engraver);
+  Paper_score * pscore_;
   
   void forbid_breaks ();
-  Score_engraver();
-  virtual Music_output *get_output_p ();  
+
+  virtual Music_output *get_output ();  
 protected:   
   virtual void prepare (Moment);
-  virtual void finish();
-  virtual void one_time_step();
-  virtual int depth_i() const { return Global_translator::depth_i ();}
+  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);
 
   virtual bool try_music (Music*);
-  virtual void initialize();
-  virtual void finalize();
+  virtual void initialize ();
+  virtual void finalize ();
   virtual void announce_grob (Grob_info);
-  virtual void do_announces();
-  virtual void typeset_grob (Grob*elem_p);
-
-  virtual void stop_translation_timestep();
+  virtual void typeset_grob (Grob*elem);
 
+  virtual void stop_translation_timestep ();
 };
 
-#endif // SCORE_GRAV_HH
+#endif /* SCORE_ENGRAVER_HH */