X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fgourlay-breaking.hh;h=fd8fe4b37cd864a15fb8a819b1b359ffe750e8d9;hb=d1965f31e75a5e1e9faeb995ef2d37ce5fb3ff85;hp=98c3294bf3bfa680d57fdd4839c67a22656ae990;hpb=b72714440434f1af8a4c0a4d21742c3a56b2587e;p=lilypond.git

diff --git a/lily/include/gourlay-breaking.hh b/lily/include/gourlay-breaking.hh
index 98c3294bf3..fd8fe4b37c 100644
--- a/lily/include/gourlay-breaking.hh
+++ b/lily/include/gourlay-breaking.hh
@@ -10,19 +10,20 @@
 #ifndef GOURLAY_BREAKING_HH
 #define GOURLAY_BREAKING_HH
 
-#include "break.hh"
+#include "break-algorithm.hh"
 
 /**
   A dynamic programming solution to breaking scores into lines
  */
 struct Gourlay_breaking : public Break_algorithm
 {
-    Real energy_bound_f_ ;
+  Real energy_bound_f_ ;
     
     /// maximum number of measures in a line
-    int max_measures_i_;
-    void do_set_pscore();
-    Array<Column_x_positions> do_solve() const;
-    Gourlay_breaking();
+  int max_measures_i_;
+  void do_set_pscore();
+  Array<Column_x_positions> do_solve() const;
+  Gourlay_breaking();
+  Real combine_demerits (Column_x_positions const&,Column_x_positions const&) const;
 };
 #endif // GOURLAY_BREAKING_HH