X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fpaper-score.hh;h=c44634b2c9b5117f4e1747dfc8b365714897317c;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=2b98fbbbf4fdef66339137963ba59797f7179af1;hpb=a6bd229f7fe1dc4a03478e14ccc0c0c66b225061;p=lilypond.git diff --git a/lily/include/paper-score.hh b/lily/include/paper-score.hh index 2b98fbbbf4..c44634b2c9 100644 --- a/lily/include/paper-score.hh +++ b/lily/include/paper-score.hh @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1996--2010 Han-Wen Nienhuys + Copyright (C) 1996--2014 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -31,23 +31,25 @@ class Paper_score : public Music_output SCM systems_; SCM paper_systems_; - mutable vector cols_; + mutable vector cols_; mutable vector break_indices_; + mutable vector 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 calc_breaking (); - vector find_break_indices () const; vector get_break_indices () const; - vector get_columns () const; + vector get_break_ranks () const; + vector get_columns () const; SCM get_paper_systems (); protected: + void find_break_indices () const; virtual void process (); virtual void derived_mark () const;