X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fsimple-spacer.hh;h=a0d5f0704bdbd034dd6d2b24d5ed7cbc3c3f63cc;hb=81abebcfecdb22d2e7b6b8e2a6d9f758aa45a13a;hp=ae3206ac5f70c0c75ae452e27542872e7eb90136;hpb=3f8485925e8c879fe4c9ae86acef9804126c3b91;p=lilypond.git

diff --git a/lily/include/simple-spacer.hh b/lily/include/simple-spacer.hh
index ae3206ac5f..a0d5f0704b 100644
--- 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--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 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,9 +21,9 @@ 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;
 
@@ -59,7 +38,7 @@ private:
   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_;