X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fparser-clef.scm;h=8275929d554e2124e8f91b4c14e7330b94b7df56;hb=f252b3715f8468ed735dda56269aaf3e712d4606;hp=b3de9fc405876ce6fe7212b2e3d158210cded146;hpb=a9d9433bc7b95cb2d4b3d96eefce7a8437c0d44e;p=lilypond.git diff --git a/scm/parser-clef.scm b/scm/parser-clef.scm index b3de9fc405..8275929d55 100644 --- a/scm/parser-clef.scm +++ b/scm/parser-clef.scm @@ -1,4 +1,4 @@ -;;;; clef.scm -- Clef settings +;;;; parser-clef.scm -- Clef settings ;;;; ;;;; source file of the GNU LilyPond music typesetter ;;;; @@ -109,15 +109,15 @@ (set! oct (* (if (equal? (match:substring match 2) "^") -1 1) (- (string->number (match:substring match 3)) 1))))) - (set! e (assoc clef-name supported-clefs)) - (if (pair? e) + (set! e (assoc-get clef-name supported-clefs)) + (if e (let* ((musics (map make-prop-set - `(((symbol . clefGlyph) (value . ,(cadr e))) + `(((symbol . clefGlyph) (value . ,(car e))) ((symbol . middleCClefPosition) (value . ,(+ oct - (caddr e) - (cdr (assoc (cadr e) c0-pitch-alist))))) - ((symbol . clefPosition) (value . ,(caddr e))) + (cadr e) + (assoc-get (car e) c0-pitch-alist)))) + ((symbol . clefPosition) (value . ,(cadr e))) ((symbol . clefOctavation) (value . ,(- oct)))))) (recalc-mid-C (make-music 'ApplyContext)) (seq (make-music 'SequentialMusic @@ -132,3 +132,10 @@ (sort (map car supported-clefs) string