* lily/rest.cc (polyphonic_offset_callback): new function. Do

[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 f8cb92d079603fd061566456e72122b488d667b5..6fd40ad5faf6edacdd3236f708bfbe04c698fb22 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--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #ifndef COLUMN_X_POSITIONS_HH
@@ -14,11 +14,13 @@
 struct Column_x_positions
 {
   Link_array<Grob> cols_;
+  Link_array<Grob> loose_cols_;
+  
   Array<Real> config_;
-  Real force_f_;
-  bool satisfies_constraints_b_;
+  Real force_;
+  bool satisfies_constraints_;
 
-  Column_x_positions();
+  Column_x_positions ();
 };