From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 20 Sep 2006 00:15:50 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: cvs/HEAD~74
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=def203fe2dc0114f1d3a0195dff4ada2929e9ac3;p=lilypond.git

*** empty log message ***
---

diff --git a/ChangeLog b/ChangeLog
index 24f7fdad18..978139cc6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,9 @@
 
 2006-09-20  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+	* lily/accidental-placement.cc (calc_positioning_done): also put
+	stems into accidental support. 
+
 	* lily/tie-engraver.cc (process_music): also set tieMelismaBusy if
 	event_ detected.
 
diff --git a/lily/accidental-placement.cc b/lily/accidental-placement.cc
index 2a97f7f382..ff68bbdf0a 100644
--- a/lily/accidental-placement.cc
+++ b/lily/accidental-placement.cc
@@ -9,6 +9,7 @@
 
 #include "accidental-placement.hh"
 
+#include "rhythmic-head.hh"
 #include "accidental-interface.hh"
 #include "music.hh"
 #include "note-collision.hh"
@@ -340,6 +341,15 @@ Accidental_placement::calc_positioning_done (SCM smob)
   Accidental_placement_entry *head_ape = new Accidental_placement_entry;
   common[X_AXIS] = common_refpoint_of_array (heads, common[X_AXIS], X_AXIS);
   vector<Skyline_entry> head_skyline (empty_skyline (LEFT));
+
+  vector<Grob *> stems;
+  for (vsize i = 0; i < heads.size  (); i++)
+    if (Grob *s = Rhythmic_head::get_stem (heads[i]))
+      stems.push_back (s);
+  vector_sort (stems, less<Grob*> ());
+  uniq (stems);
+  concat (heads, stems);
+  
   vector<Box> head_extents;
   for (vsize i = heads.size (); i--;)
     {