Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/include/score-engraver.hh b/lily/include/score-engraver.hh
index 815f04c05ec79b1ac3984f2214f95585e910cf95..76571145367474c2e03ba6d68168656967222f8c 100644 (file)
--- a/lily/include/score-engraver.hh
+++ b/lily/include/score-engraver.hh
@@ -3,58 +3,46 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 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 ();
-  void set_columns (Paper_column*,Paper_column*);
+  System *system_;
+
+  vector<Grob*> elems_;
+  Paper_score *pscore_;
+
   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);
+
+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 bool try_music (Music*);
+  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 ();
+  /*
+    Translator interface
+  */
+  virtual void derived_mark () const;
 
+public:
+  Score_engraver ();
+  virtual SCM get_output ();
 };
 
-#endif // SCORE_GRAV_HH
+#endif /* SCORE_ENGRAVER_HH */