source file of the GNU LilyPond music typesetter
- (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "staff-symbol-referencer.hh"
-#include <math.h>
#include "staff-symbol.hh"
#include "output-def.hh"
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);
}
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 ("linethickness"));
}
Real
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);
}
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, 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;
{
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.
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. */
"symbol. "
"These usually have @code{Staff_symbol_referencer::callback} "
"in their @code{Y-offset-callbacks}. ",
+
+ /* properties */
"staff-position");