From: Nicolas Sceaux Date: Mon, 18 Apr 2005 21:55:16 +0000 (+0000) Subject: (music->make-music): fix music expression property list building X-Git-Tag: release/2.5.21~40 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f0c95827f0ce8e67bd5c8ec17a5c2a229a6f6d92;p=lilypond.git (music->make-music): fix music expression property list building --- diff --git a/ChangeLog b/ChangeLog index 749ac973bb..b0791911b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ * scm/music-functions.scm (markup-expression->make-markup): fix bug with cons arguments of markup commands. + (music->make-music): fix music expression property list building 2005-04-18 Jan Nieuwenhuizen diff --git a/scm/music-functions.scm b/scm/music-functions.scm index 18a083a681..bab748a7c0 100644 --- a/scm/music-functions.scm +++ b/scm/music-functions.scm @@ -121,17 +121,16 @@ that is, for a music expression, a (make-music ...) form." (ly:music? obj) `(make-music ',(ly:music-property obj 'name) - ,@(append (map (lambda (prop) - (list - (car prop) - (if (and (not (markup? (cdr prop))) - (list? (cdr prop)) - (pair? (cdr prop))) ;; property is a non-empty list - `(list ,@(map music->make-music (cdr prop))) - (music->make-music (cdr prop))))) - (remove (lambda (prop) - (eqv? (car prop) 'origin)) - (ly:music-mutable-properties obj)))))) + ,@(apply append (map (lambda (prop) + `(',(car prop) + ,(if (and (not (markup? (cdr prop))) + (list? (cdr prop)) + (pair? (cdr prop))) ;; property is a non-empty list + `(list ,@(map music->make-music (cdr prop))) + (music->make-music (cdr prop))))) + (remove (lambda (prop) + (eqv? (car prop) 'origin)) + (ly:music-mutable-properties obj)))))) (;; moment (ly:moment? obj) `(ly:make-moment ,(ly:moment-main-numerator obj)