Lily_lexer::scan_bare_word (): only check for chord modifiers in chordmode.

[lilypond.git] / lily / lexer.ll

diff --git a/lily/lexer.ll b/lily/lexer.ll
index ef419634bb44fb6d2a27a9255a0b0c63914efd86..47c39793364a086c000b15d057fe0a5c26dc47ba 100644 (file)
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -824,7 +824,8 @@ Lily_lexer::scan_bare_word (string str)
                        else if (scm_is_symbol (yylval.scm))
                            return DRUM_PITCH;
                }
-               else if ((handle = scm_hashq_get_handle (chordmodifier_tab_, sym))!= SCM_BOOL_F)
+               else if ((YYSTATE == chords)
+                       && (handle = scm_hashq_get_handle (chordmodifier_tab_, sym))!= SCM_BOOL_F)
                {
                    yylval.scm = scm_cdr (handle);
                    return CHORD_MODIFIER;