X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpage-spacing.cc;h=c60f0d88b1d171d3df4608169575ea7cf6331cfa;hb=5b1802d893dfba36e760472aa5e9e90300aa70a5;hp=384ce440222a95cc1f5901dd0cdd54113e779eda;hpb=b6ba138a2e5f8542b1278721c70f28f3a0400b3c;p=lilypond.git

diff --git a/lily/page-spacing.cc b/lily/page-spacing.cc
index 384ce44022..c60f0d88b1 100644
--- a/lily/page-spacing.cc
+++ b/lily/page-spacing.cc
@@ -4,7 +4,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 "page-spacing.hh"
@@ -92,11 +92,10 @@ Page_spacer::solve (vsize page_count)
     resize (page_count);
 
   Page_spacing_result ret;
-  ret.force_.resize (page_count);
-  ret.systems_per_page_.resize (page_count);
 
   vsize system = lines_.size () - 1;
-  vsize tack_onto_the_end = 0;
+  vsize extra_systems = 0;
+  vsize extra_pages = 0;
 
   if (isinf (state_.at (system, page_count-1).demerits_))
     {
@@ -112,13 +111,28 @@ Page_spacer::solve (vsize page_count)
 
       if (i)
 	{
-	  tack_onto_the_end = system - i;
+	  extra_systems = system - i;
 	  system = i;
 	}
       else
-	return Page_spacing_result (); /* couldn't salvage it -- probably going to crash */
+	{
+	  /* try chopping off pages from the end */
+	  vsize j;
+	  for (j = page_count; j && isinf (state_.at (system, j-1).demerits_); j--)
+	    ;
+
+	  if (j)
+	    {
+	      extra_pages = page_count - j;
+	      page_count = j;
+	    }
+	  else
+	    return Page_spacing_result (); /* couldn't salvage it -- probably going to crash */
+	}
     }
 
+  ret.force_.resize (page_count);
+  ret.systems_per_page_.resize (page_count);
   ret.penalty_ = state_.at (system, page_count-1).penalty_
     + lines_.back ().page_penalty_ + lines_.back ().turn_penalty_;
 
@@ -133,9 +147,23 @@ Page_spacer::solve (vsize page_count)
       if (p == 0)
 	ret.systems_per_page_[p] = system + 1;
       else
-	ret.systems_per_page_[p] = system - ps.prev_ + tack_onto_the_end;
+	ret.systems_per_page_[p] = system - ps.prev_;
       system = ps.prev_;
     }
+
+  if (extra_systems)
+    {
+      ret.systems_per_page_.back () += extra_systems;
+      ret.demerits_ += BAD_SPACING_PENALTY;
+    }
+  if (extra_pages)
+    {
+      ret.force_.insert (ret.force_.end (), extra_pages, BAD_SPACING_PENALTY);
+      ret.systems_per_page_.insert (ret.systems_per_page_.end (), extra_pages, 0);
+      ret.demerits_ += BAD_SPACING_PENALTY;
+    }
+
+
   ret.demerits_ += ret.penalty_;
   return ret;
 }
@@ -165,36 +193,49 @@ Page_spacer::calc_subproblem (vsize page, vsize line)
 		      breaker_->page_top_space ());
   Page_spacing_node &cur = state_.at (line, page);
   bool ragged = ragged_ || (ragged_last_ && last);
+  int line_count = 0;
 
   for (vsize page_start = line+1; page_start > page && page_start--;)
     {
       Page_spacing_node const *prev = page > 0 ? &state_.at (page_start-1, page-1) : 0;
 
       space.prepend_system (lines_[page_start]);
-      if (page_start < line && (isinf (space.force_) || (space.force_ < 0 && ragged)))
+
+      // This 'if' statement is a little hard to parse. It won't consider this configuration
+      // if it is overfull unless the current configuration is the first one with this start
+      // point. We also make an exception (and consider this configuration) if the previous
+      // configuration we tried had fewer lines than min-systems-per-page.
+      if (!breaker_->too_few_lines (line_count)
+	  && page_start < line
+	  && (isinf (space.force_) || (space.force_ < 0 && ragged)))
 	break;
 
+      line_count += lines_[page_start].compressed_nontitle_lines_count_;
       if (page > 0 || page_start == 0)
 	{
-	  if (line == lines_.size () - 1 && ragged_last_ && space.force_ > 0)
+	  if (line == lines_.size () - 1 && ragged && last && space.force_ > 0)
 	    space.force_ = 0;
 
-	  /* we may have to deal with single lines that are taller than a page */
+	  Real demerits = space.force_ * space.force_;
+	  /* If a single line is taller than a page, we need to consider it as
+	     a possible solution (but we give it a very bad score). */
 	  if (isinf (space.force_) && page_start == line)
-	    space.force_ = -200000;
+	    demerits = BAD_SPACING_PENALTY;
+	  demerits += (prev ? prev->demerits_ : 0);
 
-	  Real dem = fabs (space.force_) + (prev ? prev->demerits_ : 0);
-	  Real penalty = 0;
+	  Real penalty = breaker_->line_count_penalty (line_count);
 	  if (page_start > 0)
-	    penalty = lines_[page_start-1].page_penalty_
+	    penalty += lines_[page_start-1].page_penalty_
 	      + (page % 2 == 0) ? lines_[page_start-1].turn_penalty_ : 0;
 
-	  dem += penalty;
-	  if (dem < cur.demerits_ || page_start == line)
+	  demerits += penalty;
+	  if (demerits < cur.demerits_ || page_start == line)
 	    {
-	      cur.demerits_ = dem;
+	      cur.demerits_ = demerits;
 	      cur.force_ = space.force_;
 	      cur.penalty_ = penalty + (prev ? prev->penalty_ : 0);
+	      cur.system_count_status_ = breaker_->line_count_status (line_count)
+		| (prev ? prev->system_count_status_ : 0);
 	      cur.prev_ = page_start - 1;
 	    }
 	}