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 a790b5f967e863c93b194ae27c5a43ccf727bb64..76571145367474c2e03ba6d68168656967222f8c 100644 (file)
--- a/lily/include/score-engraver.hh
+++ b/lily/include/score-engraver.hh
@@ -3,29 +3,25 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SCORE_ENGRAVER_HH
 #define SCORE_ENGRAVER_HH
 
-#include "engraver-group-engraver.hh"
+#include "engraver-group.hh"
 #include "score-translator.hh"
 
 class Score_engraver : public virtual Score_translator,
-                      public virtual Engraver_group_engraver
+                      public virtual Engraver_group
 {
   System *system_;
-  int breaks_;                 // used for stat printing
 
-  Link_array<Grob> elems_;
-  Paper_column *command_column_;
-  Paper_column *musical_column_;
+  vector<Grob*> elems_;
   Paper_score *pscore_;
 
-  void make_columns ();
-  void set_columns (Paper_column *, Paper_column *);
   void typeset_all ();
+
 protected:
   /* Score_translator */
   virtual void finish ();
@@ -33,17 +29,20 @@ protected:
   virtual void one_time_step ();
 
   /* 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 stop_translation_timestep ();
+  void stop_translation_timestep ();
+
+  /*
+    Translator interface
+  */
+  virtual void derived_mark () const;
 
 public:
-  TRANSLATOR_DECLARATIONS (Score_engraver);
-  void forbid_breaks ();
-  virtual Music_output *get_output ();
+  Score_engraver ();
+  virtual SCM get_output ();
 };
 
 #endif /* SCORE_ENGRAVER_HH */