release: 0.1.39

[lilypond.git] / lily / bow.cc

diff --git a/lily/bow.cc b/lily/bow.cc
index 918d4c503a6c44b44768b75ee26bfa985186cdc4..1f75bba5dea4cb432b934f0bbd15b4ede98a053b 100644 (file)
--- a/lily/bow.cc
+++ b/lily/bow.cc
@@ -13,7 +13,7 @@
 
 Bow::Bow()
 {
-  pos_i_drul_[LEFT] = pos_i_drul_[RIGHT] = 0;
+  dy_f_drul_[LEFT] = dy_f_drul_[RIGHT] = 0;
   dx_f_drul_[LEFT] = dx_f_drul_[RIGHT] = 0.0;
 }
 
@@ -21,11 +21,11 @@ Bow::Bow()
 Offset
 Bow::center() const
 {
-  int dy =  pos_i_drul_[RIGHT]-pos_i_drul_[LEFT];
+  Real dy =  dy_f_drul_[RIGHT]-dy_f_drul_[LEFT];
 
   Real w = width().length ();
 
-  return Offset (w/2,dy * paper()->internote_f ());
+  return Offset (w/2,dy );
 }
 
 
@@ -35,19 +35,20 @@ Bow::brew_molecule_p() const
   Molecule*output = new Molecule;
   Real w = width().length ();
   
-  int dy = pos_i_drul_[RIGHT] - pos_i_drul_[LEFT];
+  Real dy_f = dy_f_drul_[RIGHT] - dy_f_drul_[LEFT];
   
   Real nw_f = paper()->note_width ();
   Real nh_f = paper()->internote_f ();
   
-  w+= (dx_f_drul_[RIGHT] - dx_f_drul_[LEFT]) * nw_f ;
+  w+= (dx_f_drul_[RIGHT] - dx_f_drul_[LEFT]);
   Real round_w = w;            // slur lookup rounds the slurwidth .
   
-  Atom a = paper()->lookup_l ()->slur (dy , round_w, dir_);
+  Atom a = paper()->lookup_l ()->slur (dy_f, round_w, dir_);
 
   Real error = w-round_w;
-    a.translate (Offset ((dx_f_drul_[LEFT] + 0.5)*nw_f + error/2,
-                      pos_i_drul_[LEFT] * nh_f));
+  a.translate (Offset ((dx_f_drul_[LEFT] + 0.5*nw_f)
+                      + error/2,
+                      dy_f_drul_[LEFT]));
   output->add (a);
   return output;
 }