2003 -> 2004

[lilypond.git] / lily / parser.yy

diff --git a/lily/parser.yy b/lily/parser.yy
index de733ff58cf6bd8cec313eaa200959e06ed856a6..91e83eed8d936761bde937f54e32c9fae2616b96 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -5,7 +5,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>
            Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -1288,9 +1288,22 @@ chord_body_element:
                if ($2 % 2 || $3 % 2)
                        n->set_mus_property ("force-accidental", SCM_BOOL_T);
 
-               SCM arts = scm_reverse_x ($4, SCM_EOL);
-               n->set_mus_property ("articulations", arts);
+               if (gh_pair_p ($4)) {
+                       SCM arts = scm_reverse_x ($4, SCM_EOL);
+                       n->set_mus_property ("articulations", arts);
+               }
+               $$ = n;
+       }
+       | DRUM_PITCH post_events {
+               Music *n =  MY_MAKE_MUSIC("NoteEvent");
+               n->set_mus_property ("duration" ,$2);
+               n->set_mus_property ("drum-type" , $1);
+               n->set_spot (THIS->here_input());
 
+               if (gh_pair_p ($2)) {
+                       SCM arts = scm_reverse_x ($2, SCM_EOL);
+                       n->set_mus_property ("articulations", arts);
+               }
                $$ = n;
        }
        ;