release: 1.0.1

[lilypond.git] / lily / include / break.hh

diff --git a/lily/include/break.hh b/lily/include/break.hh
index dcc3f639083471f5bcacb322c369278a7e4d0f54..f3b3deb18b1b58de4aaa3481494d5e00809df993 100644 (file)
--- a/lily/include/break.hh
+++ b/lily/include/break.hh
@@ -3,18 +3,17 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996, 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996,  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
 #ifndef BREAK_HH
 #define BREAK_HH
-#include "varray.hh"
+#include "array.hh"
+#include "interval.hh"
 #include "lily-proto.hh"
 #include "colhpos.hh"
 
-
-
 /**
   Statistics for the number of columns calced.
  */
@@ -48,19 +47,20 @@ protected:
     
 
   /// helper: solve for the columns in #curline#.
-  void solve_line (Col_hpositions*) const;
+  void solve_line (Column_x_positions*) const;
 
   /// helper: approximate the energyv
-  void approximate_solve_line (Col_hpositions*) const;
+  void approximate_solve_line (Column_x_positions*) const;
 
   /// does curline fit on the paper?    
   bool feasible (Line_of_cols) const;
     
 
-  Line_spacer* generate_spacing_problem (Line_of_cols) const;
+  Line_spacer* generate_spacing_problem (Line_of_cols, Interval) const;
+
+  virtual Array<Column_x_positions> do_solve() const=0;
+  virtual void do_set_pscore();
 
-  virtual Array<Col_hpositions> do_solve() const=0;
-   virtual void do_set_pscore();
 public:
   Col_stats approx_stats_;
   Col_stats exact_stats_;
@@ -73,7 +73,7 @@ public:
   /// check if the spacing/breaking problem is well-stated
   void problem_OK() const;
   void OK() const;
-  Array<Col_hpositions> solve() const;
+  Array<Column_x_positions> solve() const;
 };
 
 #endif // BREAK_HH