X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fspring.hh;h=b49d3de1f47843918b0244eb37505e1de1ddc2f3;hb=3fa45148a1ccad976ab747eddc1762135c063bec;hp=11989b3ad03c6735fdf21e26afb4fb29a3f76578;hpb=a276a19dc6bd57832db3107f2f2cbb04cb4677b6;p=lilypond.git

diff --git a/lily/include/spring.hh b/lily/include/spring.hh
index 11989b3ad0..b49d3de1f4 100644
--- a/lily/include/spring.hh
+++ b/lily/include/spring.hh
@@ -12,33 +12,20 @@
 #include "lily-proto.hh"
 #include "smobs.hh"
 
-struct Spring_smob
+struct Spring
 {
   Grob *other_;
   Real distance_;
-  bool expand_only_b_;
-  Real inverse_strength_;
+  Real min_distance_;
 
-  DECLARE_SIMPLE_SMOBS (Spring_smob);
-public:
-  Spring_smob ();
-};
-DECLARE_UNSMOB (Spring_smob, spring);
+  Real inverse_stretch_strength_;
+  Real inverse_compress_strength_;
 
-struct Spring
-{
-  Drul_array<Item *> item_drul_;
-  Real distance_;
-  bool expand_only_b_;
-
-  /*
-    TODO: make 2 strengths: one for stretching, and one for shrinking.
-  */
-  Real inverse_strength_;
-  void add_to_cols ();
-  void set_to_cols ();
+  DECLARE_SIMPLE_SMOBS (Spring);
+public:
   Spring ();
 };
+DECLARE_UNSMOB (Spring, spring);
 
 #endif /* SPRING_HH */