+2002-10-22 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+
+ * lily/tie.cc (get_control_points): also avoid staff lines on the
+ just outside the outer staff lines
+
2002-10-21 Jan Nieuwenhuizen <janneke@gnu.org>
* ly/params-init.ly: Just define style-alist, no need to
dnl aclocal.m4 -*-shell-script-*-
dnl WARNING WARNING WARNING
-dnl do not edit! this is aclocal.m4, generated from /home/fred/lily/stepmake/aclocal.m4
+dnl do not edit! this is aclocal.m4, generated from /home/hanwen/usr/src/lilypond/stepmake/aclocal.m4
dnl aclocal.m4 -*-shell-script-*-
dnl StepMake subroutines for configure.in
#include "staff-symbol.hh"
#include "paper-def.hh"
-bool
-Staff_symbol_referencer::has_interface (Grob*e)
-{
- return unsmob_grob (e->get_grob_property ("staff-symbol"))
- || gh_number_p (e->get_grob_property ("staff-position"));
-}
+
int
Staff_symbol_referencer::line_count (Grob*me)
}
/*
- half of the height, in staff space.
- */
+ Half of the height, in staff space, i.e. 2.0 for a normal staff.
+*/
Real
Staff_symbol_referencer::staff_radius (Grob*me)
{
- return (line_count (me) -1) / 2;
+ return (line_count (me) -1) / 2.0;
}
Staff_symbol_referencer::get_position ((Grob*)b));
}
-
-
-
-#define has_interface ugly_hack
ADD_INTERFACE (Staff_symbol_referencer,"staff-symbol-referencer-interface",
- "Object whose Y position is meaning with reference to a staff
-symbol. Objects that have this interface should include
-Staff_symbol_referencer::callback in their Y-offset-callback.
-",
+ "Object whose Y position is meaning with reference to a staff "
+"symbol. Objects that have this interface should include "
+"Staff_symbol_referencer::callback in their Y-offset-callback. "
+,
"staff-position");
Real clear = staff_space * gh_scm2double (me->get_grob_property ("staffline-clearance"));
- if (fabs (y) <= Staff_symbol_referencer::staff_radius (me)
+ if (fabs (y) <=
+ Staff_symbol_referencer::staff_radius (me) * staff_space + clear
&& fabs (diff) < clear)
{
Real y1 = ry + clear;