From 82058ceb161f810d3685c58c2c296e5d2e490623 Mon Sep 17 00:00:00 2001 From: Nicolas Sceaux Date: Mon, 12 Dec 2005 19:42:04 +0000 Subject: [PATCH] * input/no-notation/display-lily-tests.ly (test): * scm/display-lily.scm (tag->lily-string): the syntax for tags has changed from \tag #'(a b) to \tag #'a \tag #'b --- ChangeLog | 6 ++++++ input/no-notation/display-lily-tests.ly | 2 +- scm/display-lily.scm | 11 ++++------- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3fcf611bf7..5f22f7cc20 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-12-12 Nicolas Sceaux + + * input/no-notation/display-lily-tests.ly (test): + * scm/display-lily.scm (tag->lily-string): the syntax for tags has + changed from \tag #'(a b) to \tag #'a \tag #'b + 2005-12-12 Han-Wen Nienhuys * Documentation/topdocs/NEWS.tely: strip out-www. diff --git a/input/no-notation/display-lily-tests.ly b/input/no-notation/display-lily-tests.ly index 60f856cf2b..40f7b7e8cd 100644 --- a/input/no-notation/display-lily-tests.ly +++ b/input/no-notation/display-lily-tests.ly @@ -110,7 +110,7 @@ test = #(def-music-function (parser location result-info strings) (string? pair? %% tags \test #"" ##[ { \tag #'foo { c4 d } } #] - \test #"" ##[ c-\tag #'(foo baz) -^ -. #] + \test #"" ##[ c-\tag #'foo -\tag #'baz -^ -. #] %% Graces \test #"" ##[ { \grace c8 d2 } #] % GraceMusic diff --git a/scm/display-lily.scm b/scm/display-lily.scm index a19a3f7974..1c930434cf 100644 --- a/scm/display-lily.scm +++ b/scm/display-lily.scm @@ -75,13 +75,10 @@ display method will be called." new-method)) (define* (tag->lily-string expr #:optional (post-event? #f)) - (let ((tags (ly:music-property expr 'tags))) - (cond ((null? tags) - "") - ((null? (cdr tags)) - (format #f "~a\\tag #'~a " (if post-event? "-" "") (car tags))) - (else - (format #f "~a\\tag #'(~a~{ ~a~}) " (if post-event? "-" "") (car tags) (cdr tags)))))) + (format #f "~{~a ~}" + (map (lambda (tag) + (format #f "~a\\tag #'~a" (if post-event? "-" "") tag)) + (ly:music-property expr 'tags)))) (define-public (music->lily-string expr) "Print expr, a music expression, in LilyPond syntax" -- 2.39.5