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 a3dc6043aca070ade02c649293d54baa3a82fa0d..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},  
@@ -42,6 +44,8 @@ static Keyword_ent the_key_tab[]={
   {"context", CONTEXT},
   {"denies", DENIES},
   {"duration", DURATION},
+  {"dynamicscript", DYNAMICSCRIPT},
+  {"elementdescriptions", ELEMENTDESCRIPTIONS},
   {"font", FONT},
   {"grace", GRACE},
   {"header", HEADER},
@@ -58,8 +62,6 @@ static Keyword_ent the_key_tab[]={
   {"notenames", NOTENAMES},
   {"notes", NOTES},
   {"outputproperty", OUTPUTPROPERTY},
-  {"pushproperty", PUSHPROPERTY},
-  {"popproperty", POPPROPERTY},
   {"push", PUSH},
   {"pop", POP},
   {"partial", PARTIAL},
@@ -74,6 +76,7 @@ static Keyword_ent the_key_tab[]={
   {"partcombine", PARTCOMBINE},
   {"score", SCORE},
   {"script", SCRIPT},
+  {"stylesheet", STYLESHEET},
   {"skip", SKIP},
   {"textscript", TEXTSCRIPT},
   {"tempo", TEMPO},
@@ -104,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;
 }