release: 1.5.29

[lilypond.git] / lily / include / simple-spacer.hh

diff --git a/lily/include/simple-spacer.hh b/lily/include/simple-spacer.hh
index 2f12339490ad6b6060ae6097315513519ea9e9a6..1b963650e07184f4abe07a1814800e24d58808b3 100644 (file)
--- a/lily/include/simple-spacer.hh
+++ b/lily/include/simple-spacer.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -63,21 +63,18 @@ struct Spring_description
 struct Simple_spacer
 {
   Array<Spring_description> springs_;
-  Link_array<Item> spaced_cols_;
-  Link_array<Item> all_cols_; 
-
-  
+  Link_array<Grob> spaced_cols_;
+  Link_array<Grob> loose_cols_;
   Real force_f_;
   Real indent_f_;
   Real line_len_f_;
   Real default_space_f_;
-
+  int active_count_;
 
   Simple_spacer ();
-
-  void do_wide_springs (Column_x_positions*) const;
+  
   void solve (Column_x_positions *) const;
-  void add_columns (Link_array<Item>);
+  void add_columns (Link_array<Grob>);
   void my_solve_linelen ();
   void my_solve_natural_len ();
   Real active_springs_stiffness () const;