X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fslur.scm;h=51445d3a54a00e467286902e2ea0e300ec44090f;hb=a5b5eb3ed7d47730d199dd678121e2d28ebacffc;hp=abfa9e2a89f92831093483e72ad4b72a3fd38a63;hpb=31a43e122332d7a8e703ff5f01286eacc4ea7a27;p=lilypond.git

diff --git a/scm/slur.scm b/scm/slur.scm
index abfa9e2a89..51445d3a54 100644
--- a/scm/slur.scm
+++ b/scm/slur.scm
@@ -1,10 +1,10 @@
-;;;
-;;; slur.scm -- Slur scheme stuff
-;;;
-;;; source file of the GNU LilyPond music typesetter
-;;; 
-;;; (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
-;;;
+;;;;
+;;;; slur.scm -- Slur scheme stuff
+;;;;
+;;;; source file of the GNU LilyPond music typesetter
+;;;; 
+;;;; (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;;
 
 (define (attached-to-stem slur dir)
   (let* ((note-columns (ly-get-grob-property slur 'note-columns))
@@ -69,7 +69,7 @@
 		       (let ((beaming (ly-get-grob-property stem 'beaming)))
 			 ;; (display "beaming (") (display dir) (display "): ") (write beaming) (newline)
 			 (if (pair? beaming)
-			     (>= (if (= dir -1) (cdr beaming) (car beaming))
+			     (>= (length (if (= dir -1) (cdr beaming) (car beaming)))
 				1)
 			     #f))))))
 	 'stem)
@@ -93,13 +93,13 @@
 ;; stem: Default position is on stem X, at stem end Y
 (define default-slur-extremity-offset-alist
   '(
-    ((head 1 1) . (-0.25 . 0.25))
-    ((head 1 -1) . (-0.25 . -0.25))
-    ((head -1 1) . (-0.25 . 0.25))
-    ((head -1 -1) . (-0.85 . -0.25))
+    ((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 . 0.5))
-    ((stem -1 -1) . (0 . -0.5))
+    ((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))
@@ -114,12 +114,12 @@
 (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.25 . 1.25))
-    ((head -1 -1) . (-0.85 . -1.25))
+    ((head -1 -1) . (-0.85 . 1.25))
 
-    ((stem 1 1) . (0 . 1.5))
-    ((stem -1 -1) . (0 . -1.5))
+    ((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))