X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Flexer.ll;h=e2de809d0196bf0bbaad96d5c101fc2377963f9f;hb=b43244dd4eeca1a96e0cdb258231ef0b6cca1a8f;hp=3d2a87f6012c52b99cfeccfc0520e44d4e571a9c;hpb=c64a05795e51367c17589a9e7d60bad426305159;p=lilypond.git

diff --git a/lily/lexer.ll b/lily/lexer.ll
index 3d2a87f601..e2de809d01 100644
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -92,9 +92,7 @@ RESTNAME	[rs]
 NOTECOMMAND	\\{A}+
 LYRICS		({AA}|{TEX})[^0-9 \t\n\f]*
 ESCAPED		[nt\\'"]
-PLET		\\\[
-TELP		\\\]
-EXTENDER	[_][_]
+EXTENDER	__
 
 %%
 
@@ -341,14 +339,6 @@ EXTENDER	[_][_]
 	return c;
 }
 
-<lyrics,notes>{PLET}	{
-	return yylval.i = PLET;
-}
-
-<lyrics,notes>{TELP}	{
-	return yylval.i = TELP;
-}
-
 <INITIAL,notes>.	{
 	return yylval.c = YYText ()[0];
 }
@@ -443,7 +433,7 @@ My_lily_lexer::scan_bare_word (String str)
 		    yylval.pitch = new Musical_pitch (lookup_notename (str));
 		    yylval.pitch->set_spot (Input (source_file_l (), 
 		      here_ch_C ()));
-		    return NOTENAME_PITCH;
+                    return (YYSTATE == notes) ? NOTENAME_PITCH : TONICNAME_PITCH;
 		} else if (chordmodifier_b (str)) {
 		    DOUT << "(chordmodifier)\n";
 		    yylval.pitch = new Musical_pitch (lookup_chordmodifier (str));