release: 1.3.131

[lilypond.git] / lily / staff-symbol-referencer.cc

diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc
index 9b1ae4ad0811e99ace57ff4890d6bd534ce378c6..d569d52abce9f7215cd3eac45c313dc6e0f1a18d 100644 (file)
--- 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--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
  */
 
 #include <math.h>
@@ -11,11 +11,11 @@
 #include "staff-symbol-referencer.hh"
 #include "staff-symbol.hh"
 #include "paper-def.hh"
-
+ 
 bool
 Staff_symbol_referencer::has_interface (Grob*e)
 {
-  return unsmob_element (e->get_grob_property ("staff-symbol"))
+  return unsmob_grob (e->get_grob_property ("staff-symbol"))
     || gh_number_p (e->get_grob_property ("staff-position"));
 }
 
@@ -29,7 +29,7 @@ Staff_symbol_referencer::line_count (Grob*me)
 bool
 Staff_symbol_referencer::on_staffline (Grob*me)
 {
-  return on_staffline (me, (int) position_f (me));
+  return on_staffline (me, (int) rint (position_f (me)));
 }
 
 bool
@@ -43,7 +43,7 @@ Grob*
 Staff_symbol_referencer::staff_symbol_l (Grob*me) 
 {
   SCM st = me->get_grob_property ("staff-symbol");
-  return unsmob_element(st);
+  return unsmob_grob(st);
 }
 
 Real
@@ -90,7 +90,7 @@ MAKE_SCHEME_CALLBACK(Staff_symbol_referencer,callback,2);
 SCM
 Staff_symbol_referencer::callback (SCM element_smob, SCM )
 {
-  Grob *me = unsmob_element (element_smob);
+  Grob *me = unsmob_grob (element_smob);
 
   
   SCM pos = me->get_grob_property ("staff-position");