CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Nicolas Sceaux <[EMAIL PROTECTED]> 05/04/18 21:20:11
Modified files:
scm : music-functions.scm
. : ChangeLog
Log message:
(markup-expression->make-markup): fix bug with cons arguments of
markup commands.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/music-functions.scm.diff?tr1=1.144&tr2=1.145&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3467&tr2=1.3468&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3467 lilypond/ChangeLog:1.3468
--- lilypond/ChangeLog:1.3467 Mon Apr 18 18:22:35 2005
+++ lilypond/ChangeLog Mon Apr 18 21:20:10 2005
@@ -1,3 +1,8 @@
+2005-04-18 Nicolas Sceaux <[EMAIL PROTECTED]>
+
+ * scm/music-functions.scm (markup-expression->make-markup): fix
+ bug with cons arguments of markup commands.
+
2005-04-18 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
* SCons updates.
Index: lilypond/scm/music-functions.scm
diff -u lilypond/scm/music-functions.scm:1.144
lilypond/scm/music-functions.scm:1.145
--- lilypond/scm/music-functions.scm:1.144 Tue Apr 12 22:49:25 2005
+++ lilypond/scm/music-functions.scm Mon Apr 18 21:20:10 2005
@@ -96,11 +96,11 @@
(symbol->keyword (string->symbol (substring cmd-markup 0 (-
(string-length cmd-markup)
(string-length "-markup")))))))
(define (transform-arg arg)
- (cond ((and (pair? arg) (pair? (car arg))) ;; a markup list
+ (cond ((and (pair? arg) (markup? (car arg))) ;; a markup list
(apply append (map inner-markup->make-markup arg)))
- ((pair? arg) ;; a markup
+ ((and (not (string? arg)) (markup? arg)) ;; a markup
(inner-markup->make-markup arg))
- (else ;; scheme arg
+ (else ;; scheme arg
arg)))
(define (inner-markup->make-markup mrkup)
(let ((cmd (proc->command-keyword (car mrkup)))
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
