Fix 1112.

[lilypond.git] / lily / parser.yy

diff --git a/lily/parser.yy b/lily/parser.yy
index 41e5080f9854651069dcf7c9ef0c798d0b318716..a9d8938889185e76b9b8c1537e0f9ef4555f3aaf 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -199,7 +199,6 @@ void set_music_properties (Music *p, SCM a);
 %token MIDI "\\midi"
 %token NAME "\\name"
 %token NOTEMODE "\\notemode"
-%token OBJECTID "\\objectid"
 %token OCTAVE "\\octave"
 %token ONCE "\\once"
 %token OVERRIDE "\\override"
@@ -272,6 +271,7 @@ If we give names, Bison complains.
 %token <i> EXPECT_MARKUP;
 %token <i> EXPECT_MUSIC;
 %token <i> EXPECT_SCM;
+%token <i> EXPECT_MARKUP_LIST
 /* After the last argument. */
 %token <i> EXPECT_NO_MORE_ARGS;
 
@@ -287,22 +287,8 @@ If we give names, Bison complains.
 %token <scm> FRACTION
 %token <scm> LYRICS_STRING
 %token <scm> LYRIC_MARKUP_IDENTIFIER
-%token <scm> MARKUP_HEAD_EMPTY
-%token <scm> MARKUP_HEAD_LIST0
-%token <scm> MARKUP_HEAD_MARKUP0
-%token <scm> MARKUP_HEAD_MARKUP0_MARKUP1
-%token <scm> MARKUP_HEAD_SCM0
-%token <scm> MARKUP_HEAD_SCM0_MARKUP1
-%token <scm> MARKUP_HEAD_SCM0_SCM1
-%token <scm> MARKUP_HEAD_SCM0_SCM1_MARKUP2
-%token <scm> MARKUP_HEAD_SCM0_SCM1_MARKUP2_MARKUP3
-%token <scm> MARKUP_HEAD_SCM0_MARKUP1_MARKUP2
-%token <scm> MARKUP_HEAD_SCM0_SCM1_SCM2
-%token <scm> MARKUP_LIST_HEAD_EMPTY
-%token <scm> MARKUP_LIST_HEAD_LIST0
-%token <scm> MARKUP_LIST_HEAD_SCM0
-%token <scm> MARKUP_LIST_HEAD_SCM0_LIST1
-%token <scm> MARKUP_LIST_HEAD_SCM0_SCM1_LIST2
+%token <scm> MARKUP_FUNCTION
+%token <scm> MARKUP_LIST_FUNCTION
 %token <scm> MARKUP_IDENTIFIER
 %token <scm> MUSIC_FUNCTION
 %token <scm> MUSIC_IDENTIFIER
@@ -414,6 +400,8 @@ If we give names, Bison complains.
 %type <scm> markup_braced_list_body
 %type <scm> markup_composed_list
 %type <scm> markup_command_list
+%type <scm> markup_command_list_arguments
+%type <scm> markup_command_basic_arguments
 %type <scm> markup_head_1_item
 %type <scm> markup_head_1_list
 %type <scm> markup_list
@@ -429,7 +417,6 @@ If we give names, Bison complains.
 %type <scm> number_expression
 %type <scm> number_factor
 %type <scm> number_term
-%type <scm> object_id_setting
 %type <scm> octave_check
 %type <scm> optional_context_mod
 %type <scm> optional_id
@@ -478,10 +465,6 @@ lilypond:  /* empty */
        ;
 
 
-object_id_setting:
-       OBJECTID STRING { $$ = $2; }
-       ;
-
 toplevel_expression:
        lilypond_header {
                PARSER->lexer_->set_identifier (ly_symbol2scm ("$defaultheader"), $1);
@@ -748,9 +731,6 @@ book_body:
                $$->scores_ = SCM_EOL;
                $$->bookparts_ = SCM_EOL;
        }
-       | book_body object_id_setting {
-               $$->user_key_ = ly_scm2string ($2);
-       }
        ;
 
 bookpart_block:
@@ -802,9 +782,6 @@ bookpart_body:
                $$->paper_ = 0;
                $$->scores_ = SCM_EOL;
        }
-       | bookpart_body object_id_setting {
-               $$->user_key_ = ly_scm2string ($2);
-       }
        ;
 
 score_block:
@@ -829,9 +806,6 @@ score_body:
                $$->protect ();
                $$->origin ()->set_spot (@$);
        }
-       | score_body object_id_setting {
-               $$->user_key_ = ly_scm2string ($2);
-       }
        | score_body lilypond_header    {
                $$->set_header ($2);
        }
@@ -1092,7 +1066,7 @@ function_scm_argument:
        ;
 
 /* An argument list. If a function \foo expects scm scm music, then the lexer expands \foo into the token sequence:
- MUSIC_FUNCTION EXPECT_MUSIC EXPECT_SCM EXPECT_SCM
+ MUSIC_FUNCTION EXPECT_MUSIC EXPECT_SCM EXPECT_SCM EXPECT_NO_MORE_ARGS
 and this rule returns the reversed list of arguments. */
 
 function_arglist_music_last:
@@ -1495,12 +1469,13 @@ event_chord:
                $$ = MAKE_SYNTAX ("repetition-chord", i,
                                  PARSER->lexer_->chord_repetition_.last_chord_,
                                  PARSER->lexer_->chord_repetition_.repetition_function_,
-                                 $2, $3);
+                                 $2, scm_reverse_x ($3, SCM_EOL));
        }
        | MULTI_MEASURE_REST optional_notemode_duration post_events {
                Input i;
                i.set_location (@1, @3);
-               $$ = MAKE_SYNTAX ("multi-measure-rest", i, $2, $3);
+               $$ = MAKE_SYNTAX ("multi-measure-rest", i, $2,
+                                 scm_reverse_x ($3, SCM_EOL));
        }
        | command_element
        /* note chord elements are memorized into
@@ -2465,37 +2440,38 @@ markup_braced_list_body:
                $$ = scm_cons ($2, $1);
        }
        | markup_braced_list_body markup_list {
-               $$ = scm_append_x (scm_list_2 (scm_reverse_x ($2, SCM_EOL), $1));
+               $$ = scm_reverse_x ($2, $1);
        }
        ;
 
 markup_command_list:
-       MARKUP_LIST_HEAD_EMPTY  {
-               $$ = scm_list_1 ($1);
+       MARKUP_LIST_FUNCTION markup_command_list_arguments {
+         $$ = scm_cons ($1, scm_reverse_x($2, SCM_EOL));
        }
-       | MARKUP_LIST_HEAD_LIST0 markup_list    {
-               $$ = scm_list_2 ($1, $2);
+       ;
+
+markup_command_basic_arguments:
+       EXPECT_MARKUP_LIST markup_command_list_arguments markup_list {
+         $$ = scm_cons ($3, $2);
        }
-       | MARKUP_LIST_HEAD_SCM0 embedded_scm    {
-               $$ = scm_list_2 ($1, $2);
+       | EXPECT_SCM markup_command_list_arguments embedded_scm {
+         $$ = scm_cons ($3, $2);
        }
-       | MARKUP_LIST_HEAD_SCM0_LIST1 embedded_scm markup_list  {
-               $$ = scm_list_3 ($1, $2, $3);
+       | EXPECT_NO_MORE_ARGS {
+         $$ = SCM_EOL;
        }
-       | MARKUP_LIST_HEAD_SCM0_SCM1_LIST2 embedded_scm embedded_scm markup_list        {
-               $$ = scm_list_4 ($1, $2, $3, $4);
+       ;
+
+markup_command_list_arguments:
+       markup_command_basic_arguments { $$ = $1; }
+       | EXPECT_MARKUP markup_command_list_arguments markup {
+         $$ = scm_cons ($3, $2);
        }
        ;
 
 markup_head_1_item:
-       MARKUP_HEAD_MARKUP0     {
-               $$ = scm_list_1 ($1);
-       }
-       | MARKUP_HEAD_SCM0_MARKUP1 embedded_scm {
-               $$ = scm_list_2 ($1, $2);
-       }
-       | MARKUP_HEAD_SCM0_SCM1_MARKUP2 embedded_scm embedded_scm       {
-               $$ = scm_list_3 ($1, $2, $3);
+       MARKUP_FUNCTION EXPECT_MARKUP markup_command_list_arguments {
+         $$ = scm_cons ($1, scm_reverse_x ($3, SCM_EOL));
        }
        ;
 
@@ -2530,29 +2506,8 @@ simple_markup:
                sc->unprotect ();
                PARSER->lexer_->pop_state ();
        }
-       | MARKUP_HEAD_SCM0 embedded_scm {
-               $$ = scm_list_2 ($1, $2);
-       }
-       | MARKUP_HEAD_SCM0_SCM1_SCM2 embedded_scm embedded_scm embedded_scm {
-               $$ = scm_list_4 ($1, $2, $3, $4);
-       }
-       | MARKUP_HEAD_SCM0_SCM1 embedded_scm embedded_scm {
-               $$ = scm_list_3 ($1, $2, $3);
-       }
-       | MARKUP_HEAD_SCM0_MARKUP1_MARKUP2 embedded_scm markup markup {
-               $$ = scm_list_4 ($1, $2, $3, $4);
-       }
-       | MARKUP_HEAD_SCM0_SCM1_MARKUP2_MARKUP3 embedded_scm embedded_scm markup markup {
-               $$ = scm_list_5 ($1, $2, $3, $4, $5);
-       }
-       | MARKUP_HEAD_EMPTY {
-               $$ = scm_list_1 ($1);
-       }
-       | MARKUP_HEAD_LIST0 markup_list {
-               $$ = scm_list_2 ($1,$2);
-       }
-       | MARKUP_HEAD_MARKUP0_MARKUP1 markup markup {
-               $$ = scm_list_3 ($1, $2, $3);
+       | MARKUP_FUNCTION markup_command_basic_arguments {
+               $$ = scm_cons ($1, scm_reverse_x ($2, SCM_EOL));
        }
        ;