release commit

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

diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc
index c4d69313c72a73a8fe95356ddfe3c5505d60e5de..8513720acb50223073064d5c022fb9d244c2f0d0 100644 (file)
--- 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--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include <ctype.h>
@@ -28,6 +28,8 @@
 static Keyword_ent the_key_tab[]={
   {"alias", ALIAS},
   {"apply", APPLY},
+  {"applycontext", APPLYCONTEXT},
+  {"applyoutput", APPLYOUTPUT},
   {"autochange", AUTOCHANGE},
   {"simultaneous", SIMULTANEOUS},
   {"sequential", SEQUENTIAL},
@@ -35,31 +37,29 @@ static Keyword_ent the_key_tab[]={
   {"alternative", ALTERNATIVE},
   {"bar", BAR},
   {"breathe", BREATHE},
-  {"char", CHAR_T},
   {"chordmodifiers", CHORDMODIFIERS},
   {"chords", CHORDS},
   {"clef", CLEF},
-  {"cm", CM_T},
   {"consists", CONSISTS},
   {"consistsend", CONSISTSEND},
   {"context", CONTEXT},
   {"default", DEFAULT},
   {"denies", DENIES},
+  {"description", DESCRIPTION},
   {"duration", DURATION},
   {"grobdescriptions", GROBDESCRIPTIONS},
   {"figures",FIGURES},
   {"grace", GRACE},
   {"header", HEADER},
-  {"in", IN_T},
   {"lyrics", LYRICS},
   {"key", KEY},
   {"mark", MARK},
+  {"markup", MARKUP},
   {"once", ONCE},
   {"pitch", PITCH},
   {"time", TIME_T},
   {"times", TIMES},
   {"midi", MIDI},
-  {"mm", MM_T},
   {"name", NAME},
   {"pitchnames", PITCHNAMES},
   {"notes", NOTES},
@@ -71,7 +71,6 @@ static Keyword_ent the_key_tab[]={
   {"partial", PARTIAL},
   {"paper", PAPER},
   {"property", PROPERTY},
-  {"pt", PT_T},
   {"relative", RELATIVE},
   {"remove", REMOVE},
   {"repeat", REPEAT},
@@ -148,7 +147,7 @@ My_lily_lexer::lookup_identifier (String s)
        return scm_variable_ref(var);
     }
 
-  return SCM_UNSPECIFIED;
+  return SCM_UNDEFINED;
 }
 
 void
@@ -229,3 +228,21 @@ 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