* lily/script-engraver.cc (make_script_from_event): don't crash on

[lilypond.git] / lily / lexer.ll

diff --git a/lily/lexer.ll b/lily/lexer.ll
index fe914c85fa98c378eef6a283cd7ef9af047efd60..c658e7bf8acfe3de6b2fe13fa4292239840dfe8b 100644 (file)
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -132,7 +132,7 @@ BLACK               [^ \n\t\f\r]
 RESTNAME       [rs]
 NOTECOMMAND    \\{A}+
 MARKUPCOMMAND  \\({A}|[-_])+
-LYRICS         ({AA}|{TEX})[^0-9 \t\n\f]*
+LYRICS         ({AA}|{TEX})[^0-9 \t\n\r\f]*
 ESCAPED                [nt\\'"]
 EXTENDER       __
 HYPHEN         --
@@ -147,13 +147,13 @@ HYPHEN            --
   "%{" {
        yy_push_state (longcomment);
   }
-  %[^{\n].*\n  {
+  %[^{\n\r].*[\n\r]    {
   }
-  %[^{\n]      { // backup rule
+  %[^{\n\r]    { // backup rule
   }
-  %\n  {
+  %[\n\r]      {
   }
-  %[^{\n].*    {
+  %[^{\n\r].*  {
   }
   {WHITE}+     {
 
@@ -508,7 +508,7 @@ HYPHEN              --
        [{}]    {
                return YYText()[0];
        }
-       [^#{}"\\ \t\n\f]+ {
+       [^#{}"\\ \t\n\r\f]+ {
                String s (YYText ()); 
 
                char c = s[s.length () - 1];