Add test for collisions and grace notes.

[lilypond.git] / lily / parser.yy

diff --git a/lily/parser.yy b/lily/parser.yy
index d296086193ccab190827d438a36bd0101ba4a28a..0bb4c152f273455dd1e02f201803e66d8eeaa685 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
                  Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -271,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;
 
@@ -286,23 +287,10 @@ 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> MARKUPLINES_IDENTIFIER
 %token <scm> MUSIC_FUNCTION
 %token <scm> MUSIC_IDENTIFIER
 %token <scm> NOTENAME_PITCH
@@ -413,6 +401,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
@@ -448,6 +438,7 @@ If we give names, Bison complains.
 %type <scm> step_number
 %type <scm> step_numbers
 %type <scm> string
+%type <scm> tempo_range
 
 %type <score> score_block
 %type <score> score_body
@@ -625,6 +616,9 @@ identifier_init:
        | full_markup {
                $$ = $1;
        }
+       | full_markup_list {
+               $$ = $1;
+       }
        | DIGIT {
                $$ = scm_from_int ($1);
        }
@@ -917,20 +911,14 @@ output_def_body:
        ;
 
 tempo_event:
-       TEMPO steno_duration '=' bare_unsigned  {
-               $$ = MAKE_SYNTAX ("tempo", @$, SCM_BOOL_F, $2, scm_int2num ($4));
-       }
-       | TEMPO string steno_duration '=' bare_unsigned {
-               $$ = MAKE_SYNTAX ("tempo", @$, make_simple_markup($2), $3, scm_int2num ($5));
+       TEMPO steno_duration '=' tempo_range    {
+               $$ = MAKE_SYNTAX ("tempo", @$, SCM_EOL, $2, $4);
        }
-       | TEMPO full_markup steno_duration '=' bare_unsigned    {
-               $$ = MAKE_SYNTAX ("tempo", @$, $2, $3, scm_int2num ($5));
+       | TEMPO scalar steno_duration '=' tempo_range   {
+               $$ = MAKE_SYNTAX ("tempo", @$, $2, $3, $5);
        }
-       | TEMPO string {
-               $$ = MAKE_SYNTAX ("tempoText", @$, make_simple_markup($2) );
-       }
-       | TEMPO full_markup {
-               $$ = MAKE_SYNTAX ("tempoText", @$, $2 );
+       | TEMPO scalar {
+               $$ = MAKE_SYNTAX ("tempo", @$, $2);
        }
        ;
 
@@ -1272,18 +1260,33 @@ new_lyrics:
 
                $$ = scm_cons ($3, SCM_EOL);
        }
+       | ADDLYRICS {
+               PARSER->lexer_->push_lyric_state (); }
+       MUSIC_IDENTIFIER {
+               PARSER->lexer_->pop_state ();
+               $$ = scm_cons ($3, SCM_EOL);
+       }
        | new_lyrics ADDLYRICS {
                PARSER->lexer_->push_lyric_state ();
        } grouped_music_list {
                PARSER->lexer_->pop_state ();
                $$ = scm_cons ($4, $1);
        }
+       | new_lyrics ADDLYRICS {
+               PARSER->lexer_->push_lyric_state ();
+       } MUSIC_IDENTIFIER {
+               PARSER->lexer_->pop_state ();
+               $$ = scm_cons ($4, $1);
+       }
        ;
 
 re_rhythmed_music:
        grouped_music_list new_lyrics {
                $$ = MAKE_SYNTAX ("add-lyrics", @$, $1, scm_reverse_x ($2, SCM_EOL));
        }
+       | MUSIC_IDENTIFIER new_lyrics {
+               $$ = MAKE_SYNTAX ("add-lyrics", @$, $1, scm_reverse_x ($2, SCM_EOL));
+       }
        | LYRICSTO simple_string {
                PARSER->lexer_->push_lyric_state ();
        } music {
@@ -1642,9 +1645,7 @@ command_element:
 
        }
        | PARTIAL duration_length       {
-               Moment m = - unsmob_duration ($2)->get_length ();
-               $$ = MAKE_SYNTAX ("property-operation", @$, SCM_BOOL_F, ly_symbol2scm ("Timing"), ly_symbol2scm ("PropertySet"), ly_symbol2scm ("measurePosition"), m.smobbed_copy ());
-               $$ = MAKE_SYNTAX ("context-specification", @$, ly_symbol2scm ("Score"), SCM_BOOL_F, $$, SCM_EOL, SCM_BOOL_F);
+               $$ = MAKE_SYNTAX ("partial", @$, $2);
        }
 
        | TIME_T fraction  {
@@ -1653,9 +1654,7 @@ command_element:
                $$ = scm_apply_2   (proc, scm_car ($2), scm_cdr ($2), SCM_EOL);
        }
        | MARK scalar {
-               SCM proc = ly_lily_module_constant ("make-mark-set");
-
-               $$ = scm_call_1 (proc, $2);
+               $$ = MAKE_SYNTAX ("make-mark-set", @$, $2);
        }
        ;
 
@@ -1705,8 +1704,12 @@ post_event:
        direction_less_event {
                $$ = $1;
        }
-       | '-' music_function_event {
+       | script_dir music_function_event {
                $$ = run_music_function (PARSER, $2);
+               if ($1)
+               {
+                       unsmob_music ($$)->set_property ("direction", scm_from_int ($1));
+               }
        }
        | HYPHEN {
                if (!PARSER->lexer_->is_lyric_state ())
@@ -2289,6 +2292,15 @@ step_number:
        }
        ;
 
+tempo_range:
+       bare_unsigned {
+               $$ = scm_from_int ($1);
+       }
+       | bare_unsigned '~' bare_unsigned {
+               $$ = scm_cons (scm_from_int ($1), scm_from_int ($3));
+       }
+       ;
+
 /*
        UTILITIES
 
@@ -2360,7 +2372,6 @@ unsigned_number:
        }
        ;
 
-
 exclamations:
                { $$ = 0; }
        | exclamations '!'      { $$ ++; }
@@ -2388,7 +2399,10 @@ lyric_markup:
        ;
 
 full_markup_list:
-       MARKUPLINES
+       MARKUPLINES_IDENTIFIER {
+               $$ = $1;
+       }
+       | MARKUPLINES
                { PARSER->lexer_->push_markup_state (); }
        markup_list {
                $$ = $3;
@@ -2421,7 +2435,10 @@ markup_top:
        ;
 
 markup_list:
-       markup_composed_list {
+       MARKUPLINES_IDENTIFIER {
+               $$ = $1;
+       }
+       | markup_composed_list {
                $$ = $1;
        }
        | markup_braced_list {
@@ -2451,37 +2468,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));
        }
        ;
 
@@ -2516,29 +2534,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));
        }
        ;
 
@@ -2634,6 +2631,9 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid)
                if (is_lyric_state ())
                        return LYRIC_MARKUP_IDENTIFIER;
                return MARKUP_IDENTIFIER;
+       } else if (Text_interface::is_markup_list (sid)) {
+               *destination = sid;
+               return MARKUPLINES_IDENTIFIER;
        }
 
        return -1;