X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Foptimal-page-breaking.cc;h=44e96602e8dce90423658e5e27352da8ee923fca;hb=95f21b745890a01ccc85c6ba57710090164b36d2;hp=0e4f06dbcb8d7e153805d7f4329a322009561fe4;hpb=5a7eab1d7fad7f5f23202f3631df0545cb7b47e2;p=lilypond.git

diff --git a/lily/optimal-page-breaking.cc b/lily/optimal-page-breaking.cc
index 0e4f06dbcb..44e96602e8 100644
--- 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--2009 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;
 }
 
@@ -36,48 +35,64 @@ Optimal_page_breaking::~Optimal_page_breaking ()
 SCM
 Optimal_page_breaking::solve ()
 {
-  vsize end = breaks_.size () - 1;
-  vsize min_sys_count = 0;
-  vsize ideal_sys_count = 0;
+  vsize end = last_break_position ();
   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);
+  SCM forced_page_count = book_->paper_->c_variable ("page-count");
 
-  /* 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;
+  vsize page_count = robust_scm2int (forced_page_count, 1);
+  Line_division ideal_line_division = current_configuration (0);
+  Line_division best_division = ideal_line_division;
+  vsize min_sys_count = 1;
+  vsize ideal_sys_count = system_count ();
+  
+  if (!scm_is_integer (forced_page_count))
+    {
+      /* find out the ideal number of pages */
+      message (_ ("Finding the ideal number of pages..."));
+  
+      best = space_systems_on_best_pages (0, first_page_num);
+      page_count = best.systems_per_page_.size ();
+
+      ideal_sys_count = best.system_count ();
+      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];
+
+      min_sys_count = max (min_sys_count, (vsize)1);
+    }
+  else
+    {
+      /* 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;
+    }
 
-  min_sys_count = ideal_sys_count - best.systems_per_page_.back ();
-  if (page_count > 1)
-    min_sys_count -= best.systems_per_page_[page_count - 2];
+  if (page_count == 1)
+    message (_ ("Fitting music on 1 page..."));
+  else if (scm_is_integer (forced_page_count))
+    message (_f ("Fitting music on %d pages...", (int)page_count));
+  else
+    message (_f ("Fitting music on %d or %d pages...", (int)page_count-1, (int)page_count));
 
-  message (_f ("Fitting music on %d (or one fewer) pages...", (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;
-	  else 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);
@@ -95,15 +110,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;
@@ -121,7 +132,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;
@@ -144,7 +155,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);