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

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

diff --git a/lily/include/simple-spacer.hh b/lily/include/simple-spacer.hh
index 58bd34cf7cfd1478a9ba9dcb90bb1339fb0da5a5..6c2a16f5d823d027233cfc9cbff276528d80ecb1 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--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -16,11 +16,11 @@
 
 struct Spring_description
 {
-  Real ideal_f_;
-  Real hooke_f_;
-  bool active_b_;
+  Real ideal_;
+  Real hooke_;
+  bool is_active_;
 
-  Real block_force_f_;
+  Real block_force_;
 
   Real length (Real force) const;
   Spring_description ();
@@ -33,27 +33,27 @@ 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);
+  void add_columns (Link_array<Grob>const &);
   void my_solve_linelen ();
   void my_solve_natural_len ();
   Real active_springs_stiffness () const;
   Real range_stiffness (int, int) const;
   void add_rod (int l, int r, Real dist);
   Real range_ideal_len (int l, int r)const;
-  Real active_blocking_force ()const;
+  Real is_activelocking_force ()const;
   Real configuration_length ()const;
   void set_active_states ();
-  bool active_b () const;
+  bool is_active () const;
 };
 
 #endif /* SIMPLE_SPACER_HH */