Fix 399 again.

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

diff --git a/lily/include/spring.hh b/lily/include/spring.hh
index b49d3de1f47843918b0244eb37505e1de1ddc2f3..4022173201f45d00852568d7f5e8cd0c181a5ef8 100644 (file)
--- a/lily/include/spring.hh
+++ b/lily/include/spring.hh
@@ -1,5 +1,5 @@
 /*
-  spring.hh -- declare Spring, Column_spring
+  spring.hh -- declare Spring
 
   source file of the GNU LilyPond music typesetter
 
@@ -12,20 +12,44 @@
 #include "lily-proto.hh"
 #include "smobs.hh"
 
-struct Spring
+class Spring
 {
-  Grob *other_;
   Real distance_;
   Real min_distance_;
 
   Real inverse_stretch_strength_;
   Real inverse_compress_strength_;
 
+  Real blocking_force_;
+
+  void update_blocking_force ();
+
   DECLARE_SIMPLE_SMOBS (Spring);
 public:
   Spring ();
+  Spring (Real distance, Real min_distance);
+
+  Real distance () const {return distance_;}
+  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);
+  bool operator> (Spring const&) const;
 };
 DECLARE_UNSMOB (Spring, spring);
 
+Spring merge_springs (vector<Spring> const &springs);
+
 #endif /* SPRING_HH */