* input/regression/new-part-combine-solo.ly: more cases.

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

diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc
index 61da4ba258b33a4c5719352b5811ad416a29aba5..9eead743d750c6d0ad5cd0da2fb30d389057ac3c 100644 (file)
--- a/lily/my-lily-lexer.cc
+++ b/lily/my-lily-lexer.cc
@@ -54,12 +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},
-  {"newaddlyrics", NEWADDLYRICS},
+  {"newpartcombine", NEWPARTCOMBINE},
   {"notes", NOTES},
   {"octave", OCTAVE},
   {"once", ONCE},
@@ -112,7 +113,7 @@ My_lily_lexer::My_lily_lexer ()
 void
 My_lily_lexer::add_scope (SCM module)
 {
-  ly_reexport_module (scm_current_module());
+  ly_reexport_module (scm_current_module ());
   scm_set_current_module (module);
   for (SCM s = scopes_; gh_pair_p (s); s = gh_cdr (s))
     {
@@ -165,11 +166,11 @@ void
 My_lily_lexer::start_main_input ()
 {  
   new_input (main_input_name_, &global_input_file->sources_);
-  allow_includes_b_ = allow_includes_b_ &&  ! (safe_global_b);
+  allow_includes_b_ = allow_includes_b_ && ! safe_global_b;
 
   scm_module_define (gh_car (scopes_),
                     ly_symbol2scm ("input-file-name"),
-                    scm_makfrom0str (main_input_name_.to_str0()));
+                    scm_makfrom0str (main_input_name_.to_str0 ()));
 }
 
 void