* lily/global-context.cc (run_iterator_on_me): fix grace note

[lilypond.git] / lily / spring-smob.cc

diff --git a/lily/spring-smob.cc b/lily/spring-smob.cc
index 3ab9618ef068ef478ea6a89fd2a05f77afdfc46a..591953b0359cf6c175a22c400490f1b8e84cad92 100644 (file)
--- a/lily/spring-smob.cc
+++ b/lily/spring-smob.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -11,16 +11,16 @@
 #include "warn.hh"
 #include "ly-smobs.icc"
 
-Spring_smob::Spring_smob()
+Spring_smob::Spring_smob ()
 {
-  distance_f_ =0.;
-  strength_f_ =1.0;
+  distance_ =0.;
+  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; }
@@ -29,7 +29,7 @@ int
 Spring_smob::print_smob (SCM s, SCM p, scm_print_state *)
 {
   Spring_smob *ss = unsmob_spring (s);
-  scm_puts (_f("#<spring smob d= %f>", ss->distance_f_).ch_C(), p);
+  scm_puts (_f ("#<spring smob d= %f>", ss->distance_).to_str0 (), p);
   return 1;
 }
 
@@ -39,9 +39,3 @@ Spring_smob::equal_p (SCM a , SCM b)
   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 ();
-}