Fix #122.

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

diff --git a/lily/note-collision.cc b/lily/note-collision.cc
index e880c6cc295e78c685036a8a09f0876d13f591dc..f5c4483bbd874d2aaa85f2f09a60a3f2aa0ad954 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:
    *
@@ -408,7 +424,6 @@ Note_collision_interface::get_clash_groups (Grob *me)
 /** This complicated routine moves note columns around horizontally to
     ensure that notes don't clash.
 
-    This should be put into Scheme.
 */
 SCM
 Note_collision_interface::automatic_shift (Grob *me,
@@ -537,6 +552,7 @@ ADD_INTERFACE (Note_collision_interface,
               "@code{force-hshift} and @code{horizontal-shift}.",
 
               /* properties */
+              "ignore-collision "
               "merge-differently-dotted "
               "merge-differently-headed "
               "positioning-done ");