]> git.donarmstrong.com Git - lilypond.git/commitdiff
Bugfix: allow simple_string (ie, lyric strings too) for commands.
authorJan Nieuwenhuizen <janneke@gnu.org>
Mon, 19 Apr 2004 16:49:03 +0000 (16:49 +0000)
committerJan Nieuwenhuizen <janneke@gnu.org>
Mon, 19 Apr 2004 16:49:03 +0000 (16:49 +0000)
lily/parser.yy

index 45dc82358b61fffa7d590b3af736019052d7a943..41bb32f8689e0c0029bc382b0cb2ebef7fd66f55 100644 (file)
@@ -798,7 +798,7 @@ Alternative_music:
 
 
 Repeated_music:
-       REPEAT string bare_unsigned Music Alternative_music
+       REPEAT simple_string bare_unsigned Music Alternative_music
        {
                Music *beg = $4;
                int times = $3;
@@ -1012,14 +1012,14 @@ basic music objects too, since the meaning is different.
                scm_gc_unprotect_object ($2->self_scm ());
 #endif
        }
-       | CONTEXT string '=' string optional_context_mod Music {
+       | CONTEXT simple_string '=' simple_string optional_context_mod Music {
                $$ = context_spec_music ($2, $4, $6, $5);
 
        }
        | CONTEXT simple_string optional_context_mod Music {
                $$ = context_spec_music ($2, SCM_UNDEFINED, $4, $3);
        }
-       | NEWCONTEXT string optional_context_mod Music {
+       | NEWCONTEXT simple_string optional_context_mod Music {
                $$ = context_spec_music ($2, get_next_unique_context (), $4,
                        $3);
        }