(score_edges): add exp(slope*dir*leftright)

[lilypond.git] / scm / slur.scm

diff --git a/scm/slur.scm b/scm/slur.scm
index f213bb12236efea09f633d39b83b6bf791b621c8..5b1e9c102806984a6bb871ee13f76129b6898c84 100644 (file)
--- a/scm/slur.scm
+++ b/scm/slur.scm
@@ -5,117 +5,10 @@
 ;;;; 
 ;;;; (c)  2000--2004 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;
-
-(define (attached-to-stem slur dir)
-  (let* ((note-columns (ly:grob-property slur 'note-columns))
-        (col (if (= dir RIGHT)
-                 (car note-columns)
-                 (car (last-pair note-columns))))
-        (stem (ly:grob-property col 'stem)))
-    (and
-     (eq? col (ly:spanner-get-bound slur dir))
-     ;(ly:grob? stem)
-     ;(pair?  (ly:grob-property stem 'heads))
-
-     )))
-
-
-;;
-;; Currently, we have attachments:
-;;
-;;    'head 'along-side-stem 'stem 'loose-end
-;;
-(define (calc-slur-extremity slur dir)
-  (let* ((note-columns (ly:grob-property slur 'note-columns))
-        (col (if (= dir 1)
-                 (car note-columns)
-                 (car (last-pair note-columns))))
-        (stem (ly:grob-property col 'stem))
-        (beaming (if (and (ly:grob? stem)
-                          (ly:grob? (ly:grob-property stem 'beam)))
-                     (ly:grob-property stem 'beaming)
-                     '(() . ())))
-        (one-side-beaming (if (= dir RIGHT)
-                              (car beaming)
-                              (cdr beaming)))
-                     
-        )
-
-   (cond
-    ((< (length note-columns) 1) 'head)
-    ((not (attached-to-stem slur dir))
-
-     'loose-end)
-    ((and stem
-         (not (equal? (ly:grob-property slur 'direction) 
-                      (ly:grob-property stem 'direction))))  'head)
-    ((and (memq (ly:spanner-get-bound slur dir)
-               (ly:grob-property slur 'note-columns))
-         (ly:grob? stem)
-
-         ;; slur would go under beam for 'head
-         (> (length one-side-beaming ) 0)
-         ;; and beam on same side as slur
-         (equal?
-          (ly:grob-property stem 'direction)
-          (ly:grob-property slur 'direction))
-         )
-     'stem)
-    ((not (attached-to-stem slur dir))
-     'loose-end)
-    (else
-     'head))
-   ))
-
-
-;; This list defines the offsets for each type of attachment.
-;; The format of each element is
-;; (attachment stem-dir*dir slur-dir*dir)
-;; Different attachments have different default points:
-;;
-;; head: Default position is centered in X, on outer side of head Y
-;; along-side-stem: Default position is on stem X, on outer side of head Y
-;; stem: Default position is on stem X, at stem end Y
-(define default-slur-extremity-offset-alist
-  '(
-    ((head 1 1) . (-0.25 . 0.75))
-    ((head 1 -1) . (-0.25 . 0.75))
-    ((head -1 1) . (-0.25 . 0.75))
-    ((head -1 -1) . (-0.85 . 0.75))
-
-    ((stem 1 1) . (-0.125 . 0.5))
-    ((stem -1 -1) . (-0.125 . 0.5))
-
-    ((loose-end 1 1) . (-0.4 . 0))
-    ((loose-end 1 -1) . (-0.4 . 0))
-    ((loose-end -1 -1) . (-4 . 0))
-    ((loose-end -1 1) . (-4 . 0))
-    ))
-
-;; This is a bit of a hack: slurs and phrasing slurs
-;; attaching at the same note must not collide.
-;; However, slurs (and phrasing slurs) should look
-;; at scripts and eachother.
-(define default-phrasing-slur-extremity-offset-alist
-  '(
-    ((head 1 1) . (-0.25 . 1.25))
-    ((head 1 -1) . (-0.25 . 1.25))
-    ((head -1 1) . (-0.25 . 1.25))
-    ((head -1 -1) . (-0.85 . 1.25))
-
-    ((stem 1 1) . (-0.25 . 1.5))
-    ((stem -1 -1) . (-0.25 . 1.5))
-
-    ((loose-end 1 1) . (-0.4 . 0))
-    ((loose-end 1 -1) . (-0.4 . 0))
-    ((loose-end -1 -1) . (-4 . 0))
-    ((loose-end -1 1) . (-4 . 0))
-    ))
-
-
+                               ;
 ; this is put into the slur-details property of Slur and PhrasingSlur
 (define default-slur-details
-  '((slur-region-size . 5)
+  '((region-size . 4)
     (head-encompass-penalty . 1000.0)
     (stem-encompass-penalty . 30.0)
     (closeness-factor . 10)
@@ -123,11 +16,14 @@
     (same-slope-penalty . 20)
     (steeper-slope-factor . 50)
     (non-horizontal-penalty . 15)
-    (head-strict-free-space . 0.2)
     (max-slope . 1.1)
     (max-slope-factor . 10)
     (free-head-distance . 0.3)
+    (free-slur-distance . 0.8)
     (extra-object-collision . 50)
     (accidental-collision . 3)
-    (extra-encompass-free-distance . 0.5)
+    (extra-encompass-free-distance . 0.3)
+    (head-slur-distance-max-ratio . 3)
+    (head-slur-distance-factor . 10)
+    (edge-slope-exponent . 2)
     ))