From: Neil Puttock <n.puttock@gmail.com>
Date: Wed, 27 Aug 2008 23:07:38 +0000 (+0100)
Subject: Fix #666.
X-Git-Tag: release/2.11.58-1~32^2~9^2
X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=3de270843805e4694f23ef1c47ccfb4ad2f4ca9e;p=lilypond.git

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 faa40725ad..604221e3f2 100644
--- 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);
 }