release: 1.1.1

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

diff --git a/lily/include/spring-spacer.hh b/lily/include/spring-spacer.hh
index 27d2f153331321858dd73ecf351307e1fc369e98..33390810ced06f6ccc14a3d4d6facd1edd7ba044 100644 (file)
--- a/lily/include/spring-spacer.hh
+++ b/lily/include/spring-spacer.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -45,11 +45,11 @@
 
 class Spring_spacer : public Line_spacer {
   friend class Durations_iter;
-    
+
   Pointer_list<Idealspacing *> ideal_p_list_;
-  Array<Colinfo> cols_;
-  Array<Colinfo> loose_col_arr_;
-  Array<Spacer_rod> rods_;
+  Array<Column_info> cols_;
+  Array<Column_info> loose_col_arr_;
+
   
   /// mark column #i# as being loose.
   void loosen_column (int i);
@@ -83,9 +83,10 @@ class Spring_spacer : public Line_spacer {
   Real calculate_energy_f (Vector) const;
 public:
   static Line_spacer *constructor();
-
-  virtual void solve (Col_hpositions*) const;
-  virtual void lower_bound_solution (Col_hpositions*) const;
+  Real energy_normalisation_f_;
+  Spring_spacer ();
+  virtual void solve (Column_x_positions*) const;
+  virtual void lower_bound_solution (Column_x_positions*) const;
   virtual void add_column (Paper_column  *, bool fixed=false, Real fixpos=0.0);