]> git.donarmstrong.com Git - lilypond.git/commitdiff
parser.yy: Allow a few more syntactic classes for Scheme arguments
authorDavid Kastrup <dak@gnu.org>
Tue, 18 Oct 2011 08:18:38 +0000 (10:18 +0200)
committerDavid Kastrup <dak@gnu.org>
Sat, 22 Oct 2011 11:18:20 +0000 (13:18 +0200)
lily/parser.yy

index 224f6f30a49464f19fe1dbc79a89fbd7f16e6ad5..756179233a9b4950dd2c9c78e24485bd753b82dd 100644 (file)
@@ -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 */