X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Flayout-slur.scm;h=18b28797d0948305195d3ace6026d6daf27afcc5;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=5614dd65c601b0db614ddc25c6a2b214c043d6fc;hpb=5edacf4c1908d0fe988d0ef9b3d6a9820a1e8734;p=lilypond.git

diff --git a/scm/layout-slur.scm b/scm/layout-slur.scm
index 5614dd65c6..18b28797d0 100644
--- a/scm/layout-slur.scm
+++ b/scm/layout-slur.scm
@@ -1,6 +1,6 @@
 ;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;; Copyright (C) 2000--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; 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
@@ -14,13 +14,12 @@
 ;;;;
 ;;;; 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
+
+;; 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)
@@ -29,6 +28,8 @@
     (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.3)
@@ -38,4 +39,7 @@
     (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)
     ))