X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fspaceable-grob.hh;h=8dd955182ee90f642f14608736c8a8f5593b093b;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=10cac3e18ae697825e9e92bfc030a133d7e39e4f;hpb=8363493015f8610419600042b6e5c6c1dca82883;p=lilypond.git

diff --git a/lily/include/spaceable-grob.hh b/lily/include/spaceable-grob.hh
index 10cac3e18a..8dd955182e 100644
--- a/lily/include/spaceable-grob.hh
+++ b/lily/include/spaceable-grob.hh
@@ -1,27 +1,39 @@
-/*   
-  spaceable-grob.hh -- declare Spaceable_grob
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 2000--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #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 */