X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fgourlay-breaking.hh;h=46c3285ac265c71c5b76cc0d210e797afd64952a;hb=1c5b28defa29c019a3d2038bf4b19ed215ec2d87;hp=d8c3472a14898ff3c74dbab8deaa14cf489a9bfc;hpb=2862b1027f316a2f0444fa92e441ee28acf7a463;p=lilypond.git

diff --git a/lily/include/gourlay-breaking.hh b/lily/include/gourlay-breaking.hh
index d8c3472a14..46c3285ac2 100644
--- 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 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2004 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<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