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 651e7c786b8126e2121d4bae6152c54520b273d7..f850613bdd628385db62b70d3c09f6f51325ff60 100644 (file)
--- a/lily/include/paper-column-engraver.hh
+++ b/lily/include/paper-column-engraver.hh
@@ -3,22 +3,19 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
+  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef PAPER_COLUMN_ENGRAVER_HH
 #define PAPER_COLUMN_ENGRAVER_HH
 
-
 #include "engraver.hh"
 
-
 class Paper_column_engraver : public Engraver
 {
   void make_columns ();
-  void set_columns (Paper_column*, Paper_column*); 
-  TRANSLATOR_DECLARATIONS(Paper_column_engraver);
+  void set_columns (Paper_column *, Paper_column *);
+  TRANSLATOR_DECLARATIONS (Paper_column_engraver);
 
 protected:
   void stop_translation_timestep ();
@@ -26,24 +23,24 @@ protected:
   void process_music ();
   virtual void initialize ();
   virtual void finalize ();
-  virtual bool try_music (Music*);
+  virtual bool try_music (Music *);
 
   DECLARE_ACKNOWLEDGER (item);
   DECLARE_ACKNOWLEDGER (note_spacing);
   DECLARE_ACKNOWLEDGER (staff_spacing);
 
   System *system_;
-  Music *break_event_;
+  vector<Music*> break_events_;
   int breaks_;                 // used for stat printing
   Paper_column *command_column_;
   Paper_column *musical_column_;
-  Link_array<Item> items_;
+  vector<Item*> items_;
   bool first_;
   Moment last_moment_;
-public:
-  // ug.h 
-  void forbid_breaks ();
 
+  Moment last_breakable_moment_;
+  Paper_column *last_breakable_column_;
+public:
 };
 
 #endif /* PAPER_COLUMN_ENGRAVER_HH */