X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flexer.ll;h=b61c4c197553e7824110a8775b832bb9a9faeee2;hb=31653bf1d61a33ef8bc8c871d60c6b3452d04d28;hp=43fffba4849f405b0d1100f55d7055afc2f40fe4;hpb=4a8e84ba5dc1f8b71fda44b848b601349a80403a;p=lilypond.git

diff --git a/lily/lexer.ll b/lily/lexer.ll
index 43fffba484..b61c4c1975 100644
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -89,7 +89,6 @@ HORIZONTALWHITE		[ \t]
 BLACK		[^ \n\t\f\r]
 RESTNAME	[rs]
 NOTECOMMAND	\\{A}+
-ANDREWLYRICS		([^ \n\t\f\\{}<>0-9";.|]|\\[^a-zA-Z\]\[<>])[^0-9 \t\n\f]
 LYRICS		({AA}|{TEX})[^0-9 \t\n\f]*
 ESCAPED		[nt\\'"]
 PLET		\\\[
@@ -159,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