From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Fri, 1 Dec 2006 15:04:12 +0000 (+0100)
Subject: Look at stem extents iso. head extents in 2nd loop for accidental
X-Git-Tag: release/2.11.1-1~18
X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=4f7fd04a56a7d9bb4f44827bd38842784abed068;p=lilypond.git

Look at stem extents iso. head extents in 2nd loop for accidental
placement. Fixes #20.
---

diff --git a/input/regression/accidental-collision.ly b/input/regression/accidental-collision.ly
new file mode 100644
index 0000000000..eeb03d5981
--- /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 4161e8df3b..db505c694b 100644
--- a/lily/accidental-placement.cc
+++ b/lily/accidental-placement.cc
@@ -353,8 +353,8 @@ Accidental_placement::calc_positioning_done (SCM smob)
     {
       int very_large = INT_MAX;
       
-      head_extents.push_back (Box (heads[i]->extent (common[X_AXIS], X_AXIS),
-				   heads[i]->pure_height (common[Y_AXIS], 0, very_large)));
+      head_extents.push_back (Box (stems[i]->extent (common[X_AXIS], X_AXIS),
+				   stems[i]->pure_height (common[Y_AXIS], 0, very_large)));
     }
 
   head_ape->left_skyline_ = Skyline (head_extents, Y_AXIS, LEFT);