From: David Kastrup <dak@gnu.org>
Date: Sun, 16 Sep 2012 17:10:26 +0000 (+0200)
Subject: Issue 2840: Allow closed music function calls in closed music.
X-Git-Tag: release/2.17.6-1~46^2~3^2~17
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b006d77ef45cc7c73826dddcb8530f7bfa86fd25;p=lilypond.git

Issue 2840: Allow closed music function calls in closed music.

This fixes hard to understand restrictions when combining music
function calls with post-events.
---

diff --git a/lily/parser.yy b/lily/parser.yy
index b7d9df1214..020a998886 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -516,7 +516,7 @@ If we give names, Bison complains.
 %type <scm> mode_changing_head
 %type <scm> mode_changing_head_with_context
 %type <scm> multiplied_duration
-%type <scm> music_function_event
+%type <scm> music_function_call_closed
 %type <scm> music_function_chord_body
 %type <scm> new_chord
 %type <scm> new_lyrics
@@ -1328,6 +1328,7 @@ closed_music:
 	{
 		$$ = FINISH_MAKE_SYNTAX ($1, @$, $2);
 	}
+	| music_function_call_closed
 	;
 
 music_bare:
@@ -2275,7 +2276,7 @@ music_function_chord_body:
 // with the last argument of the event function or with the expression
 // for which the function call acts itself as event.
 
-music_function_event:
+music_function_call_closed:
 	MUSIC_FUNCTION function_arglist_closed {
 		$$ = MAKE_SYNTAX ("music-function", @$,
 					 $1, $2);
@@ -2346,7 +2347,7 @@ post_event_nofinger:
 	direction_less_event {
 		$$ = $1;
 	}
-	| script_dir music_function_event {
+	| script_dir music_function_call_closed {
 		$$ = $2;
 		if ($1)
 		{