Penalize properly when systems don't fit on the requested number of pages.

diff --git a/lily/page-spacing.cc b/lily/page-spacing.cc
index c236c94e88936193defac0c3f5ffa6631901503f..cc84cfd9432ef19dd3bda51f881dbb79e07705c1 100644 (file)
--- a/lily/page-spacing.cc
+++ b/lily/page-spacing.cc
@@ -155,17 +155,14 @@ Page_spacer::solve (vsize page_count)
   if (extra_systems)
     {
       ret.systems_per_page_.back () += extra_systems;
-      ret.demerits_ += BAD_SPACING_PENALTY;
+      ret.force_.back () = 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;
 }