Tie up some loose ends with min-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 150e09fa9aa726ffb40eee4fc8e0631faebddabc..c6c1bc02c80b88c32b0fa2b0275a70fcbb6d1fca 100644 (file)
--- a/lily/include/page-breaking.hh
+++ b/lily/include/page-breaking.hh
@@ -4,7 +4,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2006--2007 Joe Neeman <joeneeman@gmail.com>
+  (c) 2006--2009 Joe Neeman <joeneeman@gmail.com>
 */
 
 #ifndef PAGE_BREAKING_HH
@@ -101,9 +101,16 @@ public:
   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;
+  int line_count_status (int line_count) const;
+  bool too_many_lines (int line_count) const;
+  bool too_few_lines (int line_count) const;
 
 protected:
   Paper_book *book_;
@@ -129,11 +136,13 @@ 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);
@@ -150,6 +159,9 @@ 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_;