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 ee442e0805843d65e79bc60d79ce327215391bb2..f850613bdd628385db62b70d3c09f6f51325ff60 100644 (file)
--- a/lily/include/paper-column-engraver.hh
+++ b/lily/include/paper-column-engraver.hh
@@ -3,7 +3,7 @@
 
   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
@@ -30,16 +30,17 @@ protected:
   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_;
+
+  Moment last_breakable_moment_;
+  Paper_column *last_breakable_column_;
 public:
-  // ug.h 
-  void forbid_breaks ();
 };
 
 #endif /* PAPER_COLUMN_ENGRAVER_HH */