* lily/paper-outputter.cc (output_version): change "Lily was here"

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

diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc
index c1fe8e04b3a86aeb4c3dabf8e0debe87da71c44d..b3445a8a840df845466c0634c216bfc24061e8f8 100644 (file)
--- a/lily/my-lily-lexer.cc
+++ b/lily/my-lily-lexer.cc
@@ -26,6 +26,7 @@
 
 
 static Keyword_ent the_key_tab[]={
+  {"accacciatura", ACCACCIATURA},
   {"accepts", ACCEPTS},
   {"addlyrics", ADDLYRICS},
   {"alias", ALIAS},
@@ -33,6 +34,7 @@ static Keyword_ent the_key_tab[]={
   {"apply", APPLY},
   {"applycontext", APPLYCONTEXT},
   {"applyoutput", APPLYOUTPUT},
+  {"appoggiatura", APPOGGIATURA},
   {"autochange", AUTOCHANGE},
   {"bar", BAR},
   {"breathe", BREATHE},
@@ -56,7 +58,7 @@ static Keyword_ent the_key_tab[]={
   {"markup", MARKUP},
   {"midi", MIDI},
   {"name", NAME},
-  {"newcontext", NEWCONTEXT},
+  {"new", NEWCONTEXT},
   {"notes", NOTES},
   {"octave", OCTAVE},
   {"once", ONCE},
@@ -91,7 +93,13 @@ static Keyword_ent the_key_tab[]={
 
 My_lily_lexer::My_lily_lexer ()
 {
+  //  yy_flex_debug = 1;
+  
   keytable_ = new Keyword_table (the_key_tab);
+
+  chordmodifier_tab_ = scm_make_vector (gh_int2scm (1), SCM_EOL);
+  pitchname_tab_ = scm_make_vector (gh_int2scm (1), SCM_EOL);
+  
   scopes_ = SCM_EOL;
   
   add_scope(ly_make_anonymous_module());
@@ -234,21 +242,3 @@ My_lily_lexer::prepare_for_next_token ()
 {
   last_input_ = here_input();
 }
-
-#if 0
-SCM
-My_lily_lexer::scan_markup_word (String s)
-{
-  /*
-    TODO: better implementation:
-
-    - make a table of markup functions, for quicker lookup
-
-    - error handling.
-    
-   */
-  SCM s = scm_c_eval_str ((s + "-markup").to_str0());
-  yylval.scm = s;
-  return MARKUP_HEAD;
-}
-#endif