release: 1.4.1

[lilypond.git] / lily / collision.cc

diff --git a/lily/collision.cc b/lily/collision.cc
index 792caf0d3ea6a9e2f323a9e4af24454c14c9f706..5b6b815aa6bb18ab210c275ae82fdaf2d84993ac 100644 (file)
--- a/lily/collision.cc
+++ b/lily/collision.cc
@@ -195,7 +195,10 @@ Collision::automatic_shift (Grob *me)
          {
            for (int i=0; i < clash_groups[d].size (); i++)
              {
-               offsets[d][i] -= d * 0.5;
+               if(Rhythmic_head::dot_count (nu_l) > Rhythmic_head::dot_count (nd_l))
+                 offsets[d][i] += d * 0.5;
+               else 
+                 offsets[d][i] -= d * 0.5;
              }
          }
          while ((flip (&d))!= UP);