release: 1.3.17

[lilypond.git] / lily / collision.cc

diff --git a/lily/collision.cc b/lily/collision.cc
index a6bf46e56cc85da7374356e3564d00697da529ff..edf04de23d06f91e3fbf1d54ff3333177dd67523 100644 (file)
--- a/lily/collision.cc
+++ b/lily/collision.cc
@@ -153,8 +153,11 @@ Collision::automatic_shift ()
       
       bool merge  =
        downpos == uppos
-       && nu_l->balltype_i () == nd_l->balltype_i ()
-       && nu_l->dots_i () == nd_l->dots_i ();
+       && nu_l->balltype_i () == nd_l->balltype_i ();
+
+
+      if (!to_boolean (get_elt_property ("merge-differently-dotted")))
+       merge = merge && nu_l->dot_count () == nd_l->dot_count ();
 
       /*
        notes are close, but can not be merged.  Shift