CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Nicolas Sceaux <[EMAIL PROTECTED]> 05/04/18 21:55:17
Modified files:
scm : music-functions.scm
. : ChangeLog
Log message:
(music->make-music): fix music expression property list building
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/music-functions.scm.diff?tr1=1.145&tr2=1.146&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3470&tr2=1.3471&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3470 lilypond/ChangeLog:1.3471
--- lilypond/ChangeLog:1.3470 Mon Apr 18 21:43:03 2005
+++ lilypond/ChangeLog Mon Apr 18 21:55:16 2005
@@ -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 <[EMAIL PROTECTED]>
Index: lilypond/scm/music-functions.scm
diff -u lilypond/scm/music-functions.scm:1.145
lilypond/scm/music-functions.scm:1.146
--- lilypond/scm/music-functions.scm:1.145 Mon Apr 18 21:20:10 2005
+++ lilypond/scm/music-functions.scm Mon Apr 18 21:55:16 2005
@@ -121,17 +121,16 @@
(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)
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
