X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbreak-algorithm.cc;h=7dd25936c3c5a80f5d252851de39ab571d8db0a2;hb=7cb049f7f3705e414c2a49c7cf14f43a51914c48;hp=320857f7b8e1bf4992cbc80c10c93a2dc4be8922;hpb=94189ec2b8da6d7e89dc619c646a927adead9b19;p=lilypond.git diff --git a/lily/break-algorithm.cc b/lily/break-algorithm.cc index 320857f7b8..7dd25936c3 100644 --- a/lily/break-algorithm.cc +++ b/lily/break-algorithm.cc @@ -3,14 +3,14 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2001 Han-Wen Nienhuys + (c) 1996--2002 Han-Wen Nienhuys */ #include "paper-column.hh" #include "break-algorithm.hh" #include "paper-def.hh" #include "debug.hh" -#include "line-of-score.hh" +#include "system.hh" #include "paper-score.hh" #include "paper-column.hh" #include "cpu-timer.hh" @@ -56,13 +56,14 @@ Break_algorithm::find_breaks () const Simple_spacer* -Break_algorithm::generate_spacing_problem (Link_array curline, Interval line) const +Break_algorithm::generate_spacing_problem (Link_array const &curline, + Interval line) const { Simple_spacer * sp = new Simple_spacer; /* this is hardcoded, but this shouldn't happen anyway. - used to be g et_var ("loose_column_distance"); + used to be get_var ("loose_column_distance"); */ sp->default_space_f_ = 1.0; @@ -72,7 +73,7 @@ Break_algorithm::generate_spacing_problem (Link_array curline, Interval li /* sort out how interfacing this should work; */ - if (line.empty_b()) + if (line.empty_b ()) { sp->line_len_f_ = -1; } @@ -95,7 +96,7 @@ void Break_algorithm::set_pscore (Paper_score*s) { pscore_l_ = s; - linewidth_f_ = s->paper_l_->get_var("linewidth"); + linewidth_f_ = s->paper_l_->get_var ("linewidth"); } Array