(My_lily_lexer): copy scopes so temporary

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

diff --git a/lily/include/simple-spacer.hh b/lily/include/simple-spacer.hh
index 2cb444deafd4ff657baa684e5741fcfe1bc0d4ae..48e8dd2e34b87f1caa6e35bbe8b94ef9251a3dd0 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--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -18,14 +18,14 @@ struct Spring_description
 {
   Real ideal_;
   Real hooke_;
-  bool active_b_;
+  bool is_active_;
 
   Real block_force_;
 
   Real length (Real force) const;
   Spring_description ();
 
-  bool sane_b () const;
+  bool is_sane () const;
 };
 
 struct Simple_spacer
@@ -42,7 +42,7 @@ struct Simple_spacer
   
   Simple_spacer ();
   
-  void solve (Column_x_positions *, bool) const;
+  void solve (Column_x_positions *, bool);
   void add_columns (Link_array<Grob>const &);
   void my_solve_linelen ();
   void my_solve_natural_len ();
@@ -50,10 +50,10 @@ struct Simple_spacer
   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 */