X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-symbol-referencer.cc;h=aa45e55e7a4baf8c2b6bc0936fff409b98b3236b;hb=621e5fb6a5c3cb67c46082e561cffad691ead30c;hp=3bc52e10d6810cc7a52c689217b5120573d82440;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git

diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc
index 3bc52e10d6..aa45e55e7a 100644
--- a/lily/staff-symbol-referencer.cc
+++ b/lily/staff-symbol-referencer.cc
@@ -3,12 +3,11 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "staff-symbol-referencer.hh"
 
-#include <math.h>
 
 #include "staff-symbol.hh"
 #include "output-def.hh"
@@ -22,29 +21,37 @@ 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)));
+}
+
+bool
+Staff_symbol_referencer::on_staff_line (Grob *me)
+{
+  return on_staff_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_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)
 {
   if (Staff_symbol::has_interface (me))
     return me;
 
-  SCM st = me->get_property ("staff-symbol");
+  SCM st = me->get_object ("staff-symbol");
   return unsmob_grob (st);
 }
 
@@ -63,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->get_layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+  return me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
 }
 
 Real
@@ -81,9 +88,7 @@ Staff_symbol_referencer::get_position (Grob *me)
       return p;
     }
   else if (!st)
-    {
-      return me->relative_coordinate (me->get_parent (Y_AXIS), Y_AXIS) * 2;
-    }
+    return me->relative_coordinate (me->get_parent (Y_AXIS), Y_AXIS) * 2;
   return robust_scm2double (me->get_property ("staff-position"), p);
 }
 
@@ -93,27 +98,11 @@ Staff_symbol_referencer::get_rounded_position (Grob *me)
   return int (rint (get_position (me)));
 }
 
-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_int2num ((int) my_round (pos));
-  else
-    return scm_make_real (pos);
-}
-
-/* should use offset callback!  */
-MAKE_SCHEME_CALLBACK (Staff_symbol_referencer, callback, 2);
+MAKE_SCHEME_CALLBACK (Staff_symbol_referencer, callback, 1);
 SCM
-Staff_symbol_referencer::callback (SCM element_smob, SCM)
+Staff_symbol_referencer::callback (SCM smob)
 {
-  Grob *me = unsmob_grob (element_smob);
+  Grob *me = unsmob_grob (smob);
 
   SCM pos = me->get_property ("staff-position");
   Real off = 0.0;
@@ -121,10 +110,9 @@ Staff_symbol_referencer::callback (SCM element_smob, SCM)
     {
       Real space = Staff_symbol_referencer::staff_space (me);
       off = scm_to_double (pos) * space / 2.0;
-      me->set_property ("staff-position", scm_int2num (0));
     }
 
-  return scm_make_real (off);
+  return scm_from_double (off);
 }
 
 /*  This sets the position relative to the center of the staff symbol.
@@ -143,15 +131,15 @@ void
 Staff_symbol_referencer::set_position (Grob *me, Real p)
 {
   Grob *st = get_staff_symbol (me);
+  Real oldpos = 0.0;
   if (st && me->common_refpoint (st, Y_AXIS))
     {
-      Real oldpos = get_position (me);
-      me->set_property ("staff-position", scm_make_real (p - oldpos));
+      oldpos = get_position (me);
     }
-  else
-    me->set_property ("staff-position", scm_make_real (p));
 
-  me->add_offset_callback (Staff_symbol_referencer::callback_proc, Y_AXIS);
+  
+  Real ss = Staff_symbol_referencer::staff_space (me);
+  me->translate_axis ((p  - oldpos) * ss * 0.5, Y_AXIS);
 }
 
 /* Half of the height, in staff space, i.e. 2.0 for a normal staff. */
@@ -168,10 +156,19 @@ compare_position (Grob *const &a, Grob *const &b)
 	       - Staff_symbol_referencer::get_position ((Grob *) b));
 }
 
+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, "staff-symbol-referencer-interface",
 	       "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}. ",
+
+	       /* properties */
 	       "staff-position");