Fix [a8 a32].

[lilypond.git] / lily / staff-symbol-referencer.cc

diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc
index 7e1b0838834bd0cf95c5f71953442b43ea552a89..fd7bcd2791d870ed90639298ca32bf4fec188a01 100644 (file)
--- a/lily/staff-symbol-referencer.cc
+++ b/lily/staff-symbol-referencer.cc
@@ -22,14 +22,14 @@ Staff_symbol_referencer::has_interface (Grob*e)
 int
 Staff_symbol_referencer::line_count (Grob*me) 
 {
-  Grob *st = staff_symbol_l (me);
+  Grob *st = get_staff_symbol (me);
   return st  ?  Staff_symbol::line_count (st) : 0;
 }
 
 bool
 Staff_symbol_referencer::on_staffline (Grob*me)
 {
-  return on_staffline (me, (int) rint (position_f (me)));
+  return on_staffline (me, (int) rint (get_position (me)));
 }
 
 bool
@@ -40,7 +40,7 @@ Staff_symbol_referencer::on_staffline (Grob*me, int pos)
 }
 
 Grob*
-Staff_symbol_referencer::staff_symbol_l (Grob*me) 
+Staff_symbol_referencer::get_staff_symbol (Grob*me) 
 {
   SCM st = me->get_grob_property ("staff-symbol");
   return unsmob_grob (st);
@@ -49,20 +49,18 @@ Staff_symbol_referencer::staff_symbol_l (Grob*me)
 Real
 Staff_symbol_referencer::staff_space (Grob*me) 
 {
-  Grob * st = staff_symbol_l (me);
+  Grob * st = get_staff_symbol (me);
   if (st)
     return Staff_symbol::staff_space (st);
 
-  
   return 1.0;
 }
 
-
 Real
-Staff_symbol_referencer::position_f (Grob*me) 
+Staff_symbol_referencer::get_position (Grob*me) 
 {
   Real p =0.0;
-  Grob * st = staff_symbol_l (me);
+  Grob * st = get_staff_symbol (me);
   Grob * c = st ? me->common_refpoint (st, Y_AXIS) : 0;
   if (st && c)
     {
@@ -123,10 +121,10 @@ Staff_symbol_referencer::callback (SCM element_smob, SCM)
 void
 Staff_symbol_referencer::set_position (Grob*me,Real p)
 {
-  Grob * st = staff_symbol_l (me);
+  Grob * st = get_staff_symbol (me);
   if (st && me->common_refpoint (st, Y_AXIS))
     {
-      Real oldpos = position_f (me);
+      Real oldpos = get_position (me);
       me->set_grob_property ("staff-position", gh_double2scm (p - oldpos));
     }
   else
@@ -155,14 +153,14 @@ Staff_symbol_referencer::staff_radius (Grob*me)
 int
 compare_position (Grob *const  &a, Grob * const &b)
 {
-  return sign (Staff_symbol_referencer::position_f ((Grob*)a) - 
-    Staff_symbol_referencer::position_f ((Grob*)b));
+  return sign (Staff_symbol_referencer::get_position ((Grob*)a) - 
+    Staff_symbol_referencer::get_position ((Grob*)b));
 }
 
 
 
 
-
+#define has_interface ugly_hack
 ADD_INTERFACE (Staff_symbol_referencer,"staff-symbol-referencer-interface",
   "Object whose Y position is meaning with reference to a staff
 symbol. Objects that have this interface should include