X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fside-position-interface.cc;h=6fad89ea54cccf0e5846d69d35e90d6e0ff391c3;hb=0b716515bfd610a04bbe4289f171f3cd80a0fc14;hp=e2d328d5018296a2472515ef7a2f3ec700e323ff;hpb=60b8773f7ab4f8042bb219d1c6d8c5a9a4814afe;p=lilypond.git

diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc
index e2d328d501..6fad89ea54 100644
--- a/lily/side-position-interface.cc
+++ b/lily/side-position-interface.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1998--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1998--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -58,7 +58,6 @@ finish_offset (Grob *me, Direction dir, Real total_off, Real *current_offset)
       && total_off * dir < minimum_space)
     total_off = minimum_space * dir;
 
-
   if (current_offset)
     total_off = dir * max (dir * total_off,
                            dir * (*current_offset));
@@ -350,7 +349,9 @@ Side_position_interface::aligned_side (Grob *me, Axis a, bool pure, int start, i
           Real rounded = directed_round (position, dir);
           Grob *head = me->get_parent (X_AXIS);
 
-          if (fabs (position) <= 2 * Staff_symbol_referencer::staff_radius (me) + 1
+          Interval staff_span = Staff_symbol::line_span (staff);
+          staff_span.widen (1);
+          if (staff_span.contains (position)
               /* In case of a ledger lines, quantize even if we're outside the staff. */
               || (Note_head::has_interface (head)