* The grand 2005-2006 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 d124535153129c2ac9d94f0d8d050f4b49842967..152b20c627191a0fb79299ff8f69bf987564fac6 100644 (file)
--- a/lily/include/column-x-positions.hh
+++ b/lily/include/column-x-positions.hh
@@ -1,7 +1,7 @@
 /*
   column-x-positions.hh -- part of GNU LilyPond
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef COLUMN_X_POSITIONS_HH
@@ -10,22 +10,17 @@
 #include "parray.hh"
 #include "lily-proto.hh"
 
-typedef Link_array<Paper_column>  Line_of_cols;
+struct Column_x_positions
+{
+  Link_array<Grob> cols_;
+  Link_array<Grob> loose_cols_;
 
-struct Column_x_positions {
-
-  Line_of_cols cols_;
   Array<Real> config_;
-  
-  Real force_f_;
-  Real energy_f_;
-  bool satisfies_constraints_b_;
-
-  ~Column_x_positions();
-  Column_x_positions();
-  void print() const;
-};
+  Real force_;
+  bool satisfies_constraints_;
 
+  Column_x_positions ();
+};
 
 #endif // COLUMN_X_POSITIONS_HH