release: 1.2.8

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

diff --git a/lily/include/spring-spacer.hh b/lily/include/spring-spacer.hh
index a76c7d47aa6229ad62caae9ffb756d4c7c284c01..7359f6a1a6cb7296ce42fd948951f3f8d8b24370 100644 (file)
--- a/lily/include/spring-spacer.hh
+++ b/lily/include/spring-spacer.hh
@@ -13,7 +13,7 @@
 #include "line-spacer.hh"
 #include "cons.hh"
 #include "col-info.hh"
-#include "colhpos.hh"
+#include "column-x-positions.hh"
 #include "moment.hh"
 
 
@@ -47,14 +47,12 @@
 class Spring_spacer : public Line_spacer {
   friend class Durations_iter;
 private:
-  Spring_spacer (Spring_spacer const&){}
+  // can't copy me.
+  Spring_spacer (Spring_spacer const&s);
   Cons<Idealspacing> *ideal_p_list_;
   Array<Column_info> cols_;
-  Array<Column_info> loose_col_arr_;
-
+  Real indent_f_;
   
-  /// mark column #i# as being loose.
-  void loosen_column (int i);
   /// the index of #c# in #cols#
   int col_id (Paper_column const *c) const;
 
@@ -73,7 +71,6 @@ private:
 
 
   void handle_loose_cols();
-  void position_loose_cols (Vector &) const;
   bool try_initial_solution_and_tell (Vector&)const;
   Vector try_initial_solution() const;
 
@@ -81,7 +78,6 @@ private:
 
   Score_column* scol_l (int);
   void connect (int i,int j, Real,Real);
-  Line_of_cols error_pcol_l_arr() const;
   Real calculate_energy_f (Vector) const;
 public:
   static Line_spacer *constructor();
@@ -90,7 +86,8 @@ public:
   virtual ~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);
+  virtual void add_columns (Link_array<Paper_column>);
+  void add_column (Paper_column *, bool,  Real);  
 
   virtual Vector default_solution() const;
   virtual bool check_constraints (Vector v) const;