patch::: 1.3.107.mb1: Re: lily 1.3.107

[lilypond.git] / lily / my-lily-lexer.cc

diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc
index 9020ae16590f1e81ce5b710369df54faa8fa71ec..44c2597ed73fb6489b4dda52f6183bc1d625515a 100644 (file)
--- a/lily/my-lily-lexer.cc
+++ b/lily/my-lily-lexer.cc
@@ -23,6 +23,8 @@
 #include "moment.hh"
 
 static Keyword_ent the_key_tab[]={
+  {"apply", APPLY},
+  {"arpeggio", ARPEGGIO },
   {"autochange", AUTOCHANGE},
   {"spanrequest", SPANREQUEST},
   {"commandspanrequest", COMMANDSPANREQUEST},  
@@ -40,7 +42,10 @@ static Keyword_ent the_key_tab[]={
   {"consists", CONSISTS},
   {"consistsend", CONSISTSEND},
   {"context", CONTEXT},
+  {"denies", DENIES},
   {"duration", DURATION},
+  {"dynamicscript", DYNAMICSCRIPT},
+  {"elementdescriptions", ELEMENTDESCRIPTIONS},
   {"font", FONT},
   {"grace", GRACE},
   {"header", HEADER},
@@ -57,6 +62,8 @@ static Keyword_ent the_key_tab[]={
   {"notenames", NOTENAMES},
   {"notes", NOTES},
   {"outputproperty", OUTPUTPROPERTY},
+  {"push", PUSH},
+  {"pop", POP},
   {"partial", PARTIAL},
   {"paper", PAPER},
   {"penalty", PENALTY},
@@ -66,8 +73,10 @@ static Keyword_ent the_key_tab[]={
   {"remove", REMOVE},
   {"repeat", REPEAT},
   {"addlyrics", ADDLYRICS},
+  {"partcombine", PARTCOMBINE},
   {"score", SCORE},
   {"script", SCRIPT},
+  {"stylesheet", STYLESHEET},
   {"skip", SKIP},
   {"textscript", TEXTSCRIPT},
   {"tempo", TEMPO},
@@ -98,8 +107,11 @@ My_lily_lexer::lookup_identifier (String s)
   SCM sym = ly_symbol2scm (s.ch_C());
   
   for (int i = scope_l_arr_.size (); i--; )
-    if (scope_l_arr_[i]->elem_b (sym))
-      return scope_l_arr_[i]->scm_elem(sym);
+    {
+      SCM val = SCM_UNSPECIFIED;
+      if (scope_l_arr_[i]->try_retrieve (sym, &val))
+       return val;
+    }
   return SCM_UNSPECIFIED;
 }