Add support for max-systems-per-page.

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

diff --git a/lily/include/page-breaking.hh b/lily/include/page-breaking.hh
index 8f1e55e5bf98760664a5dcae34b70a01293bfaf2..d69fe1ce5f42af1fb7a73348c3138dbef579a604 100644 (file)
--- a/lily/include/page-breaking.hh
+++ b/lily/include/page-breaking.hh
@@ -100,7 +100,16 @@ public:
   bool ragged () const;
   bool ragged_last () const;
   bool is_last () const;
+  bool ends_score () const;
+  int systems_per_page () const;
+  int max_systems_per_page () const;
+  int min_systems_per_page () const;
   Real page_height (int page_number, bool last) const;
+  Real page_top_space () const;
+  vsize system_count () const;
+  Real line_count_penalty (int line_count) const;
+  bool too_many_lines (int line_count) const;
+  bool too_few_lines (int line_count) const;
 
 protected:
   Paper_book *book_;
@@ -126,11 +135,15 @@ protected:
   vsize current_configuration_count () const;
   Line_division current_configuration (vsize configuration_index) const;
   Page_spacing_result space_systems_on_n_pages (vsize configuration_index,
-                                          vsize n, vsize first_page_num);
+                                               vsize n, vsize first_page_num);
   Page_spacing_result space_systems_on_n_or_one_more_pages (vsize configuration_index, vsize n,
-                                                      vsize first_page_num);
+                                                           vsize first_page_num);
   Page_spacing_result space_systems_on_best_pages (vsize configuration_index,
-                                             vsize first_page_num);
+                                                  vsize first_page_num);
+  Page_spacing_result space_systems_with_fixed_number_per_page (vsize configuration_index,
+                                                               vsize first_page_num);
+  Page_spacing_result pack_systems_on_least_pages (vsize configuration_index,
+                                                  vsize first_page_num);
   vsize min_page_count (vsize configuration_index, vsize first_page_num);
   bool all_lines_stretched (vsize configuration_index);
   Real blank_page_penalty () const;
@@ -145,6 +158,11 @@ private:
   vector<Constrained_breaking> line_breaking_;
   bool ragged_;
   bool ragged_last_;
+  int systems_per_page_;
+  int max_systems_per_page_;
+  int min_systems_per_page_;
+  Real page_top_space_;
+  vsize system_count_;
 
   vector<Line_division> current_configurations_;
   vector<Break_position> current_chunks_;
@@ -176,6 +194,5 @@ private:
   Page_spacing_result finalize_spacing_result (vsize configuration_index, Page_spacing_result);
   void create_system_list ();
   void find_chunks_and_breaks (Break_predicate);
-  void uncompress_page_spacing_results (Page_spacing_result*);
 };
 #endif /* PAGE_BREAKING_HH */