X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=blobdiff_plain;f=lily%2Finclude%2Fspring-spacer.hh;h=27d2f153331321858dd73ecf351307e1fc369e98;hb=63c9cee8ce190aaae4a5db3d2e200d35a570838d;hp=ffd59f5f688407efffe80be7f757179ad91bbe0e;hpb=4c5b1c14d1474af33002a4ba9e8584647c4ad8c0;p=lilypond.git

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;