From: Joe Neeman <joeneeman@gmail.com>
Date: Fri, 22 May 2009 05:17:20 +0000 (-0700)
Subject: Fix min_page_count to take page-top-space into account.
X-Git-Tag: release/2.13.1-0~13
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=cfab9c8525adad242c0f852445208dff9fb81076;p=lilypond.git

Fix min_page_count to take page-top-space into account.
---

diff --git a/lily/page-breaking.cc b/lily/page-breaking.cc
index 4f096d8178..668231f63a 100644
--- a/lily/page-breaking.cc
+++ b/lily/page-breaking.cc
@@ -762,6 +762,12 @@ Page_breaking::min_page_count (vsize configuration, vsize first_page_num)
   int line_count = 0;
 
   cache_line_details (configuration);
+
+  // If the first line on a page has titles, allow them some extra space.
+  if (cached_line_details_.size ()
+      && cached_line_details_[0].compressed_nontitle_lines_count_ < cached_line_details_[0].compressed_lines_count_)
+    cur_page_height += page_top_space ();
+
   for (vsize i = 0; i < cached_line_details_.size (); i++)
     {
       Real ext_len = cached_line_details_[i].extent_.length ();
@@ -780,6 +786,9 @@ Page_breaking::min_page_count (vsize configuration, vsize first_page_num)
 	  cur_rod_height = ext_len;
 	  cur_spring_height = cached_line_details_[i].space_;
 	  cur_page_height = page_height (first_page_num + ret, false);
+
+	  if (cached_line_details_[i].compressed_nontitle_lines_count_ < cached_line_details_[i].compressed_lines_count_)
+	    cur_page_height += page_top_space ();
 	  ret++;
 	}
       else