Merge branch 'master' into translation

[lilypond.git] / lily / parser.yy

diff --git a/lily/parser.yy b/lily/parser.yy
index 83e95491c292f82fb79d4a3439c0947806d86bc5..d4ab27c2bb320b804e4b16862e2910da59298aa6 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -1614,7 +1614,7 @@ basic_music:
        }
        | LYRICSTO symbol '=' simple_string lyric_mode_music
        {
-               $$ = MAKE_SYNTAX (lyric_combine, @$, $3, $2, $4);
+               $$ = MAKE_SYNTAX (lyric_combine, @$, $4, $2, $5);
        }
        ;
 
@@ -2719,8 +2719,8 @@ context_mod:
        | context_def_mod embedded_scm
        {
                if (!scm_is_string ($2)
-                   && ly_symbol2scm ("consists") != $1
-                   && ly_symbol2scm ("remove") != $1)
+                   && !scm_is_eq ($1, ly_symbol2scm ("consists"))
+                   && !scm_is_eq ($1, ly_symbol2scm ("remove")))
                {
                        $$ = SCM_EOL;
                        parser->parser_error (@1, _ ("only \\consists and \\remove take non-string argument."));
@@ -3600,7 +3600,7 @@ lyric_element:
        }
        | STRING {
                if (!parser->lexer_->is_lyric_state ())
-                       parser->parser_error (@1, _ ("unrecognized string, not in text script or \\lyricmode"));
+                       parser->parser_error (@1, _f ("not a note name: %s", ly_scm2string ($1)));
                $$ = $1;
        }
        | LYRIC_ELEMENT