X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-symbol-referencer.cc;h=17bd099fc64e97f415ed865894ec2d1cb1d09aa4;hb=38d7d319eabc906e82fb42002678c6d42a23b6f7;hp=7fe0bf3131679d75ad7aa456547719430f103c1d;hpb=44ad1d66c072e4d6545e75c769c86a460cb1df13;p=lilypond.git

diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc
index 7fe0bf3131..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--2006 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
@@ -92,6 +80,23 @@ Staff_symbol_referencer::get_position (Grob *me)
   return robust_scm2double (me->get_property ("staff-position"), p);
 }
 
+
+Interval
+Staff_symbol_referencer::extent_in_staff (Grob *me)
+{
+  Grob *st = get_staff_symbol (me);
+  Grob *c = st ? me->common_refpoint (st, Y_AXIS) : 0;
+
+  Interval retval;
+  if (st && c)
+    {
+      retval  = me->extent (c, Y_AXIS)
+	- st->relative_coordinate (c, Y_AXIS);
+    }
+
+  return retval;
+}
+
 int
 Staff_symbol_referencer::get_rounded_position (Grob *me)
 {
@@ -164,11 +169,11 @@ position_less (Grob *const &a, Grob *const &b)
 }
 
 ADD_INTERFACE (Staff_symbol_referencer,
-	       "An object whose Y position is meant relative to a staff "
-	       "symbol. "
-	       "These usually have @code{Staff_symbol_referencer::callback} "
-	       "in their @code{Y-offset-callbacks}. ",
+	       "An object whose Y@tie{}position is meant relative to a staff"
+	       " symbol.  These usually"
+	       " have @code{Staff_symbol_referencer::callback} in their"
+	       " @code{Y-offset-callbacks}.",
 
 	       /* properties */
-	       "staff-position");
-
+	       "staff-position "
+	       );