Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / include / paper-column-engraver.hh

diff --git a/lily/include/paper-column-engraver.hh b/lily/include/paper-column-engraver.hh
index e5db58c7a308ccb092ead6c3306d0483eeb723e1..f850613bdd628385db62b70d3c09f6f51325ff60 100644 (file)
--- a/lily/include/paper-column-engraver.hh
+++ b/lily/include/paper-column-engraver.hh
@@ -10,8 +10,6 @@
 #define PAPER_COLUMN_ENGRAVER_HH
 
 #include "engraver.hh"
-#include "listener.hh"
-#include "stream-event.hh"
 
 class Paper_column_engraver : public Engraver
 {
@@ -19,24 +17,20 @@ class Paper_column_engraver : public Engraver
   void set_columns (Paper_column *, Paper_column *);
   TRANSLATOR_DECLARATIONS (Paper_column_engraver);
 
-  Paper_column *find_turnable_column (Moment after_this);
-  void revoke_page_turns (Moment after_this, Real new_penalty);
-
 protected:
   void stop_translation_timestep ();
   void start_translation_timestep ();
   void process_music ();
   virtual void initialize ();
   virtual void finalize ();
-
-  DECLARE_TRANSLATOR_LISTENER (break);
+  virtual bool try_music (Music *);
 
   DECLARE_ACKNOWLEDGER (item);
   DECLARE_ACKNOWLEDGER (note_spacing);
   DECLARE_ACKNOWLEDGER (staff_spacing);
 
   System *system_;
-  vector<Stream_event*> break_events_;
+  vector<Music*> break_events_;
   int breaks_;                 // used for stat printing
   Paper_column *command_column_;
   Paper_column *musical_column_;
@@ -44,9 +38,8 @@ protected:
   bool first_;
   Moment last_moment_;
 
-  Paper_column *last_special_barline_column_;
+  Moment last_breakable_moment_;
   Paper_column *last_breakable_column_;
-  vector<Paper_column*> page_turnable_columns_;
 public:
 };