* configure.in: Test for and accept lmodern if EC fonts not found.

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

diff --git a/lily/include/break-algorithm.hh b/lily/include/break-algorithm.hh
index c91a00bdafa03b83d838b2305506db7d5c464391..6d0eb511819f07565f81f5e94253c86b7c1b8234 100644 (file)
--- a/lily/include/break-algorithm.hh
+++ b/lily/include/break-algorithm.hh
@@ -3,16 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
 #ifndef BREAK_HH
 #define BREAK_HH
 
-#include "array.hh"
 #include "interval.hh"
-#include "lily-proto.hh"
 #include "column-x-positions.hh"
 
 
@@ -24,23 +22,15 @@
   */
 class Break_algorithm {
 protected:
-  Paper_score *pscore_l_;
-  Real linewidth_f_;
+  Paper_score *pscore_;
+  Real linewidth_;
 
-  /// search all pcols which are breakable.
   Link_array<Grob> find_breaks () const;
-
   Array<int> find_break_indices () const;
-    
-
-  /// helper: solve for the columns in #curline#.
   void solve_line (Column_x_positions*) const;
+  bool feasible (Link_array<Grob> const &) const;
 
-  /// does curline fit on the paper?    
-  bool feasible (Link_array<Grob>) const;
-    
-
-  Simple_spacer* generate_spacing_problem (Link_array<Grob>, Interval) const;
+  Simple_spacer_wrapper* generate_spacing_problem (Link_array<Grob> const &, Interval) const;
 
   virtual Array<Column_x_positions> do_solve () const=0;
 
@@ -48,7 +38,6 @@ public:
   Simple_spacer* (*get_line_spacer) ();
   Break_algorithm ();
   void set_pscore (Paper_score*);
-
   Array<Column_x_positions> solve () const;
 };