X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fspaceable-grob.hh;h=71768b7cb37421726e59cd981721c6302b2eac91;hb=8cab78caa0db1ba14f2e52e4c1ddbb541ea0e5cb;hp=887447f11892f063aafdedf744876c2ce6e83348;hpb=2745cbd907f8216a4cc1fc5f488ae19efdfdbd10;p=lilypond.git

diff --git a/lily/include/spaceable-grob.hh b/lily/include/spaceable-grob.hh
index 887447f118..71768b7cb3 100644
--- a/lily/include/spaceable-grob.hh
+++ b/lily/include/spaceable-grob.hh
@@ -1,27 +1,28 @@
-/*   
+/*
   spaceable-grob.hh -- declare Spaceable_grob
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c)  2000--2003 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, bool);
-  static bool has_interface (Grob*);
-  static void remove_interface (Grob*);
-  static SCM get_minimum_distances (Grob*);
-  static SCM get_ideal_distances (Grob*);
+  static void add_rod (Grob *me, Grob *to, Real distance);
+  static void add_spring (Grob *me, Grob *to, Spring sp);
+  static Spring get_spring (Grob *me, Grob *other);
+
+  DECLARE_GROB_INTERFACE();
+  static SCM get_minimum_distances (Grob *);
+  static SCM get_ideal_distances (Grob *);
 };
 
 #endif /* SPACEABLE_GROB_HH */