X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-symbol-referencer.cc;h=ea7d70f799ffa500948b58a0e86a5e72e9395717;hb=eb72c0f066957c3e71d336db0f72814e34d3964d;hp=1e4238fef12137da70b744cf21ccb93c839e1c72;hpb=b782f68f927fa02b3ea895dd1bd801082e5bda6e;p=lilypond.git

diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc
index 1e4238fef1..ea7d70f799 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--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "staff-symbol-referencer.hh"
 
-#include <math.h>
 
 #include "staff-symbol.hh"
 #include "output-def.hh"
@@ -17,8 +16,8 @@
 int
 Staff_symbol_referencer::line_count (Grob *me)
 {
- Grob *st = get_staff_symbol (me);
- return st ? Staff_symbol::line_count (st) : 0;
+  Grob *st = get_staff_symbol (me);
+  return st ? Staff_symbol::line_count (st) : 0;
 }
 
 bool
@@ -30,7 +29,7 @@ Staff_symbol_referencer::on_staffline (Grob *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)
 {
@@ -38,13 +37,13 @@ Staff_symbol_referencer::on_staffline (Grob *me, int pos)
   return ((pos + sz) % 2) == 0;
 }
 
-Grob*
+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);
 }
 
@@ -81,20 +80,18 @@ 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);
 }
 
 int
-Staff_symbol_referencer::get_rounded_position (Grob*me)
+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),
+	   1, 0, 0, (SCM sg),
 	   "Return the Y-position of @var{sg} relative to the staff.")
 {
   Grob *g = unsmob_grob (sg);
@@ -103,14 +100,13 @@ LY_DEFINE (ly_grob_staff_position, "ly:grob-staff-position",
   Real pos = Staff_symbol_referencer::get_position (g);
 
   if (fabs (rint (pos) -pos) < 1e-6) // ugh.
-    return scm_int2num ((int) my_round (pos));
+    return scm_from_int ((int) my_round (pos));
   else
-    return scm_make_real (pos);
+    return scm_from_double (pos);
 }
 
-
 /* should use offset callback!  */
-MAKE_SCHEME_CALLBACK (Staff_symbol_referencer,callback,2);
+MAKE_SCHEME_CALLBACK (Staff_symbol_referencer, callback, 2);
 SCM
 Staff_symbol_referencer::callback (SCM element_smob, SCM)
 {
@@ -122,10 +118,10 @@ 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));
+      me->set_property ("staff-position", scm_from_int (0));
     }
 
-  return scm_make_real (off);
+  return scm_from_double (off);
 }
 
 /*  This sets the position relative to the center of the staff symbol.
@@ -147,10 +143,10 @@ Staff_symbol_referencer::set_position (Grob *me, Real p)
   if (st && me->common_refpoint (st, Y_AXIS))
     {
       Real oldpos = get_position (me);
-      me->set_property ("staff-position", scm_make_real (p - oldpos));
+      me->set_property ("staff-position", scm_from_double (p - oldpos));
     }
   else
-    me->set_property ("staff-position", scm_make_real (p));
+    me->set_property ("staff-position", scm_from_double (p));
 
   me->add_offset_callback (Staff_symbol_referencer::callback_proc, Y_AXIS);
 }
@@ -165,15 +161,14 @@ Staff_symbol_referencer::staff_radius (Grob *me)
 int
 compare_position (Grob *const &a, Grob *const &b)
 {
-  return sign (Staff_symbol_referencer::get_position ((Grob*)a)
-	       - Staff_symbol_referencer::get_position ((Grob*) b));
+  return sign (Staff_symbol_referencer::get_position ((Grob *)a)
+	       - Staff_symbol_referencer::get_position ((Grob *) b));
 }
 
-ADD_INTERFACE (Staff_symbol_referencer,"staff-symbol-referencer-interface",
+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}. "
-	       ,
+	       "in their @code{Y-offset-callbacks}. ",
 	       "staff-position");