* The grand 2005-2006 replace.

[lilypond.git] / lily / include / simple-spacer.hh

diff --git a/lily/include/simple-spacer.hh b/lily/include/simple-spacer.hh
index 755bdb7008de2879c695f753f3f7fe495694951f..1ee059b637181b726cedeb989d7f7d19280bba7b 100644 (file)
--- a/lily/include/simple-spacer.hh
+++ b/lily/include/simple-spacer.hh
@@ -1,11 +1,10 @@
-/*   
+/*
   simple-spacer.hh -- declare Simple_spacer
-  
+
   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>
+*/
 
 #ifndef SIMPLE_SPACER_HH
 #define SIMPLE_SPACER_HH
@@ -17,7 +16,7 @@
 struct Spring_description
 {
   Real ideal_;
-  Real hooke_;
+  Real inverse_hooke_;
   bool is_active_;
   Real block_force_;
 
@@ -38,8 +37,7 @@ public:
   int active_count_;
 
   Simple_spacer ();
-  
-  
+
   void my_solve_linelen ();
   void my_solve_natural_len ();
   Real active_springs_stiffness () const;
@@ -52,10 +50,9 @@ public:
   void set_active_states ();
   bool is_active () const;
 
-  DECLARE_SIMPLE_SMOBS(Simple_spacer, );
+  DECLARE_SIMPLE_SMOBS (Simple_spacer,);
 };
 
-
 struct Simple_spacer_wrapper
 {
   Simple_spacer *spacer_;
@@ -65,9 +62,9 @@ struct Simple_spacer_wrapper
   Simple_spacer_wrapper ();
   void add_columns (Link_array<Grob> const &);
   void solve (Column_x_positions *, bool);
-  ~Simple_spacer_wrapper();
+  ~Simple_spacer_wrapper ();
 private:
-  Simple_spacer_wrapper(Simple_spacer_wrapper const&);
+  Simple_spacer_wrapper (Simple_spacer_wrapper const &);
 };
 
 #endif /* SIMPLE_SPACER_HH */