X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fconstrained-breaking.hh;h=8378a959e297777ed9ae612e4f85128504528b14;hb=1f8a60df45cfe68b39a6461b4f898a677847ff8c;hp=81eff5c2eac56877ca763799245d2a7f9b868572;hpb=a0d9434f7d67df3c95bed895637c68a7aecba822;p=lilypond.git diff --git a/lily/include/constrained-breaking.hh b/lily/include/constrained-breaking.hh index 81eff5c2ea..8378a959e2 100644 --- a/lily/include/constrained-breaking.hh +++ b/lily/include/constrained-breaking.hh @@ -4,7 +4,7 @@ source file of the GNU LilyPond music typesetter - (c) 2006--2007 Joe Neeman + (c) 2006--2009 Joe Neeman */ #ifndef CONSTRAINED_BREAKING_HH @@ -15,6 +15,7 @@ #include "prob.hh" struct Line_details { + Grob *last_column_; Real force_; Interval extent_; /* Y-extent of the system */ @@ -43,6 +44,7 @@ struct Line_details { Line_details () { + last_column_ = 0; force_ = infinity_f; padding_ = 0; bottom_padding_ = 0; @@ -55,12 +57,13 @@ struct Line_details { page_penalty_ = 0; turn_penalty_ = 0; title_ = false; - compressed_lines_count_ = 0; - compressed_nontitle_lines_count_ = 0; + compressed_lines_count_ = 1; + compressed_nontitle_lines_count_ = 1; } Line_details (Prob *pb) { + last_column_ = 0; force_ = 0; extent_ = unsmob_stencil (pb->get_property ("stencil")) ->extent (Y_AXIS); padding_ = robust_scm2double (pb->get_property ("next-padding"), 0); @@ -74,8 +77,8 @@ struct Line_details { page_penalty_ = robust_scm2double (pb->get_property ("page-break-penalty"), 0); turn_penalty_ = robust_scm2double (pb->get_property ("page-turn-penalty"), 0); title_ = to_boolean (pb->get_property ("is-title")); - compressed_lines_count_ = 0; - compressed_nontitle_lines_count_ = 0; + compressed_lines_count_ = 1; + compressed_nontitle_lines_count_ = title_ ? 0 : 1; } };