Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[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 1706437908be0a93a7adda746911dbea2a80f578..a109f1ff8f59cd93770a081320519851579dac96 100644 (file)
--- a/lily/include/page-turn-page-breaking.hh
+++ b/lily/include/page-turn-page-breaking.hh
@@ -11,9 +11,7 @@
 #ifndef PAGE_TURN_PAGE_BREAKING_HH
 #define PAGE_TURN_PAGE_BREAKING_HH
 
-#include "constrained-breaking.hh"
 #include "page-breaking.hh"
-#include "lily-guile.hh"
 
 /*
   A dynamic programming solution to breaking pages
@@ -33,12 +31,6 @@ protected:
     int first_page_number_;
     vsize page_count_;
 
-    Real force_;
-    Real penalty_;
-
-    Real line_force_;
-    Real line_penalty_;
-
     /* true if every score here is too widely spaced */
     bool too_many_lines_;
 
@@ -51,8 +43,6 @@ protected:
     Break_node ()
     {
       prev_ = break_pos_ = VPOS;
-      penalty_ = force_ = 0;
-      line_penalty_ = line_force_ = 0;
       demerits_ = infinity_f;
       first_page_number_ = 0;
       page_count_ = 0;
@@ -72,7 +62,6 @@ protected:
   SCM make_lines (vector<Break_node> *breaks);
   SCM make_pages (vector<Break_node> const &breaks, SCM systems);
 
-  Real calc_demerits (Break_node const &me);
   void calc_subproblem (vsize i);
 };
 #endif /* PAGE_TURN_PAGE_BREAKING_HH */