From: Joe Neeman <joeneeman@gmail.com>
Date: Sat, 1 Mar 2008 02:14:34 +0000 (+0200)
Subject: Merge branch 'original' into HEAD
X-Git-Tag: release/2.11.42-1~7^2~15
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=024e51d1cb0e21d211baf91ad0774bc766dff687;hp=526f694d6ee08c540d278a95e8cf0452c35d9668;p=lilypond.git

Merge branch 'original' into HEAD
---

diff --git a/lily/optimal-page-breaking.cc b/lily/optimal-page-breaking.cc
index 64a056aaba..3c26c9abe0 100644
--- a/lily/optimal-page-breaking.cc
+++ b/lily/optimal-page-breaking.cc
@@ -65,7 +65,12 @@ Optimal_page_breaking::solve ()
 	min_sys_count -= best.systems_per_page_[page_count - 2];
     }
   else
-    best = space_systems_on_n_pages (0, page_count, first_page_num);
+    {
+      /* 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..."));
@@ -86,7 +91,7 @@ Optimal_page_breaking::solve ()
 	  vsize min_p_count = min_page_count (i, first_page_num);
 	  Page_spacing_result cur;
 
-	  if (min_p_count == page_count)
+	  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);