]> git.donarmstrong.com Git - lilypond.git/commitdiff
Issue 3270: Allow unbraced forms of composed markup lists
authorDavid Kastrup <dak@gnu.org>
Fri, 22 Mar 2013 10:25:15 +0000 (11:25 +0100)
committerDavid Kastrup <dak@gnu.org>
Sat, 6 Apr 2013 06:52:41 +0000 (08:52 +0200)
Since composing markup lists may now work at run time, there is no
particular need for the associated syntactic restrictions.

lily/parser.yy

index d59d329c8e6c59689ece7d1352c5278ca695f4ce..62c97b7fdf284280f6e4d3cd43f02cca38cbd115 100644 (file)
@@ -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);
        }