* ly/engraver-init.ly (AncientRemoveEmptyStaffContext): move

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

diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc
index bd57eb0899ddb7e365d0d8f27d9ef4fabf7d1cd1..2a8d3e8cb567aadc936a2f4c7e2090c6a0e2e05e 100644 (file)
--- a/lily/my-lily-lexer.cc
+++ b/lily/my-lily-lexer.cc
@@ -38,6 +38,7 @@ static Keyword_ent the_key_tab[]={
   {"autochange", AUTOCHANGE},
   {"bar", BAR},
   {"breathe", BREATHE},
+  {"change", CHANGE},
   {"chordmodifiers", CHORDMODIFIERS},
   {"chords", CHORDS},
   {"clef", CLEF},
@@ -53,11 +54,13 @@ static Keyword_ent the_key_tab[]={
   {"header", HEADER},
   {"key", KEY},
   {"lyrics", LYRICS},
+  {"lyricsto", NEWADDLYRICS},
   {"mark", MARK},
   {"markup", MARKUP},
   {"midi", MIDI},
   {"name", NAME},
   {"new", NEWCONTEXT},
+  {"newpartcombine", NEWPARTCOMBINE},
   {"notes", NOTES},
   {"octave", OCTAVE},
   {"once", ONCE},
@@ -85,6 +88,7 @@ static Keyword_ent the_key_tab[]={
   {"transpose", TRANSPOSE},
   {"type", TYPE},
   {"unset", UNSET},
+  {"with", WITH},
   {0,0}
 };
 
@@ -161,12 +165,12 @@ My_lily_lexer::lookup_identifier (String s)
 void
 My_lily_lexer::start_main_input ()
 {  
-  new_input (main_input_string_, &global_input_file->sources_);
+  new_input (main_input_name_, &global_input_file->sources_);
   allow_includes_b_ = allow_includes_b_ &&  ! (safe_global_b);
 
   scm_module_define (gh_car (scopes_),
                     ly_symbol2scm ("input-file-name"),
-                    scm_makfrom0str (main_input_string_.to_str0()));
+                    scm_makfrom0str (main_input_name_.to_str0()));
 }
 
 void