X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmy-lily-lexer.cc;h=82948a3067447e6fe31c043f95d8257895575015;hb=59ed0cee2aae58a3f0483f21261c68aee406fa10;hp=c37ec26b09bace28f0921e693eb9f7699b81643b;hpb=106e5978fe2fa568bbc6649bc8fcf1134307373a;p=lilypond.git

diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc
index c37ec26b09..82948a3067 100644
--- a/lily/my-lily-lexer.cc
+++ b/lily/my-lily-lexer.cc
@@ -35,14 +35,16 @@ static Keyword_ent the_key_tab[]={
   {"grouping", GROUPING},
   {"header", HEADER},
   {"in", IN_T},
-  {"lyric", LYRIC},
+  {"lyrics", LYRICS},
   {"key", KEY},
   {"keysignature", KEYSIGNATURE},
   {"mark", MARK},
   {"musicalpitch", MUSICAL_PITCH},
   {"time", TIME_T},
+  {"times", TIMES},
   {"midi", MIDI},
   {"mm", MM_T},
+  {"name", NAME},
   {"notenames", NOTENAMES},
   {"notes" , NOTES},
   {"output", OUTPUT},
@@ -108,7 +110,11 @@ My_lily_lexer::start_main_input ()
 void
 My_lily_lexer::set_identifier (String name_str, Identifier* i, bool unique_b)
 {
-  Identifier *old = lookup_identifier (name_str);
+  Identifier *old =0;
+  if (scope_l_arr_.top ()->elem_b (name_str))
+    old = scope_l_arr_.top ()->elem(name_str);
+ 
+   
   if  (old)
     {
 #if 0