X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-music-display-methods.scm;h=3254a90469b53788ab81f6ed0ca2b60fab9765d6;hb=d113d25bd547db72c38909b8dd4a24c6765e401c;hp=72f94b0acfbd6adee562d6911d6aa9d81b58ebfb;hpb=2131b69d4957900fbd4b1269fb0e08fe905d0ca4;p=lilypond.git

diff --git a/scm/define-music-display-methods.scm b/scm/define-music-display-methods.scm
index 72f94b0acf..3254a90469 100644
--- a/scm/define-music-display-methods.scm
+++ b/scm/define-music-display-methods.scm
@@ -1,7 +1,7 @@
 ;;; define-music-display-methods.scm -- data for displaying music
 ;;; expressions using LilyPond notation.
 ;;;
-;;; (c) 2005--2009 Nicolas Sceaux  <nicolas.sceaux@free.fr>
+;;; Copyright (C) 2005--2010 Nicolas Sceaux  <nicolas.sceaux@free.fr>
 ;;;
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -961,11 +961,11 @@ Otherwise, return #f."
 								 symbol 'clefOctavation)
 							  (music 'ApplyContext
 								 procedure ly:set-middle-C!)))))
-    (let ((clef-prop+name (assoc (list ?clef-glyph ?clef-position 0)
+    (let ((clef-name (assoc-get (list ?clef-glyph ?clef-position 0)
 				 clef-name-alist)))
-      (if clef-prop+name
+      (if clef-name
 	  (format #f "\\clef \"~a~{~a~a~}\"~a"
-		  (cdr clef-prop+name)
+		  clef-name
 		  (cond ((= 0 ?clef-octavation)
 			 (list "" ""))
 			((> ?clef-octavation 0)
@@ -1033,6 +1033,7 @@ Otherwise, return #f."
 	     ((= i dots) m)
 	   (set! m (+ m delta)))
 	 factor))))
+
 (define moment-duration-alist (map (lambda (duration)
 				     (cons (duration->moment duration)
 					   duration))
@@ -1043,9 +1044,7 @@ Otherwise, return #f."
 					       (list 0 1 2 3 4))))
 
 (define (moment->duration moment)
-  (let ((result (assoc (- moment) moment-duration-alist =)))
-    (and result
-	 (cdr result))))
+  (assoc-get (- moment) moment-duration-alist))
 
 (define-extra-display-method ContextSpeccedMusic (expr parser)
   "If `expr' is a partial measure, return \"\\partial ...\".