Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

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

diff --git a/lily/note-collision.cc b/lily/note-collision.cc
index e880c6cc295e78c685036a8a09f0876d13f591dc..2fa8ce48814fb6ab00249a53213a7c2bead23a55 100644 (file)
--- a/lily/note-collision.cc
+++ b/lily/note-collision.cc
@@ -247,6 +247,22 @@ check_meshing_chords (Grob *me,
   else
     shift_amount *= 0.17;
 
+  /*
+    
+  */
+  if (full_collide
+      && dnball_type * upball_type == 0)
+    {
+      if (upball_type == 0 && dnball_type == 1)
+       shift_amount *= 1.25;
+      else if (upball_type == 0 && dnball_type == 2)
+       shift_amount *= 1.35;
+      else if (dnball_type == 0 && upball_type == 1)
+       shift_amount *= 0.7;
+      else if (dnball_type == 0 && upball_type == 2)
+       shift_amount *= 0.75;
+    }
+  
   /*
    * Fix issue #44:
    *