* Another grand 2003 update.

[lilypond.git] / lily / include / gourlay-breaking.hh

diff --git a/lily/include/gourlay-breaking.hh b/lily/include/gourlay-breaking.hh
index cc5ed6c38558af9d531fc69f8f038b920b0c7cce..6a641b0dfc66c7274a1c1ecb0ad6af5ef2b48129 100644 (file)
--- a/lily/include/gourlay-breaking.hh
+++ b/lily/include/gourlay-breaking.hh
@@ -3,26 +3,22 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
 #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_ ;
-    
-    /// maximum number of measures in a line
-    int max_measures_i_;
-    void do_set_pscore();
-    Array<Column_x_positions> do_solve() const;
-    Gourlay_breaking();
+  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