(get_control_points): also avoid staff lines on the

just outside the outer staff lines

diff --git a/ChangeLog b/ChangeLog
index a2a055115767a95d41fa73f50c443702d5e82354..46bd11fa043681091e1d8d70d5e68527358d39a0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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

diff --git a/aclocal.m4 b/aclocal.m4
index 2dc4f8afe7437fccca9938a6b65cb278dfb7318a..65a10815fc8fc65d6512cc8862cf3fb5ae28a12c 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,6 +1,6 @@
 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
 

diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc
index fd7bcd2791d870ed90639298ca32bf4fec188a01..cbcd007a6ac354a939d87ba88f2ab0014cad16f7 100644 (file)
--- a/lily/staff-symbol-referencer.cc
+++ b/lily/staff-symbol-referencer.cc
@@ -12,12 +12,7 @@
 #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) 
@@ -141,12 +136,12 @@ Staff_symbol_referencer::set_position (Grob*me,Real p)
 }
 
 /*
-  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;
 }
 
 
@@ -157,13 +152,9 @@ compare_position (Grob *const  &a, Grob * const &b)
     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");

diff --git a/lily/tie.cc b/lily/tie.cc
index 65f2f24aac28eb731e888fc83bd288da80384602..b59f8d21b5193960e9b38277e53a73dc7f0f3045 100644 (file)
--- a/lily/tie.cc
+++ b/lily/tie.cc
@@ -249,7 +249,8 @@ Tie::get_control_points (SCM smob)
 
       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;