X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-symbol-referencer.cc;h=17bd099fc64e97f415ed865894ec2d1cb1d09aa4;hb=3b04fe9079b5a455196144cd6d9362a44f73e97e;hp=d623bd35b35412f93893a5c7c24497181bf54714;hpb=c274a01d8e83ad465be8933bacb8beebba54a2fc;p=lilypond.git diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc index d623bd35b3..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 + (c) 1999--2009 Han-Wen Nienhuys */ #include "staff-symbol-referencer.hh" @@ -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 @@ -108,8 +97,6 @@ Staff_symbol_referencer::extent_in_staff (Grob *me) return retval; } - - int Staff_symbol_referencer::get_rounded_position (Grob *me) {