2003 -> 2004

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

diff --git a/lily/include/score-engraver.hh b/lily/include/score-engraver.hh
index 5d59fc06f7d1c399984f88b8c7a105d7a7469f6e..c822ecb355b48441e19f4e4a8571e3af7158b09f 100644 (file)
--- a/lily/include/score-engraver.hh
+++ b/lily/include/score-engraver.hh
@@ -3,14 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 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.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 break_penalty_i_;
-  int breaks_i_;
-
-  Link_array<Score_element> elem_p_arr_;
-    
-  Score_column* command_column_l_;
-  Score_column* musical_column_l_;
+  System *system_;
+  int breaks_;
+  
+  
+  Link_array<Grob> elems_;
     
-  void set_columns (Score_column*,Score_column*);
-  void typeset_all();
+  Paper_column* command_column_;
+  Paper_column* musical_column_;
+  void make_columns ();
+  void set_columns (Paper_column*,Paper_column*);
+  void typeset_all ();
     
 public:
-  TRANSLATOR_CLONE(Score_engraver);
-  Paper_score * pscore_p_;
-  DECLARE_MY_RUNTIME_TYPEINFO;
+  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 process();
-  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 Staff_info get_staff_info() const;
-  virtual bool do_try_request (Request*);
-  virtual void do_creation_processing();
-  virtual void do_removal_processing();
-  virtual void announce_element (Score_element_info);
-  virtual void do_announces();
-  virtual void typeset_element (Score_element*elem_p);
-  virtual void do_pre_move_processing();
-  virtual void do_add_processing ();
+  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 ();
 };
 
-#endif // SCORE_GRAV_HH
+#endif /* SCORE_ENGRAVER_HH */