* scm/music-functions.scm (music->make-music): bugfix,

        KeyChangeEvents are now handled correctly.

        * scripts/lilypond-book.py: Add --debug option.

diff --git a/ChangeLog b/ChangeLog
index 2256ede06cf538fef416250e4e86e7c445ed9378..b530d87f63347ca7660fe45fcbb9726f86010e19 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-03-05 Erik Sandberg  <mandolaerik@gmail.com>
+
+       * scm/music-functions.scm (music->make-music): bugfix,
+       KeyChangeEvents are now handled correctly.
+
+       * scripts/lilypond-book.py: Add --debug option.
+
 2006-03-03  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * python/lilylib.py: add tempfile.

diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index 2c815e021fcca91e834bc188679b91f7defade5c..bf2063db9545911029605422a285bbfb6cb06694 100644 (file)
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -129,11 +129,7 @@ that is, for a music expression, a (make-music ...) form."
           ',(ly:music-property obj 'name)
           ,@(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)))))
+                                   ,(music->make-music (cdr prop))))
                                 (remove (lambda (prop)
                                           (eqv? (car prop) 'origin))
                                         (ly:music-mutable-properties obj))))))
@@ -163,6 +159,13 @@ that is, for a music expression, a (make-music ...) form."
        (;; an empty list (avoid having an unquoted empty list)
         (null? obj)
         `'())
+       (;; a proper list
+        (list? obj)
+        `(list ,@(map music->make-music obj)))
+       (;; a pair
+        (pair? obj)
+        `(cons ,(music->make-music (car obj)) 
+               ,(music->make-music (cdr obj))))
        (else
         obj)))