X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspring-smob.cc;h=1ab1507fbf5ce02fdf2b44a8dad0c4409485587b;hb=ce593a5d9614d463ac0255eac17ceb50ce3bcc29;hp=bab14e841859a4c6488d7ac31519c412db26dbac;hpb=7e72a1e50e94a7f9738d62599de79fe7745f600c;p=lilypond.git

diff --git a/lily/spring-smob.cc b/lily/spring-smob.cc
index bab14e8418..1ab1507fbf 100644
--- a/lily/spring-smob.cc
+++ b/lily/spring-smob.cc
@@ -1,47 +1,43 @@
-/*   
-  spring.cc --  implement Spring
-  
+/*
+  spring.cc -- implement Spring
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #include "spring.hh"
 #include "warn.hh"
 #include "ly-smobs.icc"
 
-Spring_smob::Spring_smob()
+Spring_smob::Spring_smob ()
 {
-  distance_ =0.;
-  strength_ =1.0;
+  distance_ = 0.;
+  inverse_strength_ = 1.0;
   expand_only_b_ = false;
   other_ = 0;
 }
 
-
-IMPLEMENT_SIMPLE_SMOBS(Spring_smob);
+IMPLEMENT_SIMPLE_SMOBS (Spring_smob);
 
 SCM
-Spring_smob::mark_smob (SCM) { return SCM_UNSPECIFIED; }
+Spring_smob::mark_smob (SCM x)
+{
+  (void)x;
+
+  return SCM_UNSPECIFIED;
+}
 
 int
-Spring_smob::print_smob (SCM s, SCM p, scm_print_state *)
+Spring_smob::print_smob (SCM, SCM p, scm_print_state *)
 {
-  Spring_smob *ss = unsmob_spring (s);
-  scm_puts (_f("#<spring smob d= %f>", ss->distance_).to_str0 (), p);
+  scm_puts ("#<Spring smob>", p);
   return 1;
 }
 
 SCM
-Spring_smob::equal_p (SCM a , SCM b)
+Spring_smob::equal_p (SCM a, SCM b)
 {
-  return a==b? SCM_BOOL_T : SCM_BOOL_F;
+  return a == b? SCM_BOOL_T : SCM_BOOL_F;
 }
 
-SCM
-Spring_smob::smobbed_copy ()const
-{
-  Spring_smob *  p = new Spring_smob (*this);
-  return p->smobbed_self ();
-}