X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fpaper-column-engraver.hh;h=1279ff17c990c527db9eaba102eba4aa859357cf;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=e5db58c7a308ccb092ead6c3306d0483eeb723e1;hpb=ba420bc05855eeca5fb937939261baffd614c2ef;p=lilypond.git

diff --git a/lily/include/paper-column-engraver.hh b/lily/include/paper-column-engraver.hh
index e5db58c7a3..1279ff17c9 100644
--- a/lily/include/paper-column-engraver.hh
+++ b/lily/include/paper-column-engraver.hh
@@ -1,9 +1,20 @@
 /*
-  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--2015 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
@@ -11,6 +22,7 @@
 
 #include "engraver.hh"
 #include "listener.hh"
+#include "moment.hh"
 #include "stream-event.hh"
 
 class Paper_column_engraver : public Engraver
@@ -26,27 +38,28 @@ protected:
   void stop_translation_timestep ();
   void start_translation_timestep ();
   void process_music ();
+  void handle_manual_breaks (bool);
   virtual void initialize ();
   virtual void finalize ();
 
   DECLARE_TRANSLATOR_LISTENER (break);
+  DECLARE_TRANSLATOR_LISTENER (label);
 
   DECLARE_ACKNOWLEDGER (item);
   DECLARE_ACKNOWLEDGER (note_spacing);
   DECLARE_ACKNOWLEDGER (staff_spacing);
 
   System *system_;
-  vector<Stream_event*> break_events_;
-  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_;
 
-  Paper_column *last_special_barline_column_;
-  Paper_column *last_breakable_column_;
-  vector<Paper_column*> page_turnable_columns_;
 public:
 };