From: Joe Neeman <joeneeman@gmail.com>
Date: Thu, 15 Nov 2007 05:36:01 +0000 (+1100)
Subject: Add regression tests and extra robustness if the user requests too many pages.
X-Git-Tag: release/2.11.35-1~4^2~2^2~2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=aff44da3b100c3b28355a03a7c0431b48828698c;p=lilypond.git

Add regression tests and extra robustness if the user requests too many pages.
---

diff --git a/input/regression/page-breaking-page-count1.ly b/input/regression/page-breaking-page-count1.ly
new file mode 100644
index 0000000000..ecbfcbb537
--- /dev/null
+++ b/input/regression/page-breaking-page-count1.ly
@@ -0,0 +1,13 @@
+\version "2.11.34"
+
+\header {
+  texidoc = "The number of pages in a score can be forced by setting
+@code{page-count} in the (book-level) paper block."
+}
+
+#(set-default-paper-size "a6")
+
+\book {
+  \paper { page-count = 2}
+  \score { {c'1 c'1} }
+}
\ No newline at end of file
diff --git a/input/regression/page-breaking-page-count2.ly b/input/regression/page-breaking-page-count2.ly
new file mode 100644
index 0000000000..645243a0fe
--- /dev/null
+++ b/input/regression/page-breaking-page-count2.ly
@@ -0,0 +1,13 @@
+\version "2.11.34"
+
+\header {
+  texidoc = "The number of pages in a score can be forced by setting
+@code{page-count} in the (book-level) paper block."
+}
+
+#(set-default-paper-size "a6")
+
+\book {
+  \paper { page-count = 3}
+  \score { {c'1 c'1} }
+}
\ No newline at end of file
diff --git a/lily/optimal-page-breaking.cc b/lily/optimal-page-breaking.cc
index 8335a2376f..4aa8bececc 100644
--- a/lily/optimal-page-breaking.cc
+++ b/lily/optimal-page-breaking.cc
@@ -47,7 +47,7 @@ Optimal_page_breaking::solve ()
   vsize page_count = robust_scm2int (forced_page_count, 1);
   Line_division ideal_line_division;
   Line_division best_division;
-  vsize min_sys_count = 0;
+  vsize min_sys_count = 1;
   vsize ideal_sys_count = system_count ();
   
   if (!scm_is_integer (forced_page_count))
diff --git a/lily/page-breaking.cc b/lily/page-breaking.cc
index c728208c37..46e0caf90c 100644
--- a/lily/page-breaking.cc
+++ b/lily/page-breaking.cc
@@ -690,13 +690,12 @@ Page_breaking::space_systems_on_n_pages (vsize configuration, vsize n, vsize fir
   assert (n >= min_page_count (configuration, first_page_num));
 
   cache_line_details (configuration);
-  if (n > cached_line_details_.size ())
-    return Page_spacing_result ();
-  if (n == 1)
+
+  if (n == 1 && n <= cached_line_details_.size ())
     ret = space_systems_on_1_page (cached_line_details_,
 				   page_height (first_page_num, is_last ()),
 				   ragged () || (is_last () && ragged_last ()));
-  else if (n == 2)
+  else if (n == 2 && n <= cached_line_details_.size ())
     ret = space_systems_on_2_pages (configuration, first_page_num);
   else
     {
diff --git a/lily/page-spacing.cc b/lily/page-spacing.cc
index 384ce44022..19129b3c17 100644
--- a/lily/page-spacing.cc
+++ b/lily/page-spacing.cc
@@ -92,11 +92,10 @@ Page_spacer::solve (vsize page_count)
     resize (page_count);
 
   Page_spacing_result ret;
-  ret.force_.resize (page_count);
-  ret.systems_per_page_.resize (page_count);
 
   vsize system = lines_.size () - 1;
-  vsize tack_onto_the_end = 0;
+  vsize extra_systems = 0;
+  vsize extra_pages = 0;
 
   if (isinf (state_.at (system, page_count-1).demerits_))
     {
@@ -112,13 +111,28 @@ Page_spacer::solve (vsize page_count)
 
       if (i)
 	{
-	  tack_onto_the_end = system - i;
+	  extra_systems = system - i;
 	  system = i;
 	}
       else
-	return Page_spacing_result (); /* couldn't salvage it -- probably going to crash */
+	{
+	  /* try chopping off pages from the end */
+	  vsize j;
+	  for (j = page_count; j && isinf (state_.at (system, j-1).demerits_); j--)
+	    ;
+
+	  if (j)
+	    {
+	      extra_pages = page_count - j;
+	      page_count = j;
+	    }
+	  else
+	    return Page_spacing_result (); /* couldn't salvage it -- probably going to crash */
+	}
     }
 
+  ret.force_.resize (page_count);
+  ret.systems_per_page_.resize (page_count);
   ret.penalty_ = state_.at (system, page_count-1).penalty_
     + lines_.back ().page_penalty_ + lines_.back ().turn_penalty_;
 
@@ -133,9 +147,23 @@ Page_spacer::solve (vsize page_count)
       if (p == 0)
 	ret.systems_per_page_[p] = system + 1;
       else
-	ret.systems_per_page_[p] = system - ps.prev_ + tack_onto_the_end;
+	ret.systems_per_page_[p] = system - ps.prev_;
       system = ps.prev_;
     }
+
+  if (extra_systems)
+    {
+      ret.systems_per_page_.back () += extra_systems;
+      ret.demerits_ += 200000;
+    }
+  if (extra_pages)
+    {
+      ret.force_.insert (ret.force_.end (), extra_pages, 200000);
+      ret.systems_per_page_.insert (ret.systems_per_page_.end (), extra_pages, 0);
+      ret.demerits_ += 200000;
+    }
+
+
   ret.demerits_ += ret.penalty_;
   return ret;
 }