X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Flayout-slur.scm;h=d458506f179320884ff8a701d48f74c753be984f;hb=2f870443addbe29bcb5495533a185b8258d62a52;hp=777b4a86dd756795ed63952c1b579237a2bb37cf;hpb=4a4b9008d4e571eb5714314661f5eaf35b117ef0;p=lilypond.git

diff --git a/scm/layout-slur.scm b/scm/layout-slur.scm
index 777b4a86dd..d458506f17 100644
--- a/scm/layout-slur.scm
+++ b/scm/layout-slur.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2000--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 2000--2007 Jan Nieuwenhuizen <janneke@gnu.org>
 				;
 ; this is put into the slur-details property of Slur and PhrasingSlur
 (define default-slur-details
@@ -18,9 +18,10 @@
     (max-slope-factor . 10)
     (free-head-distance . 0.3)
     (free-slur-distance . 0.8)
-    (extra-object-collision . 50)
+    (extra-object-collision-penalty . 50)
     (accidental-collision . 3)
     (extra-encompass-free-distance . 0.3)
+    (extra-encompass-collision-distance . 0.8)
     (head-slur-distance-max-ratio . 3)
     (head-slur-distance-factor . 10)
     (absolute-closeness-measure . 0.3)