From: David Kastrup <dak@gnu.org>
Date: Fri, 22 Mar 2013 10:25:15 +0000 (+0100)
Subject: Issue 3270: Allow unbraced forms of composed markup lists
X-Git-Tag: release/2.17.16-1~28
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6b592335270a7611578b2b801ddcc158781fd351;p=lilypond.git

Issue 3270: Allow unbraced forms of composed markup lists

Since composing markup lists may now work at run time, there is no
particular need for the associated syntactic restrictions.
---

diff --git a/lily/parser.yy b/lily/parser.yy
index d59d329c8e..62c97b7fdf 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -3306,7 +3306,11 @@ simple_markup_list:
 	markup_composed_list {
 		$$ = $1;
 	}
-	| markup_braced_list {
+	| markup_uncomposed_list
+	;
+
+markup_uncomposed_list:
+	markup_braced_list {
 		$$ = $1;
 	}
 	| markup_command_list {
@@ -3337,7 +3341,7 @@ markup_score:
 	;
 
 markup_composed_list:
-	markup_head_1_list markup_braced_list {
+	markup_head_1_list markup_uncomposed_list {
 		$$ = MAKE_SYNTAX ("composed-markup-list",
 				  @2, $1, $2);
 	}