X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Foptimal-page-breaking.cc;h=f495ab7fa6b6b23d84b21955dfd19598fad3e7ea;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=282114d5c55fa8025c2013ba548ad5c9aaf93fa3;hpb=f1c03fdebfcb3ab05816eacb688fd7a7568f3ef1;p=lilypond.git diff --git a/lily/optimal-page-breaking.cc b/lily/optimal-page-breaking.cc index 282114d5c5..f495ab7fa6 100644 --- a/lily/optimal-page-breaking.cc +++ b/lily/optimal-page-breaking.cc @@ -5,9 +5,10 @@ source file of the GNU LilyPond music typesetter - (c) 2006--2007 Joe Neeman + (c) 2006--2008 Joe Neeman */ +#include "international.hh" #include "optimal-page-breaking.hh" #include "output-def.hh" #include "page-spacing.hh" @@ -35,44 +36,127 @@ Optimal_page_breaking::~Optimal_page_breaking () SCM Optimal_page_breaking::solve () { - vsize end = breaks_.size () - 1; - vsize min_sys_count = min_system_count (0, end); + vsize end = last_break_position (); vsize max_sys_count = max_system_count (0, end); - vsize max_page_count = INT_MAX; - vsize cur_page_count = 0; - Spacing_result best; - Line_division best_division; - Line_division lower_bound; vsize first_page_num = robust_scm2int (book_->paper_->c_variable ("first-page-number"), 1); + SCM forced_page_count = book_->paper_->c_variable ("page-count"); - for (vsize sys_count = min_sys_count; - cur_page_count <= max_page_count && sys_count <= max_sys_count; - sys_count++) + set_to_ideal_line_configuration (0, end); + + Page_spacing_result best; + vsize page_count = robust_scm2int (forced_page_count, 1); + Line_division ideal_line_division = current_configuration (0); + Line_division best_division = ideal_line_division; + vsize min_sys_count = 1; + vsize ideal_sys_count = system_count (); + + if (!scm_is_integer (forced_page_count)) + { + /* find out the ideal number of pages */ + message (_ ("Finding the ideal number of pages...")); + + best = space_systems_on_best_pages (0, first_page_num); + page_count = best.systems_per_page_.size (); + + ideal_sys_count = best.system_count (); + min_sys_count = ideal_sys_count - best.systems_per_page_.back (); + + if (page_count > 1 && best.systems_per_page_[page_count - 2] > 1) + min_sys_count -= best.systems_per_page_[page_count - 2]; + + min_sys_count = max (min_sys_count, (vsize)1); + } + else + { + /* todo: the following line will spit out programming errors if the + ideal line spacing doesn't fit on PAGE_COUNT pages */ + best = space_systems_on_n_pages (0, page_count, first_page_num); + min_sys_count = page_count; + } + + if (page_count == 1) + message (_ ("Fitting music on 1 page...")); + else if (scm_is_integer (forced_page_count)) + message (_f ("Fitting music on %d pages...", (int)page_count)); + else + message (_f ("Fitting music on %d or %d pages...", (int)page_count-1, (int)page_count)); + + /* try a smaller number of systems than the ideal number for line breaking */ + Line_division bound = ideal_line_division; + for (vsize sys_count = ideal_sys_count; --sys_count >= min_sys_count;) + { + Page_spacing_result best_for_this_sys_count; + set_current_breakpoints (0, end, sys_count, Line_division (), bound); + + for (vsize i = 0; i < current_configuration_count (); i++) + { + vsize min_p_count = min_page_count (i, first_page_num); + Page_spacing_result cur; + + if (min_p_count == page_count || scm_is_integer (forced_page_count)) + cur = space_systems_on_n_pages (i, page_count, first_page_num); + else + cur = space_systems_on_n_or_one_more_pages (i, page_count-1, first_page_num); + + if (cur.demerits_ < best_for_this_sys_count.demerits_ || isinf (best_for_this_sys_count.demerits_)) + { + best_for_this_sys_count = cur; + bound = current_configuration (i); + } + } + + if (best_for_this_sys_count.demerits_ < best.demerits_ || isinf (best.demerits_)) + { + best = best_for_this_sys_count; + best_division = bound; + } + + /* if the pages are stretched on average, stop trying to reduce sys_count */ + if (best_for_this_sys_count.page_count () < page_count + && best_for_this_sys_count.average_force () > 0) + break; + + + if (isinf (best_for_this_sys_count.demerits_)) + break; + } + + /* try a larger number of systems than the ideal line breaking number. This + is more or less C&P, but the loop bounds make it difficult to try something + like do {...} while (flip(&d) != UP). */ + bound = ideal_line_division; + for (vsize sys_count = ideal_sys_count+1; sys_count <= max_sys_count; sys_count++) { Real best_demerits_for_this_sys_count = infinity_f; - set_current_breakpoints (0, end, sys_count, lower_bound); + set_current_breakpoints (0, end, sys_count, bound); for (vsize i = 0; i < current_configuration_count (); i++) { - Spacing_result cur = space_systems_on_best_pages (i, first_page_num); - cur_page_count = cur.systems_per_page_.size (); + vsize min_p_count = min_page_count (i, first_page_num); + Page_spacing_result cur; + + if (min_p_count > page_count) + continue; + else + cur = space_systems_on_n_pages (i, page_count, first_page_num); + if (cur.demerits_ < best.demerits_ || isinf (best.demerits_)) { best = cur; best_division = current_configuration (i); } - if (cur.demerits_ < best_demerits_for_this_sys_count || isinf (best.demerits_)) + if (cur.demerits_ < best_demerits_for_this_sys_count || isinf (best_demerits_for_this_sys_count)) { best_demerits_for_this_sys_count = cur.demerits_; - lower_bound = current_configuration (i); + bound = current_configuration (i); } - - if (all_lines_stretched (i)) - max_page_count = min (max_page_count, cur_page_count + 1); } + if (isinf (best_demerits_for_this_sys_count)) + break; } + message (_ ("Drawing systems...")); break_into_pieces (0, end, best_division); SCM lines = systems (); return make_pages (best.systems_per_page_, lines);