release: 1.1.39

[lilypond.git] / lily / lexer.ll

diff --git a/lily/lexer.ll b/lily/lexer.ll
index dc409d288a4b5981a5ba2468a644e105f3c30618..e9a0c10371b4a4058317ea1056693b3e0dee2d5c 100644 (file)
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -92,7 +92,7 @@ RESTNAME      [rs]
 NOTECOMMAND    \\{A}+
 LYRICS         ({AA}|{TEX})[^0-9 \t\n\f]*
 ESCAPED                [nt\\'"]
-EXTENDER       [_][_]
+EXTENDER       __
 
 %%
 
@@ -180,13 +180,13 @@ EXTENDER  [_][_]
        cerr << _ ("missing end quote") << endl;
        exit (1);
 }
-<notes>{RESTNAME}      {
+<chords,notes>{RESTNAME}       {
        const char *s = YYText ();
        yylval.string = new String (s); 
        DOUT << "rest:"<< yylval.string;
        return RESTNAME;
 }
-<notes>R               {
+<chords,notes>R                {
        return MEASURES;
 }
 <INITIAL,chords,lyrics,notes>\\\${BLACK}*{WHITE}       {
@@ -294,6 +294,9 @@ EXTENDER    [_][_]
                yylval.i = String_convert::dec2_i (String (YYText ()));
                return UNSIGNED;
        }
+       \" {
+               start_quote ();
+       }
        . {
                return yylval.c = YYText ()[0];
        }