Merge branch 'master' into nested-bookparts

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

diff --git a/lily/optimal-page-breaking.cc b/lily/optimal-page-breaking.cc
index fa1e72b31ac4ea3cc3ee14841a12450734f58753..9d395a1b509cc272a23ec6a5e109b96976ad2fae 100644 (file)
--- a/lily/optimal-page-breaking.cc
+++ b/lily/optimal-page-breaking.cc
@@ -38,7 +38,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 ("first-page-number"), 1);
+  vsize first_page_num = robust_scm2int (book_->paper_->c_variable ("part-first-page-number"), 1);
   SCM forced_page_count = book_->paper_->c_variable ("page-count");
 
   set_to_ideal_line_configuration (0, end);
@@ -65,7 +65,12 @@ Optimal_page_breaking::solve ()
        min_sys_count -= best.systems_per_page_[page_count - 2];
     }
   else
-    best = space_systems_on_n_pages (0, page_count, first_page_num);
+    {
+      /* todo: the following line will spit out programming errors if the
+        ideal line spacing doesn't fit on PAGE_COUNT pages */
+      best = space_systems_on_n_pages (0, page_count, first_page_num);
+      min_sys_count = page_count;
+    }
 
   if (page_count == 1)
     message (_ ("Fitting music on 1 page..."));
@@ -86,7 +91,7 @@ Optimal_page_breaking::solve ()
          vsize min_p_count = min_page_count (i, first_page_num);
          Page_spacing_result cur;
 
-         if (min_p_count == page_count)
+         if (min_p_count == page_count || 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);
@@ -149,7 +154,7 @@ Optimal_page_breaking::solve ()
        break;
     }
 
-  message ("Drawing systems...");
+  message (_ ("Drawing systems..."));
   break_into_pieces (0, end, best_division);
   SCM lines = systems ();
   return make_pages (best.systems_per_page_, lines);