Run `make grand-replace'.

[lilypond.git] / lily / include / spring.hh

diff --git a/lily/include/spring.hh b/lily/include/spring.hh
index a5c2ef0a4b5d89482d57bd4af20a96b925174d0e..f4f943f899b5286cbabb18223cdaf40cc97dc846 100644 (file)
--- a/lily/include/spring.hh
+++ b/lily/include/spring.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SPRING_HH
@@ -20,6 +20,10 @@ class Spring
   Real inverse_stretch_strength_;
   Real inverse_compress_strength_;
 
+  Real blocking_force_;
+
+  void update_blocking_force ();
+
   DECLARE_SIMPLE_SMOBS (Spring);
 public:
   Spring ();
@@ -29,15 +33,19 @@ public:
   Real min_distance () const {return min_distance_;}
   Real inverse_stretch_strength () const {return inverse_stretch_strength_;}
   Real inverse_compress_strength () const {return inverse_compress_strength_;}
+  Real blocking_force () const {return blocking_force_;}
+  
+  Real length (Real f) const;
 
   void set_distance (Real);
   void set_min_distance (Real);
   void set_inverse_stretch_strength (Real);
   void set_inverse_compress_strength (Real);
+  void set_blocking_force (Real);
   void set_default_strength ();
 
   void operator*= (Real);
-  Grob *other_;
+  bool operator> (Spring const&) const;
 };
 DECLARE_UNSMOB (Spring, spring);