X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur.cc;h=b1794ad4014828bff6b1c9b8f62f89b944d3e10a;hb=b8c66cadfa52c1c5b32ba35166d9b2099f627726;hp=faa40725ad4644cb9024c70242180f25830b9ef2;hpb=20b8c1519bbba8728457aa98e59993837bedfb04;p=lilypond.git

diff --git a/lily/slur.cc b/lily/slur.cc
index faa40725ad..b1794ad401 100644
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1996--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -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);
 }