release: 1.1.69

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

diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc
index 4d5a2a024c0bc0565bdadaa64f07521eb37829a9..91d2c5ce2d0940d8150a9bd4d71435b0ce1c5773 100644 (file)
--- a/lily/my-lily-lexer.cc
+++ b/lily/my-lily-lexer.cc
@@ -16,15 +16,18 @@
 #include "my-lily-lexer.hh"
 #include "debug.hh"
 #include "source-file.hh"
-#include "parseconstruct.hh"
 #include "main.hh"
 #include "scope.hh"
+#include "input.hh"
 
 static Keyword_ent the_key_tab[]={
-  {"absdynamic", ABSDYNAMIC},
+  {"spanrequest", SPANREQUEST},
+  {"simultaneous", SIMULTANEOUS},
+  {"sequential", SEQUENTIAL},
   {"accepts", ACCEPTS},
   {"alternative", ALTERNATIVE},
   {"bar", BAR},
+  {"breathe", BREATHE},
   {"cadenza", CADENZA},
   {"chordmodifiers", CHORDMODIFIERS},
   {"chords", CHORDS},
@@ -35,7 +38,7 @@ static Keyword_ent the_key_tab[]={
   {"context", CONTEXT},
   {"duration", DURATION},
   {"font", FONT},
-  {"grouping", GROUPING},
+  {"grace", GRACE},
   {"header", HEADER},
   {"in", IN_T},
   {"lyrics", LYRICS},
@@ -49,7 +52,7 @@ static Keyword_ent the_key_tab[]={
   {"mm", MM_T},
   {"name", NAME},
   {"notenames", NOTENAMES},
-  {"notes" , NOTES},
+  {"notes", NOTES},
   {"partial", PARTIAL},
   {"paper", PAPER},
   {"penalty", PENALTY},
@@ -58,13 +61,15 @@ static Keyword_ent the_key_tab[]={
   {"relative", RELATIVE},
   {"remove", REMOVE},
   {"repeat", REPEAT},
+  {"repetitions", REPETITIONS},
+  {"addlyrics", ADDLYRICS},
   {"scm", SCM_T},
   {"scmfile", SCMFILE},
   {"score", SCORE},
   {"script", SCRIPT},
   {"shape", SHAPE},
   {"skip", SKIP},
-  {"spandynamic", SPANDYNAMIC},
+  {"textscript", TEXTSCRIPT},
   {"tempo", TEMPO},
   {"translator", TRANSLATOR},
   {"transpose", TRANSPOSE},
@@ -143,6 +148,7 @@ My_lily_lexer::set_identifier (String name_str, Identifier* i, bool )
 
 My_lily_lexer::~My_lily_lexer()
 {
+  delete chordmodifier_tab_p_;
   delete keytable_p_;
   delete toplevel_scope_p_ ;
   delete note_tab_p_;
@@ -228,3 +234,10 @@ My_lily_lexer::escaped_char(char c) const
     }
   return 0;
 }
+
+Input
+My_lily_lexer::here_input () const
+{
+  Source_file * f_l= source_file_l();
+  return Input (f_l, here_ch_C());
+}