Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/lily/include/page-spacing.hh b/lily/include/page-spacing.hh
index b91540a03f7937622ea5eadafbd443f403939744..e1fa582d922fa8013e7d9535945db9f33e0feba7 100644 (file)
--- a/lily/include/page-spacing.hh
+++ b/lily/include/page-spacing.hh
@@ -4,7 +4,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2006 Joe Neeman <joeneeman@gmail.com>
+  (c) 2006--2007 Joe Neeman <joeneeman@gmail.com>
 */
 
 #ifndef PAGE_SPACING_HH
@@ -65,12 +65,24 @@ private:
   bool calc_subproblem (vsize page, vsize lines);
 };
 
+vsize
+min_page_count (vector<Line_details> const &lines,
+               Real page_height, bool ragged, bool ragged_last);
+
+Spacing_result
+space_systems_on_n_pages (vector<Line_details> const&,
+                         vsize n,
+                         Real page_height,
+                         bool ragged,
+                         bool ragged_last);
+
 Spacing_result
-space_systems_on_min_pages (vector<Line_details> const&,
-                           Real page_height,
-                           Real odd_pages_penalty,
-                           bool ragged,
-                           bool ragged_last);
+space_systems_on_n_or_one_more_pages (vector<Line_details> const&,
+                                     vsize n,
+                                     Real page_height,
+                                     Real odd_pages_penalty,
+                                     bool ragged,
+                                     bool ragged_last);
 Spacing_result
 space_systems_on_best_pages (vector<Line_details> const&,
                             Real page_height,