From: David Kastrup <dak@gnu.org>
Date: Tue, 18 Oct 2011 08:18:38 +0000 (+0200)
Subject: parser.yy: Allow a few more syntactic classes for Scheme arguments
X-Git-Tag: release/2.15.15-1~6
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f38075180844255b6e0c01fcb8027e98d002e938;p=lilypond.git

parser.yy: Allow a few more syntactic classes for Scheme arguments
---

diff --git a/lily/parser.yy b/lily/parser.yy
index 224f6f30a4..756179233a 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -59,6 +59,7 @@ or
 %right FUNCTION_ARGUMENTS
       MARKUP LYRICS_STRING MARKUP_IDENTIFIER STRING STRING_IDENTIFIER
       MARKUPLINES WITH CONTEXT_MOD_IDENTIFIER MARKUPLINES_IDENTIFIER
+      SCORE BOOK BOOKPART PAPER LAYOUT MIDI
       SEQUENTIAL SIMULTANEOUS DOUBLE_ANGLE_OPEN MUSIC_IDENTIFIER '{'
       PITCH_IDENTIFIER NOTENAME_PITCH TONICNAME_PITCH
       SCM_FUNCTION SCM_IDENTIFIER SCM_TOKEN
@@ -595,6 +596,27 @@ embedded_scm_bare_arg:
 	| full_markup
 	| full_markup_list
 	| context_modification
+	| score_block
+	{
+		$$ = $1->self_scm ();
+		$1->unprotect ();
+	}
+	| context_def_spec_block
+	| book_block
+	{
+		$$ = $1->self_scm ();
+		$1->unprotect ();
+	}
+	| bookpart_block
+	{
+		$$ = $1->self_scm ();
+		$1->unprotect ();
+	}
+	| output_def
+	{
+		$$ = $1->self_scm ();
+		$1->unprotect ();
+	}
 	;
 
 /* The generic version may end in music, or not */