* lily/parser.yy (assignment_id): allow LYRICS_STRING as

[lilypond.git] / lily / parser.yy

diff --git a/lily/parser.yy b/lily/parser.yy
index 23407d253976af8013448c01ac24177fa48cd132..722f299c83cc05cd36c9aa02acd68dcec42c8bee 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -418,6 +418,7 @@ or
 %type <outputdef>      output_def_body output_def_head
 %type <outputdef> output_def paper_block 
 
+%type <scm>     assignment_id
 %type <scm>    Music_list
 %type <scm>    chord_body_elements
 %type <scm>    chord_item chord_items chord_separator new_chord
@@ -554,8 +555,13 @@ lilypond_header:
 /*
        DECLARATIONS
 */
+assignment_id:
+       STRING          { $$ = $1; }
+       | LYRICS_STRING { $$ = $1; }
+       ;
+
 assignment:
-       STRING '=' identifier_init  {
+       assignment_id '=' identifier_init  {
                if (! is_regular_identifier ($1))
                {
                        @1.warning (_ ("Identifier should have alphabetic characters only"));
@@ -1280,12 +1286,12 @@ re_rhythmed_music:
                $$ = all;
                scm_gc_unprotect_object (voice->self_scm ());
        }
-       | LYRICSTO {
+       | LYRICSTO simple_string {
                THIS->lexer_->push_lyric_state ();
-       } simple_string Music {
+       } Music {
                THIS->lexer_->pop_state ();
                Music *music = $4;
-               SCM name = $3;
+               SCM name = $2;
                $$ = make_lyric_combine_music (name, music);
                scm_gc_unprotect_object (music->self_scm ());
        }