* Another grand 2003 update.

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

diff --git a/lily/include/break-algorithm.hh b/lily/include/break-algorithm.hh
index e06ae4aa705d0b47dcbdc600af0243693d9d378d..623fc81a4a29fe6ba94b0a178a6410c12f65337b 100644 (file)
--- a/lily/include/break-algorithm.hh
+++ b/lily/include/break-algorithm.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996,  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1996--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -18,43 +18,38 @@
 
 /** Class representation of an algorithm which decides where to put
   the column, and where to break lines.
+
+  JUNKME.
   
   */
 class Break_algorithm {
 protected:
-  Paper_score *pscore_l_;
-  Real linewidth_f_;
+  Paper_score *pscore_;
+  Real linewidth_;
 
   /// search all pcols which are breakable.
-  Link_array<Paper_column> find_breaks() const;
+  Link_array<Grob> find_breaks () const;
 
-  Array<int> find_break_indices() const;
+  Array<int> find_break_indices () const;
     
 
   /// helper: solve for the columns in #curline#.
   void solve_line (Column_x_positions*) const;
 
-  /// helper: approximate the energyv
-  void approximate_solve_line (Column_x_positions*) const;
-
   /// does curline fit on the paper?    
-  bool feasible (Link_array<Paper_column>) const;
+  bool feasible (Link_array<Grob> const &) const;
     
 
-  Simple_spacer* generate_spacing_problem (Link_array<Paper_column>, Interval) const;
+  Simple_spacer* generate_spacing_problem (Link_array<Grob> const &, Interval) const;
 
-  virtual Array<Column_x_positions> do_solve() const=0;
-  virtual void do_set_pscore();
+  virtual Array<Column_x_positions> do_solve () const=0;
 
 public:
-  Simple_spacer* (*get_line_spacer)();
-  Break_algorithm();
+  Simple_spacer* (*get_line_spacer) ();
+  Break_algorithm ();
   void set_pscore (Paper_score*);
 
-  /// check if the spacing/breaking problem is well-stated
-  void problem_OK() const;
-  void OK() const;
-  Array<Column_x_positions> solve() const;
+  Array<Column_x_positions> solve () const;
 };
 
 #endif // BREAK_HH