From 9c1c9aeda969c421ad24bffc71144c4c130ab737 Mon Sep 17 00:00:00 2001 From: Erik Sandberg Date: Sun, 5 Mar 2006 15:59:06 +0000 Subject: [PATCH] * scm/music-functions.scm (music->make-music): bugfix, KeyChangeEvents are now handled correctly. * scripts/lilypond-book.py: Add --debug option. --- ChangeLog | 7 +++++++ scm/music-functions.scm | 13 ++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2256ede06c..b530d87f63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-03-05 Erik Sandberg + + * 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 * python/lilylib.py: add tempfile. diff --git a/scm/music-functions.scm b/scm/music-functions.scm index 2c815e021f..bf2063db95 100644 --- 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))) -- 2.39.2