Run `make grand-replace'.

[lilypond.git] / lily / include / column-x-positions.hh

diff --git a/lily/include/column-x-positions.hh b/lily/include/column-x-positions.hh
index 254ae882a7ce4b209d3997398633f2ebbfbdb531..9a254a66f293d63d738a355da96c136251c35cce 100644 (file)
--- a/lily/include/column-x-positions.hh
+++ b/lily/include/column-x-positions.hh
@@ -1,38 +1,26 @@
 /*
   column-x-positions.hh -- part of GNU LilyPond
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef COLUMN_X_POSITIONS_HH
 #define COLUMN_X_POSITIONS_HH
 
-#include "parray.hh"
+#include "std-vector.hh"
 #include "lily-proto.hh"
 
-typedef Link_array<Paper_column>  Line_of_cols;
-
-struct Column_x_positions {
-  Line_spacer * spacer_l_;
-  Line_of_cols cols_;
-  Array<Real> config_;
-  
-  Real energy_f_;
-  bool satisfies_constraints_b_;
-
-  void OK() const;
-  ~Column_x_positions();
-  void solve_line();
-  void approximate_solve_line();
-  /** generate a solution with no regard to idealspacings or
-    constraints.  should always work */
-  void stupid_solution();
-  void set_stupid_solution (Vector);
-  Column_x_positions();
-  void add_paper_column (Paper_column*c);
-  void print() const;
-};
+struct Column_x_positions
+{
+  vector<Grob*> cols_;
+  vector<Grob*> loose_cols_;
+
+  vector<Real> config_;
+  Real force_;
+  bool satisfies_constraints_;
 
+  Column_x_positions ();
+};
 
 #endif // COLUMN_X_POSITIONS_HH