Fix #666.

Slur::outside_slur_callback (): only set avoidance_offset if do_shift = true.

diff --git a/lily/slur.cc b/lily/slur.cc
index faa40725ad4644cb9024c70242180f25830b9ef2..604221e3f2d2087ce86186b17ea074172e5cedc6 100644 (file)
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -308,11 +308,13 @@ Slur::outside_slur_callback (SCM grob, SCM offset_scm)
     }
 
   Real avoidance_offset = 0.0;
-  for (int d = LEFT, k = 0; d <= RIGHT; d++, k++)
-    if (consider[k]) 
-      avoidance_offset = dir * (max (dir * avoidance_offset,
-                                    dir * (ys[k] - yext[-dir] + dir * slur_padding)));
-  
+  if (do_shift)
+    {
+      for (int d = LEFT, k = 0; d <= RIGHT; d++, k++)
+       if (consider[k])
+         avoidance_offset = dir * (max (dir * avoidance_offset,
+                                        dir * (ys[k] - yext[-dir] + dir * slur_padding)));
+    }
   return scm_from_double (offset + avoidance_offset);
 }