source file of the GNU LilyPond music typesetter
- (c) 2006 Joe Neeman <joeneeman@gmail.com>
+ (c) 2006--2007 Joe Neeman <joeneeman@gmail.com>
*/
#include "page-breaking.hh"
Page_breaking::break_into_pieces (vsize start_break, vsize end_break, Line_division const &div)
{
vector<Break_position> chunks = chunk_list (start_break, end_break);
- assert (chunks.size () == div.size () + 1);
+ bool ignore_div = false;
+ if (chunks.size () != div.size () + 1)
+ {
+ programming_error ("did not find a valid page breaking configuration");
+ ignore_div = true;
+ assert (0);
+ }
- for (vsize i = 0; i < chunks.size () - 1; i++)
+ for (vsize i = 0; i + 1 < chunks.size (); i++)
{
vsize sys = next_system (chunks[i]);
if (all_[sys].pscore_)
vsize end;
line_breaker_args (sys, chunks[i], chunks[i+1], &start, &end);
- vector<Column_x_positions> pos = line_breaking_[sys].get_solution (start, end, div[i]);
+ vector<Column_x_positions> pos = ignore_div
+ ? line_breaking_[sys].get_best_solution (start, end)
+ : line_breaking_[sys].get_solution (start, end, div[i]);
all_[sys].pscore_->root_system ()->break_into_pieces (pos);
}
}
vector<Line_details> ret;
assert (chunks.size () == div.size () + 1);
- for (vsize i = 0; i < chunks.size () - 1; i++)
+ for (vsize i = 0; i + 1 < chunks.size (); i++)
{
vsize sys = next_system (chunks[i]);
if (all_[sys].pscore_)
{
if (all_[i].pscore_)
{
- vector<Grob*> cols = all_[i].pscore_->root_system ()->columns ();
+ vector<Grob*> cols = all_[i].pscore_->root_system ()->used_columns ();
vector<vsize> line_breaker_columns;
line_breaker_columns.push_back (0);
Line_division ret;
ret.resize (chunks.size () - 1, 1);
- for (vsize i = 0; i < chunks.size () - 1; i++)
+ for (vsize i = 0; i + 1 < chunks.size (); i++)
{
vsize sys = next_system (chunks[i]);
if (all_[sys].pscore_)