X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fslur.scm;h=e51eda250b8e9774550f0690cf48a4bea85ba68f;hb=de2b6d04ee98783f86b02047e41ee672f97a813d;hp=6cdeeb1a93ec53802af124c95b91919487ce0b39;hpb=9bb713ea8cca3e9924099bfc3c5ec0dd75a34c15;p=lilypond.git

diff --git a/scm/slur.scm b/scm/slur.scm
index 6cdeeb1a93..e51eda250b 100644
--- a/scm/slur.scm
+++ b/scm/slur.scm
@@ -3,17 +3,17 @@
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c)  2000--2003 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;
 
 (define (attached-to-stem slur dir)
-  (let* ((note-columns (ly-get-grob-property slur 'note-columns))
+  (let* ((note-columns (ly:get-grob-property slur 'note-columns))
 	 (col (if (= dir 1) (car note-columns) (car (reverse note-columns))))
-	 (stem (ly-get-grob-property col 'stem)))
+	 (stem (ly:get-grob-property col 'stem)))
     (and
-     (eq? col (ly-get-spanner-bound slur dir))
+     (eq? col (ly:get-spanner-bound slur dir))
      stem
-     (ly-get-grob-property stem 'heads))))
+     (ly:get-grob-property stem 'heads))))
 
 
 ;; Slur-extremity-rules is a list of rules.  Each rule is a pair 
@@ -37,7 +37,7 @@
 
    ;; urg: don't crash on a slur without note-columns
    (cons (lambda (slur dir)
-	   (< (length (ly-get-grob-property slur 'note-columns)) 1)) 'head)
+	   (< (length (ly:get-grob-property slur 'note-columns)) 1)) 'head)
 
    ;; (cons (lambda (slur dir) (begin (display "before loose-end") (newline))#f) #f)
    (cons (lambda (slur dir) (not (attached-to-stem slur dir)))  'loose-end)
@@ -46,12 +46,12 @@
 
    (cons (lambda (slur dir)
 	   ;; urg, code dup
-	   (let* ((note-columns (ly-get-grob-property slur 'note-columns))
+	   (let* ((note-columns (ly:get-grob-property slur 'note-columns))
 		  (col (if (= dir 1) (car note-columns) (car (reverse note-columns))))
-		  (stem (ly-get-grob-property col 'stem)))
+		  (stem (ly:get-grob-property col 'stem)))
 	     (and stem
-		  (not (= (ly-get-grob-property slur 'direction) 
-			  (ly-get-grob-property stem 'direction))))))  'head)
+		  (not (= (ly:get-grob-property slur 'direction) 
+			  (ly:get-grob-property stem 'direction))))))  'head)
 
    ;; (cons (lambda (slur dir) (begin (display "before stem") (newline))#f) #f)
 
@@ -60,16 +60,16 @@
 	   (and (attached-to-stem slur dir)
 		;; and got beam
 		;; urg, code dup
-		(let* ((note-columns (ly-get-grob-property slur 'note-columns))
+		(let* ((note-columns (ly:get-grob-property slur 'note-columns))
 		       (col (if (= dir 1) (car note-columns) (car (reverse note-columns))))
-		       (stem (ly-get-grob-property col 'stem)))
+		       (stem (ly:get-grob-property col 'stem)))
 		  (and stem
-		       (ly-get-grob-property stem 'beam)
+		       (ly:get-grob-property stem 'beam)
 		       ;; and beam on same side as slur
-		       (let ((beaming (ly-get-grob-property stem 'beaming)))
+		       (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)