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"
}
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)
{
Grob *st = get_staff_symbol (me);
if (st)
return Staff_symbol::get_line_thickness (st);
- return me->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);
-}
-
MAKE_SCHEME_CALLBACK (Staff_symbol_referencer, callback, 1);
SCM
Staff_symbol_referencer::callback (SCM smob)