Merge branch 'master' into lilypond/translation

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

diff --git a/lily/include/page-turn-page-breaking.hh b/lily/include/page-turn-page-breaking.hh
index db675202b6f8e138b139e745561fd0b972192d36..b91bdb6bed119c81aa77e6cf41fdd0f33ba95315 100644 (file)
--- a/lily/include/page-turn-page-breaking.hh
+++ b/lily/include/page-turn-page-breaking.hh
@@ -52,12 +52,11 @@ protected:
 
   vector<Break_node> state_;
 
-  vsize final_page_num (Break_node const &b);
+  vsize total_page_count (Break_node const &b);
   Break_node put_systems_on_pages (vsize start,
                                   vsize end,
-                                  vector<Line_details> const &lines,
-                                  Line_division const &div,
-                                  int page_number);
+                                  vsize configuration,
+                                  vsize page_number);
 
   SCM make_lines (vector<Break_node> *breaks);
   SCM make_pages (vector<Break_node> const &breaks, SCM systems);