X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fgourlay-breaking.hh;h=b019e3dc723b06df161efafc9b24be88a099d66e;hb=26aa7a02d8cad410c4b496b87891653edbba771a;hp=f01df2384885b2bd63adbb3e9f4ddedced21aef7;hpb=69b9cead5afe7164b9053d26eba582fec3825ef8;p=lilypond.git

diff --git a/lily/include/gourlay-breaking.hh b/lily/include/gourlay-breaking.hh
index f01df23848..b019e3dc72 100644
--- a/lily/include/gourlay-breaking.hh
+++ b/lily/include/gourlay-breaking.hh
@@ -3,26 +3,21 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2005 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
- */
+   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<Col_hpositions> 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