2003 -> 2004

[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 2807eca851a84d790f75afd09704d63d54398cea..e5ae4f92bd67589d3dbf98a45f14806b062cc40d 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--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #ifndef COLUMN_X_POSITIONS_HH
@@ -10,26 +10,17 @@
 #include "parray.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_;
+struct Column_x_positions
+{
+  Link_array<Grob> cols_;
+  Link_array<Grob> loose_cols_;
   
-  Real energy_f_;
+  Array<Real> config_;
+  Real force_;
   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();
-  Column_x_positions();
-  void add_paper_column (Paper_column*c);
-  void print() const;
+  Column_x_positions ();
 };