* Another grand 2003 update.

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

diff --git a/lily/include/simple-spacer.hh b/lily/include/simple-spacer.hh
index 58bd34cf7cfd1478a9ba9dcb90bb1339fb0da5a5..2cb444deafd4ff657baa684e5741fcfe1bc0d4ae 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--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1999--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -16,11 +16,11 @@
 
 struct Spring_description
 {
-  Real ideal_f_;
-  Real hooke_f_;
+  Real ideal_;
+  Real hooke_;
   bool active_b_;
 
-  Real block_force_f_;
+  Real block_force_;
 
   Real length (Real force) const;
   Spring_description ();
@@ -33,17 +33,17 @@ struct Simple_spacer
   Array<Spring_description> springs_;
   Link_array<Grob> spaced_cols_;
   Link_array<Grob> loose_cols_;
-  Real force_f_;
-  Real indent_f_;
-  Real line_len_f_;
-  Real default_space_f_;
+  Real force_;
+  Real indent_;
+  Real line_len_;
+  Real default_space_;
   int active_count_;
   bool compression_penalty_b_;
   
   Simple_spacer ();
   
-  void solve (Column_x_positions *) const;
-  void add_columns (Link_array<Grob>);
+  void solve (Column_x_positions *, bool) const;
+  void add_columns (Link_array<Grob>const &);
   void my_solve_linelen ();
   void my_solve_natural_len ();
   Real active_springs_stiffness () const;