release: 0.1.53

[lilypond.git] / lily / staff-side.cc

diff --git a/lily/staff-side.cc b/lily/staff-side.cc
index 980990cf65fa9d2f3b831f7ba1361be732cb8816..35af4fff2d3fa456dc8f0548467bffa71e9292d1 100644 (file)
--- a/lily/staff-side.cc
+++ b/lily/staff-side.cc
@@ -54,11 +54,11 @@ Staff_side::add_support (Score_elem*i)
 }
 
 Real
-Staff_side::get_position_f() const
+Staff_side::get_position_f () const
 {
   if (!dir_)
     {
-      warning (_("Staff_side::get_position_i(): "
+      warning (_("Staff_side::get_position_f(): "
                 "somebody forgot to set my vertical direction, returning -20"));
       return -20;
     }
@@ -68,7 +68,12 @@ Staff_side::get_position_f() const
   Real inter_f = paper()-> internote_f ();
 
   Interval v= support_height();
-  y = v[dir_]  + 2*dir_*inter_f;       // ugh
+  if (inside_staff_b_)
+    // ugh: i don't know why, but this is needed for inside-staff
+    y = v[dir_] + 2 * dir_ * inter_f;  // ugh
+  else
+    // get accents just above staff; (fermata etc.: ugh)
+    y = v[dir_] - 3 * dir_ * inter_f;
 
   return y;
 }