* scripts/convert-ly.py (FatalConversionError.figures_replace):

[lilypond.git] / lily / lexer.ll

diff --git a/lily/lexer.ll b/lily/lexer.ll
index 7cf2e195d2093acb97e040019cc6a112300cdd35..fe914c85fa98c378eef6a283cd7ef9af047efd60 100644 (file)
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -312,12 +312,12 @@ HYPHEN            --
        yylval.scm = sval;
        return SCM_T;
 }
-<INITIAL,notes,markup>{ 
+<INITIAL,notes,lyrics>{ 
        \<\<   {
-               return CHORD_OPEN;
+               return LESSLESS;
        }
        \>\>   {
-               return CHORD_CLOSE;
+               return MOREMORE;
        }
 }
 <figures>{
@@ -468,6 +468,12 @@ HYPHEN             --
        \" {
                start_quote ();
        }
+       \< {
+               return '<';
+       }
+       \> {
+               return '>';
+       }
        {MARKUPCOMMAND} {
                String str (YYText() + 1);
                SCM s = lookup_markup_command (str);