From: fred <fred>
Date: Sun, 24 Mar 2002 20:08:00 +0000 (+0000)
Subject: lilypond-0.1.57
X-Git-Tag: release/1.5.59~3308
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1e796dd86fac866668a2474ec5f73664e355621f;p=lilypond.git

lilypond-0.1.57
---

diff --git a/lily/include/spring-spacer.hh b/lily/include/spring-spacer.hh
index ffd59f5f68..27d2f15333 100644
--- a/lily/include/spring-spacer.hh
+++ b/lily/include/spring-spacer.hh
@@ -16,6 +16,8 @@
 #include "colhpos.hh"
 #include "moment.hh"
 
+
+
 /** 
   Determine positions of columns connected by springs and held apart by rods.
   
@@ -45,9 +47,10 @@ class Spring_spacer : public Line_spacer {
   friend class Durations_iter;
     
   Pointer_list<Idealspacing *> ideal_p_list_;
-  Array<Colinfo> cols;
+  Array<Colinfo> cols_;
   Array<Colinfo> loose_col_arr_;
-    
+  Array<Spacer_rod> rods_;
+  
   /// mark column #i# as being loose.
   void loosen_column (int i);
   /// the index of #c# in #cols#
@@ -57,7 +60,7 @@ class Spring_spacer : public Line_spacer {
   Vector find_initial_solution() const;
 
   /// does #this# contain the column #w#? 
-  bool contains (Paper_column const *w);
+  bool contains_b (Paper_column const *w);
 
   /// make the energy function
   void make_matrices (Matrix &quad, Vector &lin,Real&) const;