Run `make grand-replace'.

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

diff --git a/lily/include/simple-spacer.hh b/lily/include/simple-spacer.hh
index 39d9a3f853062cfd3eab5f0654fddd30f9e01fd2..935cb94c6c260e72872b9261d34282f6432984ef 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--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SIMPLE_SPACER_HH
@@ -11,30 +11,9 @@
 
 #include "std-vector.hh"
 #include "lily-proto.hh"
+#include "spring.hh"
 #include "smobs.hh"
 
-struct Spring_description
-{
-  Real ideal_;
-  Real inverse_hooke_;
-  Real block_force_;
-
-  Real length (Real force) const;
-  Spring_description ();
-
-  bool is_sane () const;
-
-  bool operator> (const Spring_description &s) const
-  {
-    return block_force_ > s.block_force_;
-  }
-
-  bool operator< (const Spring_description &s) const
-  {
-    return block_force_ < s.block_force_;
-  }
-};
-
 class Simple_spacer
 {
 public:
@@ -42,23 +21,24 @@ public:
 
   void solve (Real line_len, bool ragged);
   void add_rod (int l, int r, Real dist);
-  void add_spring (Real, Real);
+  void add_spring (Spring const&);
   Real range_ideal_len (int l, int r) const;
-  Real range_stiffness (int l, int r) const;
+  Real range_stiffness (int l, int r, bool stretch) const;
   Real configuration_length (Real) const;
   vector<Real> spring_positions () const;
 
   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 ();
   Real compress_line ();
   Real rod_force (int l, int r, Real dist);
 
-  vector<Spring_description> springs_;
+  vector<Spring> springs_;
   Real line_len_;
   Real force_;
   bool ragged_;
@@ -67,7 +47,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);