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

diff --git a/scm/layout-slur.scm b/scm/layout-slur.scm
index 95f717d566..18b28797d0 100644
--- a/scm/layout-slur.scm
+++ b/scm/layout-slur.scm
@@ -1,15 +1,25 @@
-;;;; 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>
-				;
-; this is put into the slur-details property of Slur and PhrasingSlur
+;;;; Copyright (C) 2000--2015 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
   '((region-size . 4)
     (head-encompass-penalty . 1000.0)
     (stem-encompass-penalty . 30.0)
-    (closeness-factor . 10)
     (edge-attraction-factor . 4)
     (same-slope-penalty . 20)
     (steeper-slope-factor . 50)
@@ -18,11 +28,18 @@
     (max-slope-factor . 10)
     (free-head-distance . 0.3)
     (free-slur-distance . 0.8)
+    (gap-to-staffline-inside . 0.2)
+    (gap-to-staffline-outside . 0.1)
     (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)
     (edge-slope-exponent . 1.7)
+    (close-to-edge-length . 2.5)
+    (encompass-object-range-overshoot . 0.5)
+    (slur-tie-extrema-min-distance . 0.2)
+    (slur-tie-extrema-min-distance-penalty . 2)
     ))