* scm/paper-system.scm (paper-system-annotate): also annotate the

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

diff --git a/lily/include/gourlay-breaking.hh b/lily/include/gourlay-breaking.hh
index 99fa0c93407a91ef6d94363d48ef20753acb4b2c..34a92f8dea2ac632e19f0e20c1962bf4449cddfd 100644 (file)
--- 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 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.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();
+  vector<Column_x_positions> solve ();
+  Gourlay_breaking ();
+  Real combine_demerits (Column_x_positions const &, Column_x_positions const &) const;
 };
 #endif // GOURLAY_BREAKING_HH