X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpage-turn-page-breaking.cc;h=e239cc2f2854f3a5b416e554541f50e9813658d5;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=028856229bc00cb236f1d1003427a8b30572f367;hpb=0308629bff80f4f1aefc01729cf6afcbe3aaaa09;p=lilypond.git diff --git a/lily/page-turn-page-breaking.cc b/lily/page-turn-page-breaking.cc index 028856229b..e239cc2f28 100644 --- a/lily/page-turn-page-breaking.cc +++ b/lily/page-turn-page-breaking.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2006--2007 Joe Neeman + (c) 2006--2008 Joe Neeman */ #include "page-turn-page-breaking.hh" @@ -36,18 +36,10 @@ Page_turn_page_breaking::~Page_turn_page_breaking () Page_turn_page_breaking::Break_node Page_turn_page_breaking::put_systems_on_pages (vsize start, vsize end, - vector const &lines, - Line_division const &div, - int page_number) + vsize configuration, + vsize page_number) { - bool last = end == breaks_.size () - 1; - bool ragged_all = to_boolean (book_->paper_->c_variable ("ragged-bottom")); - bool ragged_last = last && to_boolean (book_->paper_->c_variable ("ragged-last-bottom")); - Real page_h = page_height (1, false); // FIXME - SCM force_sym = last ? ly_symbol2scm ("blank-last-page-force") : ly_symbol2scm ("blank-page-force"); - Real blank_force = robust_scm2double (book_->paper_->lookup_variable (force_sym), 0); - Real page_weighting = robust_scm2double (book_->paper_->c_variable ("page-spacing-weight"), 10); - int min_p_count = min_page_count (lines, page_h, ragged_all, ragged_last); + vsize min_p_count = min_page_count (configuration, page_number); bool auto_first = to_boolean (book_->paper_->c_variable ("auto-first-page-number")); /* If [START, END] does not contain an intermediate @@ -69,18 +61,18 @@ Page_turn_page_breaking::put_systems_on_pages (vsize start, min_p_count has that evenness. (For example, if PAGE-NUMBER is even and min_p_count is even, we don't even consider the blank page option). */ - Spacing_result result; + Page_spacing_result result; if (start == 0 && auto_first) { if (min_p_count % 2) - result = space_systems_on_n_or_one_more_pages (lines, min_p_count, page_h, 0, ragged_all, ragged_last); + result = space_systems_on_n_or_one_more_pages (configuration, min_p_count, page_number); else - result = space_systems_on_n_pages (lines, min_p_count, page_h, ragged_all, ragged_last); + result = space_systems_on_n_pages (configuration, min_p_count, page_number); } else if (page_number % 2 == min_p_count % 2) - result = space_systems_on_n_pages (lines, min_p_count, page_h, ragged_all, ragged_last); + result = space_systems_on_n_pages (configuration, min_p_count, page_number); else - result = space_systems_on_n_or_one_more_pages (lines, min_p_count, page_h, blank_force, ragged_all, ragged_last); + result = space_systems_on_n_or_one_more_pages (configuration, min_p_count, page_number); Break_node ret; ret.prev_ = start - 1; @@ -90,32 +82,24 @@ Page_turn_page_breaking::put_systems_on_pages (vsize start, if (auto_first && start == 0) ret.first_page_number_ += 1 - (ret.page_count_ % 2); - ret.div_ = div; + ret.div_ = current_configuration (configuration); ret.system_count_ = result.systems_per_page_; - ret.too_many_lines_ = true; - ret.demerits_ = result.penalty_; + ret.too_many_lines_ = all_lines_stretched (configuration); + ret.demerits_ = result.demerits_; if (start > 0) ret.demerits_ += state_[start-1].demerits_; - for (vsize i = 0; i < lines.size (); i++) - { - ret.demerits_ += lines[i].force_ * lines[i].force_; - ret.demerits_ += lines[i].break_penalty_; - if (lines[i].force_ < 0) - ret.too_many_lines_ = false; - } - for (vsize i = 0; i < result.force_.size (); i++) - ret.demerits_ += result.force_[i] * result.force_[i] * page_weighting; + return ret; } -/* "final page" meaning the number of the final right-hand page, - which always has an odd page number */ +/* The number of pages taken up by a Break_node, including + the blank page if there is one */ vsize -Page_turn_page_breaking::final_page_num (Break_node const &b) +Page_turn_page_breaking::total_page_count (Break_node const &b) { vsize end = b.first_page_number_ + b.page_count_; - return end - 1 + (end % 2); + return end - 1 + (end % 2) - b.first_page_number_; } extern bool debug_page_breaking_scoring; @@ -166,19 +150,17 @@ Page_turn_page_breaking::calc_subproblem (vsize ending_breakpoint) min_sys_count = max (min_sys_count, prev_best_system_count); for (vsize sys_count = min_sys_count; sys_count <= max_sys_count && ok_page; sys_count++) { - vector div = line_divisions (start, end, sys_count, min_division, max_division); + set_current_breakpoints (start, end, sys_count, min_division, max_division); bool found = false; - for (vsize d = 0; d < div.size (); d++) + for (vsize i = 0; i < current_configuration_count (); i++) { - vector line = line_details (start, end, div[d]); - - cur = put_systems_on_pages (start, end, line, div[d], p_num); + cur = put_systems_on_pages (start, end, i, p_num); if (isinf (cur.demerits_) || (cur.page_count_ + (p_num % 2) > 2 && (!isinf (this_start_best.demerits_)) - && final_page_num (cur) > final_page_num (this_start_best))) + && total_page_count (cur) > total_page_count (this_start_best))) { ok_page = false; break; @@ -195,7 +177,7 @@ Page_turn_page_breaking::calc_subproblem (vsize ending_breakpoint) /* heuristic: if we increase the number of systems, we can bound the division from below by our current best division */ - min_division = div[d]; + min_division = current_configuration (i); } } if (!found && this_start_best.too_many_lines_) @@ -224,8 +206,8 @@ Page_turn_page_breaking::solve () { state_.clear (); message (_f ("Calculating page and line breaks (%d possible page breaks)...", - (int)breaks_.size () - 1) + " "); - for (vsize i = 0; i + 1 < breaks_.size (); i++) + (int) last_break_position ())); + for (vsize i = 0; i < last_break_position (); i++) { calc_subproblem (i); progress_indication (string ("[") + to_string (i + 1) + "]");