Merge branch 'master' of carldsorensen@git.sv.gnu.org:/srv/git/lilypond

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

diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc
index dbff0245c609874af177b329914bafcc8d1056d5..38c39e04fe1851ec00dbc26893937040e065acee 100644 (file)
--- a/lily/staff-symbol-referencer.cc
+++ b/lily/staff-symbol-referencer.cc
@@ -20,22 +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)
 {
-  return Staff_symbol::on_line (me, pos);
+  Grob *st = get_staff_symbol (me);
+  return st ? Staff_symbol::on_line (st, pos) : false;
 }
 
 bool