* Another grand 2003 update.

[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 dd5c323755ea55b0a2bf7c86bbb7ecb34b6ab068..e2703bac0369ead8350c13505d9d3b6f448461ae 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--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #ifndef COLUMN_X_POSITIONS_HH
@@ -13,14 +13,14 @@
 
 struct Column_x_positions
 {
-  Link_array<Paper_column> cols_;
-  Array<Real> config_;
+  Link_array<Grob> cols_;
+  Link_array<Grob> loose_cols_;
   
-  Real force_f_;
-  Real energy_f_;
+  Array<Real> config_;
+  Real force_;
   bool satisfies_constraints_b_;
 
-  Column_x_positions();
+  Column_x_positions ();
 };