include accidentals and arpeggios in note spacing

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

diff --git a/lily/include/spring.hh b/lily/include/spring.hh
index c3ef5bd027493879c36a757469a9764ee9fd6ba2..b49d3de1f47843918b0244eb37505e1de1ddc2f3 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--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef 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 strength_;
+  Real min_distance_;
 
-  DECLARE_SIMPLE_SMOBS (Spring_smob, dummy);
-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 strength_;
-  void add_to_cols ();
-  void set_to_cols ();
+  DECLARE_SIMPLE_SMOBS (Spring);
+public:
   Spring ();
 };
+DECLARE_UNSMOB (Spring, spring);
 
 #endif /* SPRING_HH */