release: 1.1.1

[lilypond.git] / lily / lexer.ll

diff --git a/lily/lexer.ll b/lily/lexer.ll
index 91363bcc8d7047f0ea8bbe8de4c36f8b9137d652..b61c4c197553e7824110a8775b832bb9a9faeee2 100644 (file)
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -4,7 +4,7 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1996,1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996,1997 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -45,6 +45,12 @@ void strip_leading_white (String&);
 #define yylval (*(YYSTYPE*)lexval_l)
 
 #define YY_USER_ACTION add_lexed_char (YYLeng ());
+/*
+
+LYRICS         ({AA}|{TEX})[^0-9 \t\n\f]*
+
+*/
+
 %}
 
 %option c++
@@ -152,10 +158,10 @@ TELP              \\\]
        Identifier * id = lookup_identifier (s);
        if (id) 
          {
-           String* s_p = id->access_String ();
-           DOUT << "#include `" << *s_p << "\'\n";
-           new_input (*s_p, source_global_l);
-           delete s_p;
+           String* s_l = id->access_content_String (false);
+           DOUT << "#include `" << *s_l << "\'\n";
+           new_input (*s_l, source_global_l);
+
            yy_pop_state ();
          }
        else