X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Flayout-slur.scm;h=499944e0f00444dec4f9f8b2b13f385b666fe25c;hb=12b56b962fe81a56997a6c5fca448fd71a4ec0bb;hp=95f717d566f5474e21872d6b6665b67c2e77642d;hpb=6c6ae92410f087d0318a3c302eb6877cfc7fae45;p=lilypond.git

diff --git a/scm/layout-slur.scm b/scm/layout-slur.scm
index 95f717d566..499944e0f0 100644
--- a/scm/layout-slur.scm
+++ b/scm/layout-slur.scm
@@ -1,8 +1,19 @@
-;;;; slur.scm -- Slur scheme stuff
+;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;; source file of the GNU LilyPond music typesetter
-;;;; 
-;;;; (c) 2000--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; Copyright (C) 2000--2010 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;;
+;;;; LilyPond is free software: you can redistribute it and/or modify
+;;;; it under the terms of the GNU General Public License as published by
+;;;; the Free Software Foundation, either version 3 of the License, or
+;;;; (at your option) any later version.
+;;;;
+;;;; LilyPond is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;;; GNU General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 				;
 ; this is put into the slur-details property of Slur and PhrasingSlur
 (define default-slur-details
@@ -20,7 +31,8 @@
     (free-slur-distance . 0.8)
     (extra-object-collision-penalty . 50)
     (accidental-collision . 3)
-    (extra-encompass-free-distance . 0.8)
+    (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)