From aa1dc01de16aa8a8e7ac67dab630f3927d56d93e Mon Sep 17 00:00:00 2001 From: Joe Neeman Date: Thu, 14 May 2009 13:52:11 -0700 Subject: [PATCH] Penalize properly when systems don't fit on the requested number of pages. --- lily/page-spacing.cc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lily/page-spacing.cc b/lily/page-spacing.cc index c236c94e88..cc84cfd943 100644 --- 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; } -- 2.39.5