From ae4d1a4efd7c9250a4e20cb7ac36ef131ed9eb7f Mon Sep 17 00:00:00 2001 From: Joe Neeman Date: Sun, 7 Jan 2007 11:24:01 +0200 Subject: [PATCH] Fix ending-page-number calculation. --- lily/page-turn-page-breaking.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lily/page-turn-page-breaking.cc b/lily/page-turn-page-breaking.cc index 911e83467b..e4739291a7 100644 --- a/lily/page-turn-page-breaking.cc +++ b/lily/page-turn-page-breaking.cc @@ -53,7 +53,7 @@ Page_turn_page_breaking::put_systems_on_pages (vsize start, /* If [START, END] does not contain an intermediate breakpoint, we may need to consider solutions that result in a bad turn. In this case, we won't abort if the min_page_count is too big */ - if (start < end - 1 && min_p_count > 2) + if (start < end - 1 && min_p_count + (page_number % 2) > 2) return Break_node (); /* if PAGE-NUMBER is odd, we are starting on a right hand page. That is, we @@ -115,7 +115,7 @@ vsize Page_turn_page_breaking::final_page_num (Break_node const &b) { vsize end = b.first_page_number_ + b.page_count_; - return end + 1 - (end % 2); + return end - 1 + (end % 2); } void @@ -171,7 +171,7 @@ Page_turn_page_breaking::calc_subproblem (vsize ending_breakpoint) cur = put_systems_on_pages (start, end, line, div[d], p_num); if (isinf (cur.demerits_) - || (cur.page_count_ > 2 + || (cur.page_count_ + (p_num % 2) > 2 && (!isinf (this_start_best.demerits_)) && final_page_num (cur) > final_page_num (this_start_best))) { -- 2.39.5