* lily/parser.yy: get rid off < > in markups by treating { } as

[lilypond.git] / lily / lexer.ll

diff --git a/lily/lexer.ll b/lily/lexer.ll
index 9c734e87dd8a8636b6dbefe1bad88e3d4134dafd..b0d9d9f051b5323826665fc60071a5b3b60243eb 100644 (file)
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -164,7 +164,7 @@ HYPHEN              --
   }
 }
 
-<INITIAL,notes>\\encoding{WHITE}* {
+<INITIAL,lyrics,figures,notes>\\encoding{WHITE}* {
        yy_push_state (encoding);
 }
 <INITIAL,chords,lyrics,notes,figures>\\version{WHITE}* {
@@ -243,16 +243,14 @@ HYPHEN            --
 <INITIAL,chords,lyrics,figures,notes>\\include           {
        yy_push_state (incl);
 }
-<incl>\"[^"]*\";?   { /* got the include file name */
-/* FIXME: semicolon? */
+<incl>\"[^"]*\"   { /* got the include file name */
        String s (YYText ()+1);
        s = s.left_string (s.index_last ('"'));
 
        new_input (s, sources_);
        yy_pop_state ();
 }
-<incl>\\{BLACK}*;?{WHITE} { /* got the include identifier */
-/* FIXME: semicolon? */
+<incl>\\{BLACK}*{WHITE} { /* got the include identifier */
        String s = YYText () + 1;
        strip_trailing_white (s);
        if (s.length () && (s[s.length () - 1] == ';'))
@@ -356,7 +354,6 @@ HYPHEN              --
                yylval.i = String_convert::dec2int (String (YYText () +1));
                return E_UNSIGNED;
        }
-
        \" {
                start_quote ();
        }
@@ -488,12 +485,6 @@ HYPHEN             --
        \" {
                start_quote ();
        }
-       \< {
-               return '<';
-       }
-       \> {
-               return '>';
-       }
        \\score {
                return SCORE;
        }