(music->make-music): fix music expression property list building

diff --git a/ChangeLog b/ChangeLog
index 749ac973bba849c75fcf4395fb0288b254008acd..b0791911b87d5d3dd08d596ebff88566235267e5 100644 (file)
--- 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  <janneke@gnu.org>
 

diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index 18a083a681d5d4bb81c5529156364bdcf4504492..bab748a7c0ac9b7d269afb5dce541b2d81e35c2e 100644 (file)
--- 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)