X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Finclude%2Fpaper-column-engraver.hh;h=3249432b40053ee4d0aec471396fd5c26b5cc040;hb=32a34dcef0c0041c6d62677487a380b5c8b85712;hp=c35a6a2e51d1282c590036b377d570e525775ff3;hpb=31568c504806f35aac420a394c9eab07abd9faa7;p=lilypond.git

diff --git a/lily/include/paper-column-engraver.hh b/lily/include/paper-column-engraver.hh
index c35a6a2e51..3249432b40 100644
--- a/lily/include/paper-column-engraver.hh
+++ b/lily/include/paper-column-engraver.hh
@@ -1,15 +1,29 @@
 /*
-  paper-column-engraver.hh -- declare Paper_column_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2005--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef PAPER_COLUMN_ENGRAVER_HH
 #define PAPER_COLUMN_ENGRAVER_HH
 
 #include "engraver.hh"
+#include "listener.hh"
+#include "moment.hh"
+#include "stream-event.hh"
 
 class Paper_column_engraver : public Engraver
 {
@@ -17,29 +31,36 @@ 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 ();
+  void handle_manual_breaks (bool);
   virtual void initialize ();
   virtual void finalize ();
-  virtual bool try_music (Music *);
+
+  DECLARE_TRANSLATOR_LISTENER (break);
+  DECLARE_TRANSLATOR_LISTENER (label);
 
   DECLARE_ACKNOWLEDGER (item);
   DECLARE_ACKNOWLEDGER (note_spacing);
   DECLARE_ACKNOWLEDGER (staff_spacing);
 
   System *system_;
-  Music *break_event_;
-  int breaks_;			// used for stat printing
+  vector<Stream_event *> break_events_;
+  vector<Stream_event *> label_events_;
+  int breaks_;                  // used for stat printing
   Paper_column *command_column_;
   Paper_column *musical_column_;
-  vector<Item*> items_;
+  vector<Item *> items_;
   bool first_;
+  bool made_columns_;
   Moment last_moment_;
+
 public:
-  // ug.h 
-  void forbid_breaks ();
 };
 
 #endif /* PAPER_COLUMN_ENGRAVER_HH */