X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-symbol-referencer.cc;h=17bd099fc64e97f415ed865894ec2d1cb1d09aa4;hb=246e67551cd6e02f862a673347b1f2ca9a699df4;hp=e8ef99f9dd3e180d4e386e2c490fd62f72f465bc;hpb=41e45dd730c075e78065dfa78e5e54be664d905e;p=lilypond.git

diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc
index e8ef99f9dd..17bd099fc6 100644
--- a/lily/staff-symbol-referencer.cc
+++ b/lily/staff-symbol-referencer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "staff-symbol-referencer.hh"
@@ -20,23 +20,11 @@ Staff_symbol_referencer::line_count (Grob *me)
   return st ? Staff_symbol::line_count (st) : 0;
 }
 
-bool
-Staff_symbol_referencer::on_line (Grob *me)
-{
-  return on_line (me, (int) rint (get_position (me)));
-}
-
-bool
-Staff_symbol_referencer::on_staff_line (Grob *me)
-{
-  return on_staff_line (me, (int) rint (get_position (me)));
-}
-
 bool
 Staff_symbol_referencer::on_line (Grob *me, int pos)
 {
-  int sz = line_count (me) - 1;
-  return ((pos + sz) % 2) == 0;
+  Grob *st = get_staff_symbol (me);
+  return st ? Staff_symbol::on_line (st, pos) : false;
 }
 
 bool
@@ -109,8 +97,6 @@ Staff_symbol_referencer::extent_in_staff (Grob *me)
   return retval;
 }
 
-
-
 int
 Staff_symbol_referencer::get_rounded_position (Grob *me)
 {