X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmy-lily-lexer.cc;h=30b4afd7dde561361f83513d2dc91e8e642fead7;hb=304b5f3aa7eee7b0ff8d4ba7526a1410735f6e74;hp=b2f154f92c71d1556a83edce328a927625cb859e;hpb=196bdae43d1d4f13a3080dbb5e5b4dd07f92cb51;p=lilypond.git

diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc
index b2f154f92c..30b4afd7dd 100644
--- a/lily/my-lily-lexer.cc
+++ b/lily/my-lily-lexer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include <ctype.h>
@@ -26,9 +26,10 @@
 
 
 static Keyword_ent the_key_tab[]={
-  {"acciaccatura", ACCIACATURA},
+  {"acciaccatura", ACCIACCATURA},
   {"accepts", ACCEPTS},
   {"addlyrics", ADDLYRICS},
+  {"addquote", ADDQUOTE},
   {"alias", ALIAS},
   {"alternative", ALTERNATIVE},
   {"apply", APPLY},
@@ -38,7 +39,7 @@ static Keyword_ent the_key_tab[]={
   {"autochange", AUTOCHANGE},
   {"bar", BAR},
   {"breathe", BREATHE},
-  {"chordmodifiers", CHORDMODIFIERS},
+  {"change", CHANGE},
   {"chords", CHORDS},
   {"clef", CLEF},
   {"consists", CONSISTS},
@@ -46,14 +47,15 @@ static Keyword_ent the_key_tab[]={
   {"context", CONTEXT},
   {"default", DEFAULT},
   {"denies", DENIES},
+  {"drums", DRUMS},
   {"description", DESCRIPTION},
-  {"duration", DURATION},
   {"figures",FIGURES},
   {"grace", GRACE},
   {"grobdescriptions", GROBDESCRIPTIONS},
   {"header", HEADER},
   {"key", KEY},
   {"lyrics", LYRICS},
+  {"lyricsto", NEWADDLYRICS},
   {"mark", MARK},
   {"markup", MARKUP},
   {"midi", MIDI},
@@ -62,14 +64,11 @@ static Keyword_ent the_key_tab[]={
   {"notes", NOTES},
   {"octave", OCTAVE},
   {"once", ONCE},
-  {"outputproperty", OUTPUTPROPERTY},
   {"override", OVERRIDE},
   {"paper", PAPER},
   {"partcombine", PARTCOMBINE},
   {"partial", PARTIAL},
-  {"pitch", PITCH},
-  {"pitchnames", PITCHNAMES},
-  {"property", PROPERTY},
+  {"quote", QUOTE},
   {"relative", RELATIVE},
   {"remove", REMOVE},
   {"repeat", REPEAT},
@@ -84,10 +83,11 @@ static Keyword_ent the_key_tab[]={
   {"tempo", TEMPO},
   {"time", TIME_T},
   {"times", TIMES},
-  {"translator", TRANSLATOR},
   {"transpose", TRANSPOSE},
+  {"transposition", TRANSPOSITION},
   {"type", TYPE},
   {"unset", UNSET},
+  {"with", WITH},
   {0,0}
 };
 
@@ -99,11 +99,11 @@ My_lily_lexer::My_lily_lexer ()
   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);
+  pitchname_tab_stack_ = SCM_EOL; 
   
   scopes_ = SCM_EOL;
   
-  add_scope(ly_make_anonymous_module());
+  add_scope (ly_make_anonymous_module ());
   errorlevel_ =0; 
 
   main_input_b_ = false;
@@ -112,7 +112,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))
     {
@@ -124,7 +124,7 @@ My_lily_lexer::add_scope (SCM module)
 						 gh_car (s), SCM_UNDEFINED),
 			     SCM_UNDEFINED);
       
-      scm_primitive_eval(expr);
+      scm_primitive_eval (expr);
     }
   
   scopes_ = scm_cons (module, scopes_);
@@ -155,7 +155,7 @@ My_lily_lexer::lookup_identifier (String s)
     {
       SCM var = ly_module_lookup (gh_car (s), sym);
       if (var != SCM_BOOL_F)
-	return scm_variable_ref(var);
+	return scm_variable_ref (var);
     }
 
   return SCM_UNDEFINED;
@@ -164,12 +164,12 @@ My_lily_lexer::lookup_identifier (String s)
 void
 My_lily_lexer::start_main_input ()
 {  
-  new_input (main_input_string_, &global_input_file->sources_);
-  allow_includes_b_ = allow_includes_b_ &&  ! (safe_global_b);
+  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
@@ -201,7 +201,7 @@ My_lily_lexer::~My_lily_lexer ()
 void
 My_lily_lexer::LexerError (char const *s)
 {
-  if (include_stack_.empty ())
+  if (include_stack_.is_empty ())
     {
       progress_indication (_f ("error at EOF: %s", s)+ String ("\n"));
     }
@@ -241,5 +241,5 @@ My_lily_lexer::here_input () const
 void
 My_lily_lexer::prepare_for_next_token ()
 {
-  last_input_ = here_input();
+  last_input_ = here_input ();
 }