patch::: 1.3.86.jcn2

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

diff --git a/lily/include/break-algorithm.hh b/lily/include/break-algorithm.hh
index e0548adf9e879c14b27015b139b68feb6085a754..fa0b0d77709c51fde1c56a94fc989d439f07412e 100644 (file)
--- a/lily/include/break-algorithm.hh
+++ b/lily/include/break-algorithm.hh
@@ -3,12 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996,  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
 #ifndef BREAK_HH
 #define BREAK_HH
+
 #include "array.hh"
 #include "interval.hh"
 #include "lily-proto.hh"
@@ -17,18 +18,17 @@
 
 /** Class representation of an algorithm which decides where to put
   the column, and where to break lines.
-  
-  TODO:  A "parindent", caching of breakpoints
+
+  JUNKME.
   
   */
 class Break_algorithm {
 protected:
-
   Paper_score *pscore_l_;
-  Real linelength;
+  Real linewidth_f_;
 
   /// search all pcols which are breakable.
-  Line_of_cols find_breaks() const;
+  Link_array<Score_element> find_breaks() const;
 
   Array<int> find_break_indices() const;
     
@@ -36,28 +36,19 @@ protected:
   /// 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 (Line_of_cols) const;
+  bool feasible (Link_array<Score_element>) const;
     
 
-  Simple_spacer* generate_spacing_problem (Line_of_cols, Interval) const;
+  Simple_spacer* generate_spacing_problem (Link_array<Score_element>, Interval) const;
 
   virtual Array<Column_x_positions> do_solve() const=0;
-  virtual void do_set_pscore();
 
 public:
-  
   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;
 };