X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fspaceable-grob.hh;h=f7ae552f8402636dbf3b275e834fc29f2accceec;hb=e28fc62d28b63167f2506f91b0df3eb319adef40;hp=a3389217109ae382234fd2d282b04107c58c35d9;hpb=5d1ddaf889233f8e5c32a118f9e843e1becca2d2;p=lilypond.git

diff --git a/lily/include/spaceable-grob.hh b/lily/include/spaceable-grob.hh
index a338921710..f7ae552f84 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--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 2000--2007 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 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 */