Allow \addlyrics to work with arbitrary contexts

[lilypond.git] / lily / parser.yy

diff --git a/lily/parser.yy b/lily/parser.yy
index 645b35b6ee04147cbd31a545638ea5bcd8c93b9a..388ce46e51a58ba9e44c5f4c794e94df0dc59f26 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -1455,7 +1455,11 @@ basic_music:
        | repeated_music
        | music_bare
        | LYRICSTO simple_string lyric_mode_music {
-               $$ = MAKE_SYNTAX ("lyric-combine", @$, $2, $3);
+               $$ = MAKE_SYNTAX ("lyric-combine", @$, $2, SCM_EOL, $3);
+       }
+       | LYRICSTO symbol '=' simple_string lyric_mode_music
+       {
+               $$ = MAKE_SYNTAX ("lyric_combine", @$, $3, $2, $4);
        }
        ;