* 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

diff --git a/ChangeLog b/ChangeLog
index 3fcf611bf7a3cbc0622d03d9606b170e4caba109..5f22f7cc20417946bdfb13d447cde26edc95689b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-12  Nicolas Sceaux  <nicolas.sceaux@free.fr>
+
+       * 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  <hanwen@xs4all.nl>
 
        * 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 60f856cf2b0753951f09d3b8c9b39997edc2e45e..40f7b7e8cd0c280ee99038fce634c98f5a3d74c9 100644 (file)
--- 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 a19a3f7974e2bc8398a01510b549ba02e8950da3..1c930434cf7030f93a16fccf1e29903fe044e5b0 100644 (file)
--- 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"