release: 0.1.11

[lilypond.git] / lily / crescendo.cc

diff --git a/lily/crescendo.cc b/lily/crescendo.cc
index d5c16cb442e5e607fbdbe9d2b0ac81e99429b5ee..3fe1a4114c00c78e77e375ca0195bf2d3c02ba55 100644 (file)
--- a/lily/crescendo.cc
+++ b/lily/crescendo.cc
@@ -15,14 +15,14 @@
 
 Crescendo::Crescendo()
 {
-  grow_dir_i_ =0;
-  dir_i_ = -1 ;
-  left_dyn_b_ = right_dyn_b_ =false;
+  grow_dir_ =0;
+  dir_ = DOWN ;
+  dyn_b_drul_[LEFT] = dyn_b_drul_[RIGHT] =false;
   inside_staff_b_ = false;
 }
 
 Interval
-Crescendo::symbol_height()const
+Crescendo::symbol_height() const
 {
   return get_symbol().dim[Y_AXIS];
 }
@@ -30,25 +30,25 @@ Crescendo::symbol_height()const
 static Real absdyn_dim = 10 PT;        // ugh
 
 Symbol
-Crescendo::get_symbol()const
+Crescendo::get_symbol() const
 {    
   Real w_dim = width().length ();
-  if ( left_dyn_b_) 
+  if (dyn_b_drul_[LEFT]) 
     {
-       w_dim -= absdyn_dim;
+      w_dim -= absdyn_dim;
     }
-  if ( right_dyn_b_) 
+  if (dyn_b_drul_[RIGHT]) 
     {
-       w_dim -= absdyn_dim;
+      w_dim -= absdyn_dim;
     }
   
   if (w_dim < 0) 
     {
-       warning ("Crescendo too small");
-       w_dim = 0;
+      warning ("Crescendo too small");
+      w_dim = 0;
     }
 
-  return Symbol (paper()->lookup_l ()->hairpin (w_dim, grow_dir_i_ < 0));
+  return Symbol (paper()->lookup_l ()->hairpin (w_dim, grow_dir_ < 0));
 }
 
 Molecule*
@@ -56,8 +56,8 @@ Crescendo::brew_molecule_p() const
 {
   Molecule* m_p =0;
   Real x_off_dim=0.0;
-  if ( left_dyn_b_)
-       x_off_dim += absdyn_dim;
+  if (dyn_b_drul_[LEFT])
+    x_off_dim += absdyn_dim;
   
   m_p = new Molecule;
   Symbol s (get_symbol());