release: 1.0.10

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

diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc
index 869d5527bd81098aca03a036a5649eb9f5e76451..1ae47c5057a30d83637573c0725d849deffb70ac 100644 (file)
--- a/lily/my-lily-lexer.cc
+++ b/lily/my-lily-lexer.cc
@@ -27,27 +27,24 @@ static Keyword_ent the_key_tab[]={
   {"accepts", ACCEPTS},
   {"bar", BAR},
   {"cadenza", CADENZA},
-  {"clear", CLEAR},
   {"clef", CLEF},
   {"cm", CM_T},
   {"consists", CONSISTS},
-  {"contains", CONTAINS},
   {"duration", DURATION},
   {"font", FONT},
   {"grouping", GROUPING},
+  {"header", HEADER},
   {"in", IN_T},
   {"lyric", LYRIC},
   {"key", KEY},
   {"keysignature", KEYSIGNATURE},
   {"mark", MARK},
-  {"melodic" , MELODIC},
   {"musicalpitch", MUSICAL_PITCH},
   {"time", TIME_T},
   {"midi", MIDI},
   {"mm", MM_T},
-  {"multi", MULTI},
-  {"header", HEADER},
   {"notenames", NOTENAMES},
+  {"notes" , NOTES},
   {"octave", OCTAVE},
   {"output", OUTPUT},
   {"partial", PARTIAL},
@@ -60,7 +57,6 @@ static Keyword_ent the_key_tab[]={
   {"script", SCRIPT},
   {"shape", SHAPE},
   {"skip", SKIP},
-  {"staff", STAFF},
   {"table", TABLE},
   {"spandynamic", SPANDYNAMIC},
   {"symboltables", SYMBOLTABLES},
@@ -180,10 +176,10 @@ My_lily_lexer::add_notename (String s, Musical_pitch p)
 }
 
 void
-My_lily_lexer::clear_notenames()
+My_lily_lexer::set_notename_table(Notename_table *p)
 {
   delete note_tab_p_;
-  note_tab_p_ = new Notename_table;
+  note_tab_p_ = p;
 }
 
 char