Fix 399 again.

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

diff --git a/lily/optimal-page-breaking.cc b/lily/optimal-page-breaking.cc
index 4f82c2d1aec0ae86a8bd17c660d9e79295535428..34ff7f1b184cb519b418c2b44f53417599a31b4d 100644 (file)
--- a/lily/optimal-page-breaking.cc
+++ b/lily/optimal-page-breaking.cc
@@ -37,30 +37,22 @@ SCM
 Optimal_page_breaking::solve ()
 {
   vsize end = last_break_position ();
-  vsize min_sys_count = 0;
-  vsize ideal_sys_count = 0;
   vsize max_sys_count = max_system_count (0, end);
-  vsize page_count = 0;
-  
-  Line_division ideal_line_division;
-  Line_division best_division;
-  Line_division bound;
   vsize first_page_num = robust_scm2int (book_->paper_->c_variable ("first-page-number"), 1);
 
   /* find out the ideal number of pages */
   message (_ ("Finding the ideal number of pages..."));
   set_to_ideal_line_configuration (0, end);
-  ideal_line_division = current_configuration (0);
-
-  Spacing_result best = space_systems_on_best_pages (0, first_page_num);
-  page_count = best.systems_per_page_.size ();
-  best_division = ideal_line_division;
-
-  for (vsize i = 0; i < page_count; i++)
-    ideal_sys_count += best.systems_per_page_[i];
+  
+  Page_spacing_result best = space_systems_on_best_pages (0, first_page_num);
+  vsize page_count = best.systems_per_page_.size ();
+  Line_division ideal_line_division = current_configuration (0);
+  Line_division best_division = ideal_line_division;
 
-  min_sys_count = ideal_sys_count - best.systems_per_page_.back ();
-  if (page_count > 1)
+  vsize ideal_sys_count = best.system_count ();
+  vsize min_sys_count = ideal_sys_count - best.systems_per_page_.back ();
+  
+  if (page_count > 1 && best.systems_per_page_[page_count - 2] > 1)
     min_sys_count -= best.systems_per_page_[page_count - 2];
 
   if (page_count == 1)
@@ -69,16 +61,16 @@ Optimal_page_breaking::solve ()
     message (_f ("Fitting music on %d or %d pages...", (int)page_count-1, (int)page_count));
 
   /* try a smaller number of systems than the ideal number for line breaking */
-  bound = ideal_line_division;
+  Line_division bound = ideal_line_division;
   for (vsize sys_count = ideal_sys_count; --sys_count >= min_sys_count;)
     {
-      Spacing_result best_for_this_sys_count;
+      Page_spacing_result best_for_this_sys_count;
       set_current_breakpoints (0, end, sys_count, Line_division (), bound);
 
       for (vsize i = 0; i < current_configuration_count (); i++)
        {
          vsize min_p_count = min_page_count (i, first_page_num);
-         Spacing_result cur;
+         Page_spacing_result cur;
 
          if (min_p_count > page_count)
            continue;
@@ -100,15 +92,11 @@ Optimal_page_breaking::solve ()
          best_division = bound;
        }
 
-      if (best_for_this_sys_count.systems_per_page_.size () < page_count)
-       {
-         /* if the pages are stretched on average, stop trying to reduce sys_count */
-         Real avg_f = 0;
-         for (vsize i = 0; i < best_for_this_sys_count.systems_per_page_.size (); i++)
-           avg_f += best_for_this_sys_count.systems_per_page_[i];
-         if (avg_f > 0)
-           break;
-       }
+      /* if the pages are stretched on average, stop trying to reduce sys_count */
+      if (best_for_this_sys_count.page_count () < page_count
+         && best_for_this_sys_count.average_force () > 0)
+       break;
+       
 
       if (isinf (best_for_this_sys_count.demerits_))
        break;
@@ -126,7 +114,7 @@ Optimal_page_breaking::solve ()
       for (vsize i = 0; i < current_configuration_count (); i++)
        {
          vsize min_p_count = min_page_count (i, first_page_num);
-         Spacing_result cur;
+         Page_spacing_result cur;
 
          if (min_p_count > page_count)
            continue;