From: Joe Neeman <joeneeman@gmail.com>
Date: Sat, 5 May 2007 23:02:11 +0000 (+1000)
Subject: Penalize unevenness in page breaking.
X-Git-Tag: release/2.11.24-1~8^2~7
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8fef54408b72adcd98a3b2921864246c7a2243a1;p=lilypond.git

Penalize unevenness in page breaking.
---

diff --git a/lily/page-breaking.cc b/lily/page-breaking.cc
index 96f93d85e5..06d3a482b0 100644
--- a/lily/page-breaking.cc
+++ b/lily/page-breaking.cc
@@ -831,8 +831,9 @@ Page_breaking::space_systems_on_2_pages (vsize configuration, vsize first_page_n
   Real best_demerits = infinity_f;
   for (vsize i = 0; i < page1_force.size (); i++)
     {
-      Real dem = page1_force[i] * page1_force[i]
-	+ page2_force[i] * page2_force[i]
+      Real f = page1_force[i] * page1_force[i] + page2_force[i] * page2_force[i];
+      Real uneven = 2 * (page1_force[i] - page2_force[i]);
+      Real dem = uneven * uneven + f
 	+ cached_line_details_[i+1].page_penalty_
 	+ cached_line_details_.back ().page_penalty_ + cached_line_details_.back ().turn_penalty_;
       if (dem < best_demerits)