X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-symbol-referencer.cc;h=2939e0c0614fdb035fe5a62409c4708f7bbf03ee;hb=7b3a9b122d7ef1eb70fdabaac466b7b0c23a1df2;hp=d623bd35b35412f93893a5c7c24497181bf54714;hpb=6dd9d054f7b528a729c74077b4cf36e644afbeb4;p=lilypond.git

diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc
index d623bd35b3..2939e0c061 100644
--- a/lily/staff-symbol-referencer.cc
+++ b/lily/staff-symbol-referencer.cc
@@ -1,9 +1,20 @@
 /*
-  staff-symbol-referencer.cc -- implement Staff_symbol_referencer
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1999--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1999--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "staff-symbol-referencer.hh"
@@ -20,22 +31,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
@@ -81,9 +81,9 @@ Staff_symbol_referencer::get_position (Grob *me)
   if (st && c)
     {
       Real y = me->relative_coordinate (c, Y_AXIS)
-	- st->relative_coordinate (c, Y_AXIS);
-
-      p += 2.0 * y / Staff_symbol::staff_space (st);
+	       - st->relative_coordinate (c, Y_AXIS);
+      Real space = Staff_symbol::staff_space (st);
+      p = (space == 0) ? 0 : 2.0 * y / space;
       return p;
     }
   else if (!st)
@@ -108,8 +108,6 @@ Staff_symbol_referencer::extent_in_staff (Grob *me)
   return retval;
 }
 
-
-
 int
 Staff_symbol_referencer::get_rounded_position (Grob *me)
 {
@@ -155,7 +153,6 @@ Staff_symbol_referencer::set_position (Grob *me, Real p)
       oldpos = get_position (me);
     }
 
-  
   Real ss = Staff_symbol_referencer::staff_space (me);
   me->translate_axis ((p  - oldpos) * ss * 0.5, Y_AXIS);
 }