X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparser.yy;h=7c04cb0c262f46160f64e10044a6a2f92f29eb55;hb=7dcae7597fae14ce5c4e2e7d50c2709d162b7332;hp=1d54ba97601290bdb5da524b8be090286f9080f0;hpb=1069c441b69b7d48f0d90ec28a03d611b165509a;p=lilypond.git diff --git a/lily/parser.yy b/lily/parser.yy index 1d54ba9760..7c04cb0c26 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -800,15 +800,6 @@ output_def_body: | output_def_body context_def_spec_block { assign_context_def ($$, $2); } - | output_def_body tempo_event { - /* - junk this ? there already is tempo stuff in - music. - */ - int m = scm_to_int (unsmob_music($2)->get_property ("metronome-count")); - Duration *d = unsmob_duration (unsmob_music($2)->get_property ("tempo-unit")); - set_tempo ($$, d->get_length (), m); - } | output_def_body error { } @@ -816,11 +807,8 @@ output_def_body: tempo_event: TEMPO steno_duration '=' bare_unsigned { - Music *m = MY_MAKE_MUSIC ("MetronomeChangeEvent"); - m->set_property ("tempo-unit", $2); - m->set_property ("metronome-count", scm_from_int ( $4)); - $$ = m->unprotect (); - } + $$ = MAKE_SYNTAX ("tempo", @$, $2, scm_int2num ($4)); + } ; /*