X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpage-breaking.cc;h=768cb79cc2150a88f81acdd04e7c09e719a9d64b;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=252e24c5df61c2685d2b5ac415cc2292c4d7b9d5;hpb=5bbfc22fce036b9b69df5e420de93e11da23c05e;p=lilypond.git diff --git a/lily/page-breaking.cc b/lily/page-breaking.cc index 252e24c5df..768cb79cc2 100644 --- a/lily/page-breaking.cc +++ b/lily/page-breaking.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2006--2014 Joe Neeman + Copyright (C) 2006--2015 Joe Neeman LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -747,7 +747,7 @@ Page_breaking::find_chunks_and_breaks (Break_predicate is_break, Prob_break_pred vector line_breaker_columns; line_breaker_columns.push_back (0); - for (vsize j = 1; j < cols.size (); j++) + for (vsize j = 0; j < cols.size (); j++) { if (forced_line_break_cols.size ()) { @@ -1440,7 +1440,7 @@ Page_breaking::finalize_spacing_result (vsize configuration, Page_spacing_result } for (vsize i = ragged () ? res.force_.size () - 1 : 0; - i < res.force_.size () - ragged_last (); + i < res.force_.size () - (is_last () && ragged_last ()); i++) { Real f = res.force_[i];