Merge branch 'lilypond/translation' of ssh://git.sv.gnu.org/srv/git/lilypond into...

[lilypond.git] / lily / include / page-spacing.hh

diff --git a/lily/include/page-spacing.hh b/lily/include/page-spacing.hh
index 3730262c75516de87031b9c20056016c93526c35..bf8a7e1826c3f8a3e2e06f9b2d27874a7fbf1650 100644 (file)
--- a/lily/include/page-spacing.hh
+++ b/lily/include/page-spacing.hh
@@ -26,7 +26,7 @@
 
    BAD_SPACING_PENALTY is for occasions where the spacing is bad.
    TERRIBLE_SPACING_PENALTY is for when we are disregarding a user override
-   (for example, we are failing to satisfy min-systems-per-page. These user
+   (for example, we are failing to satisfy min-systems-per-page). These user
    overrides are more important than getting good spacing, so they get a
    larger penalty.
 */
@@ -53,12 +53,14 @@ private:
       force_ = infinity_f;
       penalty_ = infinity_f;
       prev_ = VPOS;
+      system_count_status_ = SYSTEM_COUNT_OK;
     }
 
     Real demerits_;
     Real force_;
     Real penalty_;
     vsize prev_;
+    int system_count_status_;
   };
 
   Page_breaking const *breaker_;
@@ -81,15 +83,15 @@ struct Page_spacing
   Real rod_height_;
   Real spring_len_;
   Real inverse_spring_k_;
-  Real page_top_space_;
 
   Line_details last_line_;
   Line_details first_line_;
+  Page_breaking const *breaker_;
 
-  Page_spacing (Real page_height, Real page_top_space)
+  Page_spacing (Real page_height, Page_breaking const *breaker)
   {
     page_height_ = page_height;
-    page_top_space_ = page_top_space;
+    breaker_ = breaker;
     clear ();
   }