X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=inline;f=lily%2Fstaff-symbol-referencer.cc;h=53637c86e5f1bd8fadc39ece6ee3dec4fdbc0f87;hb=e3bd073b603167e110d3ecac4bfa3e1ca75e0106;hp=d4780bedb608264a7cc51c92a6324e389ce10302;hpb=8f8b3fb62d5d0776335de899b32aada69457810a;p=lilypond.git

diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc
index d4780bedb6..53637c86e5 100644
--- a/lily/staff-symbol-referencer.cc
+++ b/lily/staff-symbol-referencer.cc
@@ -3,13 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "staff-symbol-referencer.hh"
 
-
 #include "staff-symbol.hh"
+#include "grob.hh"
 #include "output-def.hh"
 #include "libc-extension.hh"
 
@@ -21,22 +21,30 @@ Staff_symbol_referencer::line_count (Grob *me)
 }
 
 bool
-Staff_symbol_referencer::on_staffline (Grob *me)
+Staff_symbol_referencer::on_line (Grob *me)
 {
-  return on_staffline (me, (int) rint (get_position (me)));
+  return on_line (me, (int) rint (get_position (me)));
 }
 
-/*
-  This does not take size into account.
-  maybe rename: on_virtual_staffline, on_staff_or_ledger_line?
-*/
 bool
-Staff_symbol_referencer::on_staffline (Grob *me, int pos)
+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;
 }
 
+bool
+Staff_symbol_referencer::on_staff_line (Grob *me, int pos)
+{
+  return on_line (me, pos) && abs (pos) <= 2 * staff_radius (me);
+}
+
 Grob *
 Staff_symbol_referencer::get_staff_symbol (Grob *me)
 {
@@ -62,7 +70,7 @@ Staff_symbol_referencer::line_thickness (Grob *me)
   Grob *st = get_staff_symbol (me);
   if (st)
     return Staff_symbol::get_line_thickness (st);
-  return me->layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+  return me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
 }
 
 Real
@@ -84,25 +92,29 @@ Staff_symbol_referencer::get_position (Grob *me)
   return robust_scm2double (me->get_property ("staff-position"), p);
 }
 
-int
-Staff_symbol_referencer::get_rounded_position (Grob *me)
+
+Interval
+Staff_symbol_referencer::extent_in_staff (Grob *me)
 {
-  return int (rint (get_position (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;
 }
 
-LY_DEFINE (ly_grob_staff_position, "ly:grob-staff-position",
-	   1, 0, 0, (SCM sg),
-	   "Return the Y-position of @var{sg} relative to the staff.")
-{
-  Grob *g = unsmob_grob (sg);
 
-  SCM_ASSERT_TYPE (g, sg, SCM_ARG1, __FUNCTION__, "grob");
-  Real pos = Staff_symbol_referencer::get_position (g);
 
-  if (fabs (rint (pos) -pos) < 1e-6) // ugh.
-    return scm_from_int ((int) my_round (pos));
-  else
-    return scm_from_double (pos);
+int
+Staff_symbol_referencer::get_rounded_position (Grob *me)
+{
+  return int (rint (get_position (me)));
 }
 
 MAKE_SCHEME_CALLBACK (Staff_symbol_referencer, callback, 1);
@@ -117,7 +129,6 @@ Staff_symbol_referencer::callback (SCM smob)
     {
       Real space = Staff_symbol_referencer::staff_space (me);
       off = scm_to_double (pos) * space / 2.0;
-      me->set_property ("staff-position", scm_from_int (0));
     }
 
   return scm_from_double (off);
@@ -164,7 +175,14 @@ compare_position (Grob *const &a, Grob *const &b)
 	       - Staff_symbol_referencer::get_position ((Grob *) b));
 }
 
-ADD_INTERFACE (Staff_symbol_referencer, "staff-symbol-referencer-interface",
+bool
+position_less (Grob *const &a, Grob *const &b)
+{
+  return Staff_symbol_referencer::get_position (a)
+    < Staff_symbol_referencer::get_position (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} "
@@ -173,3 +191,4 @@ ADD_INTERFACE (Staff_symbol_referencer, "staff-symbol-referencer-interface",
 	       /* properties */
 	       "staff-position");
 
+