Imported Upstream version 2.16.0

[lilypond.git] / scm / layout-slur.scm

diff --git a/scm/layout-slur.scm b/scm/layout-slur.scm
index 8626e0114690e832872b4aaff9cf23ce797a5e30..ff47dbb93826c263854d668dadea12be773f204d 100644 (file)
--- 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--2012 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
@@ -20,7 +20,6 @@
   '((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)
@@ -37,4 +36,8 @@
     (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)
     ))