X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fscore-engraver.hh;h=107b764e56a505f47ca90e47a4f258ef01c2c04c;hb=refs%2Ftags%2Frelease%2F2.7.15;hp=5cbe10b56c5fad1ad7b62470ddb2b03150572dca;hpb=df4a7c4a55148e065d878dcc2f7e09ac27ea9c32;p=lilypond.git

diff --git a/lily/include/score-engraver.hh b/lily/include/score-engraver.hh
index 5cbe10b56c..107b764e56 100644
--- a/lily/include/score-engraver.hh
+++ b/lily/include/score-engraver.hh
@@ -3,58 +3,47 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
+#ifndef SCORE_ENGRAVER_HH
+#define SCORE_ENGRAVER_HH
 
-#ifndef SCORE_GRAV_HH
-#define SCORE_GRAV_HH
+#include "engraver-group.hh"
+#include "score-translator.hh"
 
-#include "engraver-group-engraver.hh"
-#include "global-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
 {
-  Line_of_score * scoreline_l_;
-  int breaks_i_;
-
-  Link_array<Grob> elem_p_arr_;
-    
-  Paper_column* command_column_l_;
-  Paper_column* musical_column_l_;
-  void make_columns (Moment);
-  void set_columns (Paper_column*,Paper_column*);
-  void typeset_all();
-    
-public:
-  VIRTUAL_COPY_CONS(Translator);
-  Paper_score * pscore_p_;
-  
-  void forbid_breaks ();
-  Score_engraver();
-  virtual Music_output *get_output_p ();  
-protected:   
-  virtual void prepare (Moment);
-  virtual void finish();
-  virtual void process();
-  virtual int depth_i() const { return Global_translator::depth_i ();}
+  System *system_;
+
+  Link_array<Grob> elems_;
+  Paper_score *pscore_;
+
+  void typeset_all ();
 
 protected:
-  /* Engraver_group_engraver interface */
+  /* Score_translator */
+  virtual void finish ();
+  virtual void prepare (Moment);
+  virtual void one_time_step ();
 
-  virtual bool try_music (Music*);
-  virtual void do_creation_processing();
-  virtual void do_removal_processing();
+  /* Engraver_group_engraver interface */
+  virtual bool try_music (Music *);
+  virtual void initialize ();
+  virtual void finalize ();
   virtual void announce_grob (Grob_info);
-  virtual void do_announces();
-  virtual void typeset_grob (Grob*elem_p);
+  void stop_translation_timestep ();
 
-  virtual void stop_translation_timestep();
-  virtual void do_add_processing ();
+  /*
+    Translator interface
+  */
+  virtual void derived_mark () const;
+
+public:
+  Score_engraver ();
+  void forbid_breaks ();
+  virtual SCM get_output ();
 };
 
-#endif // SCORE_GRAV_HH
+#endif /* SCORE_ENGRAVER_HH */