]> git.donarmstrong.com Git - lilypond.git/commitdiff
*** empty log message ***
authorHan-Wen Nienhuys <hanwen@xs4all.nl>
Wed, 20 Sep 2006 00:15:50 +0000 (00:15 +0000)
committerHan-Wen Nienhuys <hanwen@xs4all.nl>
Wed, 20 Sep 2006 00:15:50 +0000 (00:15 +0000)
ChangeLog
lily/accidental-placement.cc

index 24f7fdad186daffd219d375861a4070dd3a9527f..978139cc6d421d0bb86c63ad2fc106508c466165 100644 (file)
--- 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.
 
index 2a97f7f38242f2f9a74b6e1d0a89f9fea326f78f..ff68bbdf0ae19b79c079bf2ee0bb2514a2c51ee2 100644 (file)
@@ -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--;)
     {