Look at stem extents iso. head extents in 2nd loop for accidental

placement. Fixes #20.
(cherry picked from c16791d9bf61125932e672ff6e99698508b78785 commit)

diff --git a/input/regression/accidental-collision.ly b/input/regression/accidental-collision.ly
new file mode 100644 (file)
index 0000000..eeb03d5
--- /dev/null
+++ b/input/regression/accidental-collision.ly
@@ -0,0 +1,10 @@
+\header {
+  texidoc = "accidentals avoid stems of other notes too."
+  }
+
+\version "2.10.1"
+
+\paper {
+  ragged-right  = ##t
+  }
+\new Staff \relative <<bes' \\ a'>>

diff --git a/lily/accidental-placement.cc b/lily/accidental-placement.cc
index 02f0c522a2367ceb9c71b23a2dad9f0b8d0f482b..2aea5056799c62367e618f1ec3c57d321ad2b56c 100644 (file)
--- a/lily/accidental-placement.cc
+++ b/lily/accidental-placement.cc
@@ -364,8 +364,8 @@ Accidental_placement::calc_positioning_done (SCM smob)
     {
       int very_large = INT_MAX;
       
-      Box b (heads[i]->extent (common[X_AXIS], X_AXIS),
-            heads[i]->pure_height (common[Y_AXIS], 0, very_large));
+      Box b (stems[i]->extent (common[X_AXIS], X_AXIS),
+            stems[i]->pure_height (common[Y_AXIS], 0, very_large));
 
       insert_extent_into_skyline (&head_skyline, b, Y_AXIS, LEFT);
     }