* lily/lily-guile.cc (robust_scm2double): new function. Use throughout.

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