release: 1.3.19

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

diff --git a/lily/include/gourlay-breaking.hh b/lily/include/gourlay-breaking.hh
index d8c3472a14898ff3c74dbab8deaa14cf489a9bfc..9f002950767651d0843a569522366ab262c33126 100644 (file)
--- a/lily/include/gourlay-breaking.hh
+++ b/lily/include/gourlay-breaking.hh
@@ -3,26 +3,27 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--2000 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_ ;
+  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();
+  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