X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparser.yy;h=0bb4c152f273455dd1e02f201803e66d8eeaa685;hb=5b7dd34a8b708432c2c44bd6a8ef2121ca0c0f6a;hp=240a4c1e3b2086c29494df7e1b3816729bf7bae5;hpb=2613eed0a13ce118cb11f83057d9d79fc6973a4e;p=lilypond.git diff --git a/lily/parser.yy b/lily/parser.yy index 240a4c1e3b..0bb4c152f2 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -912,19 +912,13 @@ output_def_body: tempo_event: TEMPO steno_duration '=' tempo_range { - $$ = MAKE_SYNTAX ("tempo", @$, SCM_BOOL_F, $2, $4); + $$ = MAKE_SYNTAX ("tempo", @$, SCM_EOL, $2, $4); } - | TEMPO string steno_duration '=' tempo_range { - $$ = MAKE_SYNTAX ("tempo", @$, make_simple_markup($2), $3, $5); - } - | TEMPO full_markup steno_duration '=' tempo_range { + | TEMPO scalar steno_duration '=' tempo_range { $$ = MAKE_SYNTAX ("tempo", @$, $2, $3, $5); } - | TEMPO string { - $$ = MAKE_SYNTAX ("tempoText", @$, make_simple_markup($2) ); - } - | TEMPO full_markup { - $$ = MAKE_SYNTAX ("tempoText", @$, $2 ); + | TEMPO scalar { + $$ = MAKE_SYNTAX ("tempo", @$, $2); } ;