Add regtest for Fix for #435.

[lilypond.git] / lily / note-collision.cc

diff --git a/lily/note-collision.cc b/lily/note-collision.cc
index 894f16071fa5d5e76e0d2101ffe4a897e47c13b3..7abcc2acc9c7bc4f0e94905747bfb3d767c4576c 100644 (file)
--- a/lily/note-collision.cc
+++ b/lily/note-collision.cc
@@ -161,6 +161,13 @@ check_meshing_chords (Grob *me,
   Real shift_amount = 1;
 
   bool touch = (ups[0] >= dps.back ());
+  /* As a special case, if the topmost part of the downstem chord is a second,
+     the top note of which is the same pitch as the lowest upstem note, they
+     shouldn't count as touching.
+  */
+  if (dps.back () == ups[0] && dps.size () > 1 && dps[dps.size() - 2] == ups[0] - 1)
+    touch = false;
+
   if (touch)
     shift_amount *= -1;