X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fspring.hh;h=958d1fa651439a8345c9d011ac39d725b6250d69;hb=a6bd229f7fe1dc4a03478e14ccc0c0c66b225061;hp=78bd68cb57b7bcb08b08af05d3c6d6f2782f341c;hpb=3a46c0c5944963e1b3e5dc0bc5c5f843e908d884;p=lilypond.git

diff --git a/lily/include/spring.hh b/lily/include/spring.hh
index 78bd68cb57..958d1fa651 100644
--- a/lily/include/spring.hh
+++ b/lily/include/spring.hh
@@ -1,9 +1,20 @@
 /*
-  spring.hh -- declare Spring
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1999--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1999--2007 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 SPRING_HH
@@ -39,6 +50,7 @@ public:
 
   void set_distance (Real);
   void set_min_distance (Real);
+  void ensure_min_distance (Real);
   void set_inverse_stretch_strength (Real);
   void set_inverse_compress_strength (Real);
   void set_blocking_force (Real);
@@ -46,7 +58,6 @@ public:
 
   void operator*= (Real);
   bool operator> (Spring const&) const;
-  Grob *other_;
 };
 DECLARE_UNSMOB (Spring, spring);