Index: lily/parser.yy
===================================================================
RCS file: /sources/lilypond/lilypond/lily/parser.yy,v
retrieving revision 1.517
diff -u -r1.517 parser.yy
--- lily/parser.yy	13 Jun 2006 22:01:19 -0000	1.517
+++ lily/parser.yy	19 Jun 2006 22:04:17 -0000
@@ -262,7 +262,7 @@
 %token <scm> CONTEXT_DEF_IDENTIFIER
 %token <scm> DRUM_PITCH
 %token <scm> DURATION_IDENTIFIER
-%token <scm> EVENT_IDENTIFIER
+%token <scm> ARTICULATION_IDENTIFIER
 %token <scm> FRACTION
 %token <scm> LYRICS_STRING
 %token <scm> LYRIC_MARKUP_IDENTIFIER
@@ -1624,7 +1624,7 @@
 		m->set_spot (@$);
 		$$ = m->unprotect ();
 	}
-	| EVENT_IDENTIFIER	{
+	| ARTICULATION_IDENTIFIER	{
 		$$ = $1;
 	}
 	| tremolo_type  {
@@ -2392,10 +2392,10 @@
 		unsmob_music (*destination)->
 			set_property ("origin", make_input (last_input_));
 
-		bool is_event = scm_memq (ly_symbol2scm ("event"), mus->get_property ("types"))
+		bool is_articulation = scm_memq (ly_symbol2scm ("articulation-event"), mus->get_property ("types"))
 			!= SCM_BOOL_F;
 
-		return is_event ? EVENT_IDENTIFIER : MUSIC_IDENTIFIER;
+		return is_articulation ? ARTICULATION_IDENTIFIER : MUSIC_IDENTIFIER;
 	} else if (unsmob_duration (sid)) {
 		*destination = unsmob_duration (sid)->smobbed_copy ();
 		return DURATION_IDENTIFIER;