Run grand-replace (issue 3765)

[lilypond.git] / lily / include / paper-score.hh

diff --git a/lily/include/paper-score.hh b/lily/include/paper-score.hh
index 7ec8fe8ce3c2f0af591533843f980cc8d9244ca3..c44634b2c9b5117f4e1747dfc8b365714897317c 100644 (file)
--- a/lily/include/paper-score.hh
+++ b/lily/include/paper-score.hh
@@ -1,9 +1,20 @@
 /*
-  paper-score.hh -- declare Paper_score
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1996--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1996--2008 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_SCORE_HH
@@ -20,23 +31,25 @@ class Paper_score : public Music_output
   SCM systems_;
   SCM paper_systems_;
 
-  mutable vector<Grob*> cols_;
+  mutable vector<Grob *> cols_;
   mutable vector<vsize> break_indices_;
+  mutable vector<vsize> break_ranks_;
 public:
   Paper_score (Output_def *);
-  
-  DECLARE_CLASSNAME(Paper_score);
+
+  DECLARE_CLASSNAME (Paper_score);
 
   Output_def *layout () const;
   System *root_system () const;
 
   void typeset_system (System *);
   vector<Column_x_positions> calc_breaking ();
-  vector<vsize> find_break_indices () const;
   vector<vsize> get_break_indices () const;
-  vector<Grob*> get_columns () const;
+  vector<vsize> get_break_ranks () const;
+  vector<Grob *> get_columns () const;
   SCM get_paper_systems ();
 protected:
+  void find_break_indices () const;
   virtual void process ();
   virtual void derived_mark () const;