From: Joe Neeman <joeneeman@gmail.com>
Date: Thu, 26 Aug 2010 22:00:11 +0000 (-0700)
Subject: Fix regressions in page breaking.
X-Git-Tag: release/2.13.32-1~23
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6b46518c0efcc514c5caa3a742d456b5cc8f9c34;p=lilypond.git

Fix regressions in page breaking.

Store the system-count-status properly for the new, optimized
code path.
---

diff --git a/lily/page-spacing.cc b/lily/page-spacing.cc
index e4b4eec9ef..00ffcc4458 100644
--- a/lily/page-spacing.cc
+++ b/lily/page-spacing.cc
@@ -111,6 +111,10 @@ Page_spacer::solve ()
     }
 
   Page_spacing_result ret;
+  ret.penalty_ = simple_state_.back ().penalty_
+    + lines_.back ().page_penalty_ + lines_.back ().turn_penalty_;
+  ret.system_count_status_ = simple_state_.back ().system_count_status_;
+
   vsize system = lines_.size () - 1;
   while (system != VPOS)
     {
@@ -176,6 +180,7 @@ Page_spacer::solve (vsize page_count)
 
   ret.force_.resize (page_count);
   ret.systems_per_page_.resize (page_count);
+  ret.system_count_status_ = state_.at (system, page_count-1).system_count_status_;
   ret.penalty_ = state_.at (system, page_count-1).penalty_
     + lines_.back ().page_penalty_ + lines_.back ().turn_penalty_;