Merge with master

[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 d3b9430e35df99617aab31e50c472aa4bf41072f..793d085e0cdaae1edf8c33762712f51545812e9d 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--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef PAPER_COLUMN_ENGRAVER_HH
@@ -11,6 +11,7 @@
 
 #include "engraver.hh"
 #include "listener.hh"
+#include "moment.hh"
 #include "stream-event.hh"
 
 class Paper_column_engraver : public Engraver
@@ -19,6 +20,9 @@ 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 ();
@@ -41,8 +45,6 @@ protected:
   bool first_;
   Moment last_moment_;
 
-  Moment last_breakable_moment_;
-  Paper_column *last_breakable_column_;
 public:
 };