Optimize optimal-page-breaking.

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

diff --git a/lily/optimal-page-breaking.cc b/lily/optimal-page-breaking.cc
index 29d5ee63e99ac2c2bfbda26bcd8383b79e61ad0d..e9010aec09345ef715d247a20a0a854d34bc5956 100644 (file)
--- a/lily/optimal-page-breaking.cc
+++ b/lily/optimal-page-breaking.cc
@@ -26,14 +26,8 @@
 #include "prob.hh"
 #include "system.hh"
 
-static bool
-is_break (Grob *)
-{
-  return false;
-}
-
 Optimal_page_breaking::Optimal_page_breaking (Paper_book *pb)
-  : Page_breaking (pb, is_break)
+  : Page_breaking (pb, 0, 0)
 {
 }
 
@@ -108,13 +102,12 @@ Optimal_page_breaking::solve ()
 
       for (vsize i = 0; i < current_configuration_count (); i++)
        {
-         vsize min_p_count = min_page_count (i, first_page_num);
          Page_spacing_result cur;
 
-         if (min_p_count == page_count || scm_is_integer (forced_page_count))
+         if (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, 0);
+           cur = space_systems_on_best_pages (i, first_page_num);
 
          if (cur.demerits_ < best_for_this_sys_count.demerits_)
            {
@@ -168,8 +161,10 @@ Optimal_page_breaking::solve ()
 
          if (min_p_count > page_count)
            continue;
-         else
+         else if (scm_is_integer (forced_page_count))
            cur = space_systems_on_n_pages (i, page_count, first_page_num);
+         else
+           cur = space_systems_on_best_pages (i, first_page_num);
 
          if (cur.demerits_ < best.demerits_)
            {