Merge branch 'stable'

[lilypond.git] / lily / optimal-page-breaking.cc

diff --git a/lily/optimal-page-breaking.cc b/lily/optimal-page-breaking.cc
index 9d395a1b509cc272a23ec6a5e109b96976ad2fae..c5a61335633c6790f8bbdba7d83238fb5c521c01 100644 (file)
--- a/lily/optimal-page-breaking.cc
+++ b/lily/optimal-page-breaking.cc
@@ -5,7 +5,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2006--2007 Joe Neeman <joeneeman@gmail.com>
+  (c) 2006--2008 Joe Neeman <joeneeman@gmail.com>
 */
 
 #include "international.hh"
@@ -18,9 +18,8 @@
 #include "system.hh"
 
 static bool
-is_break (Grob *g)
+is_break (Grob *)
 {
-  (void) g; /* shutup warning */
   return false;
 }
 
@@ -38,7 +37,7 @@ Optimal_page_breaking::solve ()
 {
   vsize end = last_break_position ();
   vsize max_sys_count = max_system_count (0, end);
-  vsize first_page_num = robust_scm2int (book_->paper_->c_variable ("part-first-page-number"), 1);
+  vsize first_page_num = robust_scm2int (book_->paper_->c_variable ("first-page-number"), 1);
   SCM forced_page_count = book_->paper_->c_variable ("page-count");
 
   set_to_ideal_line_configuration (0, end);
@@ -63,6 +62,8 @@ Optimal_page_breaking::solve ()
   
       if (page_count > 1 && best.systems_per_page_[page_count - 2] > 1)
        min_sys_count -= best.systems_per_page_[page_count - 2];
+
+      min_sys_count = max (min_sys_count, (vsize)1);
     }
   else
     {