* input/regression/new-markup-scheme.ly: oops. font-family=music

[lilypond.git] / lily / lexer.ll

diff --git a/lily/lexer.ll b/lily/lexer.ll
index d0a2dc50f01a2285bde30c5b603e14357f2cf00d..b4049350e15da715d5b6031ff4b4b258c78e33d8 100644 (file)
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -101,7 +101,6 @@ SCM (* scm_parse_error_handler) (void *);
 %option warn
 
 %x chords
-%x encoding
 %x figures
 %x incl
 %x lyrics
@@ -164,21 +163,12 @@ HYPHEN            --
   }
 }
 
-<INITIAL,lyrics,figures,notes>\\encoding{WHITE}* {
-       yy_push_state (encoding);
-}
 <INITIAL,chords,lyrics,notes,figures>\\version{WHITE}* {
        yy_push_state (version);
 }
 <INITIAL,chords,lyrics,notes,figures>\\renameinput{WHITE}*     {
        yy_push_state (renameinput);
 }
-<encoding>\"[^"]*\"     {
-       String s (YYText () + 1);
-       s = s.left_string (s.index_last ('\"'));
-       set_encoding (s);
-       yy_pop_state ();
-}
 <version>\"[^"]*\"     { /* got the version number */
        String s (YYText () + 1);
        s = s.left_string (s.index_last ('\"'));
@@ -204,10 +194,6 @@ HYPHEN             --
                     scm_makfrom0str (s.to_str0 ()));
 
 }
-<encoding>.    {
-       LexerError (_ ("No quoted string found after \\encoding").to_str0 ());
-       yy_pop_state ();
-}
 <version>.     {
        LexerError (_ ("No quoted string found after \\version").to_str0 ());
        yy_pop_state ();