X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faccidental-placement.cc;h=da23e5719498bfbc97222d4bc90890a2207ccaae;hb=83c5b56f8a495df4fca2551957e0fd8757ec3651;hp=1f2a943045bf1d687642a4146ec9567a07fd9461;hpb=23108a9515e7f76b44fac0b323afb169d708bfa1;p=lilypond.git

diff --git a/lily/accidental-placement.cc b/lily/accidental-placement.cc
index 1f2a943045..da23e57194 100644
--- a/lily/accidental-placement.cc
+++ b/lily/accidental-placement.cc
@@ -342,9 +342,8 @@ extract_heads_and_stems (vector<Accidental_placement_entry *> const &apes)
   for (vsize i = ret.size (); i--;)
     if (Grob *s = Rhythmic_head::get_stem (ret[i]))
       ret.push_back (s);
-
-  vector_sort (ret, less<Grob *> ());
-  uniq (ret);
+  
+  uniquify (ret);
   return ret;
 }
 
@@ -399,7 +398,8 @@ position_apes (Grob *me,
     {
       Accidental_placement_entry *ape = apes[i];
 
-      Real offset = -ape->horizontal_skylines_[RIGHT].distance (left_skyline);
+      Real offset = -ape->horizontal_skylines_[RIGHT]
+                    .distance (left_skyline, 0.1);
       if (isinf (offset))
         offset = last_offset;
       else