* lily/translator.cc (derived_mark): new function.

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

diff --git a/lily/include/break-algorithm.hh b/lily/include/break-algorithm.hh
index da181cceafda0e8057f003833345690b7c8f7e90..9729d9ca99be02121482b84432c2626d0381e762 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--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -24,23 +24,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 +40,6 @@ public:
   Simple_spacer* (*get_line_spacer) ();
   Break_algorithm ();
   void set_pscore (Paper_score*);
-
   Array<Column_x_positions> solve () const;
 };