Fixes bugs in the page breaking refactor.

[lilypond.git] / lily / include / spring.hh

diff --git a/lily/include/spring.hh b/lily/include/spring.hh
index 5cb50a9191692a108932b44ad912586f7245ffb7..11989b3ad03c6735fdf21e26afb4fb29a3f76578 100644 (file)
--- a/lily/include/spring.hh
+++ b/lily/include/spring.hh
@@ -1,17 +1,15 @@
-/*   
+/*
   spring.hh -- declare Spring, Column_spring
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c)  1999--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1999--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #ifndef SPRING_HH
 #define SPRING_HH
 
 #include "lily-proto.hh"
-#include "drul-array.hh"
 #include "smobs.hh"
 
 struct Spring_smob
@@ -19,29 +17,28 @@ struct Spring_smob
   Grob *other_;
   Real distance_;
   bool expand_only_b_;
-  Real strength_;
-  
-  DECLARE_SIMPLE_SMOBS(Spring_smob,dummy);
+  Real inverse_strength_;
+
+  DECLARE_SIMPLE_SMOBS (Spring_smob);
 public:
-  SCM smobbed_copy () const;
-  Spring_smob();
+  Spring_smob ();
 };
-DECLARE_UNSMOB(Spring_smob, spring);
+DECLARE_UNSMOB (Spring_smob, spring);
 
-struct Spring{
-  Drul_array<Item*> item_l_drul_;
+struct Spring
+{
+  Drul_array<Item *> item_drul_;
   Real distance_;
   bool expand_only_b_;
 
   /*
     TODO: make 2 strengths: one for stretching, and one for shrinking.
   */
-  Real strength_;
+  Real inverse_strength_;
   void add_to_cols ();
   void set_to_cols ();
   Spring ();
 };
 
-
 #endif /* SPRING_HH */