X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fspaceable-grob.hh;h=71768b7cb37421726e59cd981721c6302b2eac91;hb=43600104d4f9a82f744e9bc4da8d4a0cb69047f9;hp=995b5fd2bc7dc9eebdd7e7f5bdd9cb9f96a0fed4;hpb=8097d28e1530571451dc9c73a6fe65b747aa92bd;p=lilypond.git

diff --git a/lily/include/spaceable-grob.hh b/lily/include/spaceable-grob.hh
index 995b5fd2bc..71768b7cb3 100644
--- a/lily/include/spaceable-grob.hh
+++ b/lily/include/spaceable-grob.hh
@@ -3,24 +3,24 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SPACEABLE_GROB_HH
 #define SPACEABLE_GROB_HH
 
-#include "lily-guile.hh"
 #include "lily-proto.hh"
+#include "grob-interface.hh"
+#include "spring.hh"
 
 struct Spaceable_grob
 {
   /// set a minimum distance
   static void add_rod (Grob *me, Grob *to, Real distance);
-  static void add_spring (Grob *me, Grob *to, Real dist, Real strength);
-  static void get_spring (Grob *me, Grob *other, Real *dist, Real *inv_strength);
+  static void add_spring (Grob *me, Grob *to, Spring sp);
+  static Spring get_spring (Grob *me, Grob *other);
 
-  static bool has_interface (Grob *);
-  static void remove_interface (Grob *);
+  DECLARE_GROB_INTERFACE();
   static SCM get_minimum_distances (Grob *);
   static SCM get_ideal_distances (Grob *);
 };