(Generic_prefix_music_scm): append lists, not objects.

diff --git a/ChangeLog b/ChangeLog
index 4d2ff21e0f8295e9ee9f720b0643c4cf96624197..64aae1bd7ae16951f3bef427c2530b390d79c1e9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-04-07  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * lily/parser.yy (Generic_prefix_music_scm): append lists, not objects.
+
        * scm/backend-library.scm (search-gs): oops.
 
 2006-04-06  Han-Wen Nienhuys  <hanwen@lilypond.org>

diff --git a/lily/parser.yy b/lily/parser.yy
index cb8a8fdede7c9c318e2cc273ea4e702bd13cbac8..e2bbcd7d4d45796518338eeb7ffcb78a6cf4b4db 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -1011,7 +1011,7 @@ Generic_prefix_music_scm:
                $$ = scm_list_3 ($1, make_input (@$), $2);
        }
        | music_function_musicless_prefix Music {
-               $$ = ly_append2 ($1, $2->self_scm ());
+               $$ = ly_append2 ($1, scm_list_1 ($2->self_scm ()));
                $2->unprotect ();
        }
        | MUSIC_FUNCTION_SCM_SCM function_scm_argument function_scm_argument {

diff --git a/scm/lily.scm b/scm/lily.scm
index db729e6567beb0c6f3c8490107e6614dc22abba9..9ded6f526eea50f584d994e655c32c3a0968f80e 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -161,6 +161,7 @@ similar to chord syntax")
 (define (type-check-list location signature arguments)
   "Typecheck a list of arguments against a list of type
 predicates. Print a message at LOCATION if any predicate failed."
+
   (define (recursion-helper signature arguments count) 
     (define (helper pred? arg count) 
       (if (not (pred? arg))
@@ -178,6 +179,7 @@ predicates. Print a message at LOCATION if any predicate failed."
        #t
        (and (helper (car signature) (car arguments) count)
             (recursion-helper (cdr signature) (cdr arguments) (1+ count)))))
+
   (recursion-helper signature arguments 1))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;