X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fspring.hh;h=fd01ca048cf7bc0ce53506c8b058dae13b244702;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=4022173201f45d00852568d7f5e8cd0c181a5ef8;hpb=3f141d50d558df9fdfe08cc97b1bc910c0833e86;p=lilypond.git

diff --git a/lily/include/spring.hh b/lily/include/spring.hh
index 4022173201..fd01ca048c 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--2015 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
@@ -12,8 +23,12 @@
 #include "lily-proto.hh"
 #include "smobs.hh"
 
-class Spring
+class Spring : public Simple_smob<Spring>
 {
+public:
+  static SCM equal_p (SCM, SCM);
+  static const char type_p_name_[];
+private:
   Real distance_;
   Real min_distance_;
 
@@ -24,7 +39,6 @@ class Spring
 
   void update_blocking_force ();
 
-  DECLARE_SIMPLE_SMOBS (Spring);
 public:
   Spring ();
   Spring (Real distance, Real min_distance);
@@ -34,22 +48,23 @@ public:
   Real inverse_stretch_strength () const {return inverse_stretch_strength_;}
   Real inverse_compress_strength () const {return inverse_compress_strength_;}
   Real blocking_force () const {return blocking_force_;}
-  
+
   Real length (Real f) const;
 
   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);
   void set_default_strength ();
+  void set_default_compress_strength ();
+  void set_default_stretch_strength ();
 
-  void operator*= (Real);
-  bool operator> (Spring const&) const;
+  void operator *= (Real);
+  bool operator > (Spring const &) const;
 };
-DECLARE_UNSMOB (Spring, spring);
 
 Spring merge_springs (vector<Spring> const &springs);
 
 #endif /* SPRING_HH */
-