X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fspring.hh;h=3224d77189c7bba1ed4e5c68335562ca97c7585d;hb=f4ff2e488239d66830ac8b3ae5771358a917b58f;hp=aaa7fb5b5afb1dbd72354d1f8dfa77842426d5a5;hpb=af51453530b95aee167fe02ee3f4cb0c8dcd1fe2;p=lilypond.git

diff --git a/lily/include/spring.hh b/lily/include/spring.hh
index aaa7fb5b5a..3224d77189 100644
--- a/lily/include/spring.hh
+++ b/lily/include/spring.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -12,24 +12,33 @@
 
 #include "lily-proto.hh"
 #include "drul-array.hh"
+#include "smobs.hh"
+
+struct Spring_smob
+{
+  Grob *other_;
+  Real distance_;
+  bool expand_only_b_;
+  Real strength_;
+  
+  DECLARE_SIMPLE_SMOBS(Spring_smob,dummy);
+public:
+  Spring_smob();
+};
+DECLARE_UNSMOB(Spring_smob, spring);
 
-struct Column_spring {
-  Paper_column *other_l_;
-  Real distance_f_;
+struct Spring
+{
+  Drul_array<Item*> item_l_drul_;
+  Real distance_;
+  bool expand_only_b_;
 
   /*
     TODO: make 2 strengths: one for stretching, and one for shrinking.
   */
-  Real strength_f_;
-  
-  Column_spring ();
-};
-
-struct Spring{
-  Drul_array<Item*> item_l_drul_;
-  Real distance_f_;
-  Real strength_f_;
+  Real strength_;
   void add_to_cols ();
+  void set_to_cols ();
   Spring ();
 };