* lily/new-lyric-combine-music-iterator.cc (find_voice): allow

[lilypond.git] / lily / parser.yy

diff --git a/lily/parser.yy b/lily/parser.yy
index 49d14e13993d8e6d9338b30963d6a8e6cf7fc801..cfd64db5256cc785e49550897ec03b6037f8443b 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -1234,9 +1234,12 @@ re_rhythmed_music:
                $$ = all;
                scm_gc_unprotect_object ($1->self_scm ());
        }
-       | LYRICSTO string Music {
-               Music *music = $3;
-               SCM name = $2;
+       | LYRICSTO {
+               THIS->lexer_->push_lyric_state ();
+       } simple_string Music {
+               THIS->lexer_->pop_state ();
+               Music *music = $4;
+               SCM name = $3;
                $$ = make_lyric_combine_music (name, music);
                scm_gc_unprotect_object (music->self_scm ());
        }