release: 0.1.11

[lilypond.git] / lily / bow.cc

diff --git a/lily/bow.cc b/lily/bow.cc
index 1ef733c61a7705f2827b62702a0ec24f66bb5741..1bd0a0076208bc0c2fd95f268321c85e329ecf54 100644 (file)
--- a/lily/bow.cc
+++ b/lily/bow.cc
@@ -13,15 +13,15 @@
 
 Bow::Bow()
 {
-  left_pos_i_ = right_pos_i_ = 0;
-  left_dx_f_ = right_dx_f_ = 0.0;
+  pos_i_drul_[LEFT] = pos_i_drul_[RIGHT] = 0;
+  dx_f_drul_[LEFT] = dx_f_drul_[RIGHT] = 0.0;
 }
 
 
 Offset
 Bow::center() const
 {
-  int dy =  right_pos_i_-left_pos_i_;
+  int dy =  pos_i_drul_[RIGHT]-pos_i_drul_[LEFT];
 
   Real w = width().length ();
 
@@ -35,22 +35,22 @@ Bow::brew_molecule_p() const
   Molecule*output = new Molecule;
   Real w = width().length ();
   
-  int dy = right_pos_i_ - left_pos_i_;
+  int dy = pos_i_drul_[RIGHT] - pos_i_drul_[LEFT];
   
   Real nw_f = paper()->note_width ();
   Real nh_f = paper()->internote_f ();
 
   
-  w+= (right_dx_f_ - left_dx_f_) * nw_f ;
+  w+= (dx_f_drul_[RIGHT] - dx_f_drul_[LEFT]) * nw_f ;
   Real round_w = w;            // slur lookup rounds the slurwidth .
   
-  Symbol sl = paper()->lookup_l ()->slur (dy , round_w, dir_i_);
+  Symbol sl = paper()->lookup_l ()->slur (dy , round_w, dir_);
 
   Real error = w-round_w;
   
   Atom a (sl);
-  a.translate (Offset ((left_dx_f_ + 0.5)*nw_f + error/2,
-                      left_pos_i_ * nh_f));
+  a.translate (Offset ((dx_f_drul_[LEFT] + 0.5)*nw_f + error/2,
+                      pos_i_drul_[LEFT] * nh_f));
   output->add (a);
   return output;
 }