-;;;
-;;; 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--2004 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
;; 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)
(cons (lambda (slur dir)
;; urg, code dup
- (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)))
+ (let* ((note-columns (ly:get-grob-property slur 'note-columns))
+ (col (car (if (= dir 1) note-columns (reverse note-columns))))
+ (stem (ly:get-grob-property col 'stem)))
+
(and stem
- (not (= (ly-get-grob-property slur 'direction)
- (ly-get-grob-property stem 'direction)))))) 'head)
+ (not (equal? (ly:get-grob-property slur 'direction)
+ (ly:get-grob-property stem 'direction)))))) 'head)
;; (cons (lambda (slur dir) (begin (display "before stem") (newline))#f) #f)
(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)
;; 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))
(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))