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 "grob.hh"
#include "output-def.hh"
#include "libc-extension.hh"
}
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)
{
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
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_from_int ((int) my_round (pos));
- else
- 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_from_int (0));
}
return scm_from_double (off);
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_from_double (p - oldpos));
+ oldpos = get_position (me);
}
- else
- me->set_property ("staff-position", scm_from_double (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. */
- 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} "
"in their @code{Y-offset-callbacks}. ",
+
+ /* properties */
"staff-position");