Merge with master

[lilypond.git] / lily / include / simple-spacer.hh

diff --git a/lily/include/simple-spacer.hh b/lily/include/simple-spacer.hh
index 47e8080ced6cb9b122e04210d3f7641da26ccb5f..ae3206ac5f70c0c75ae452e27542872e7eb90136 100644 (file)
--- a/lily/include/simple-spacer.hh
+++ b/lily/include/simple-spacer.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SIMPLE_SPACER_HH
@@ -45,13 +45,14 @@ public:
   void add_spring (Real, Real);
   Real range_ideal_len (int l, int r) const;
   Real range_stiffness (int l, int r) const;
-  Real configuration_length () const;
+  Real configuration_length (Real) const;
   vector<Real> spring_positions () const;
 
-  Real force ();
-  bool fits ();
+  Real force () const;
+  Real force_penalty (bool ragged) const;
+  bool fits () const;
 
-  DECLARE_SIMPLE_SMOBS (Simple_spacer,);
+  DECLARE_SIMPLE_SMOBS (Simple_spacer);
 
 private:
   Real expand_line ();
@@ -67,7 +68,6 @@ private:
 
 /* returns a vector of dimensions breaks.size () * breaks.size () */
 vector<Real> get_line_forces (vector<Grob*> const &columns,
-                             vector<vsize> breaks,
                              Real line_len,
                              Real indent,
                              bool ragged);