X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparser.yy;h=83eaf89ec235912c7bccb69ef2b44dd9bc6b3943;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=52356a44d056839a683fb2e01398efd234e1a570;hpb=f5b1f319b1b5b7517972dfebdac2292a99531d67;p=lilypond.git diff --git a/lily/parser.yy b/lily/parser.yy index 52356a44d0..83eaf89ec2 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -3,12 +3,13 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2006 Han-Wen Nienhuys + (c) 1997--2008 Han-Wen Nienhuys Jan Nieuwenhuizen */ %{ +#define YYDEBUG 1 #define YYERROR_VERBOSE 1 #define YYPARSE_PARAM my_lily_parser #define YYLEX_PARAM my_lily_parser @@ -74,13 +75,11 @@ using namespace std; #include "context-def.hh" #include "dimensions.hh" #include "file-path.hh" -#include "input-smob.hh" #include "input.hh" #include "international.hh" #include "lily-guile.hh" #include "lily-lexer.hh" #include "lily-parser.hh" -#include "lilypond-input-version.hh" #include "main.hh" #include "misc.hh" #include "music.hh" @@ -108,7 +107,7 @@ using namespace std; %{ -#define MY_MAKE_MUSIC(x) make_music_by_name (ly_symbol2scm (x)) +#define MY_MAKE_MUSIC(x, spot) make_music_with_input (ly_symbol2scm (x), spot) /* ES TODO: - Don't use lily module, create a new module instead. @@ -132,12 +131,12 @@ SCM get_next_unique_lyrics_context_id (); #endif - -SCM make_music_relative (Pitch start, SCM music); +static Music *make_music_with_input (SCM name, Input where); +SCM make_music_relative (Pitch start, SCM music, Input loc); SCM run_music_function (Lily_parser *, SCM expr); SCM get_first_context_id (SCM type, Music *m); SCM make_chord_elements (SCM pitch, SCM dur, SCM modification_list); -SCM make_chord_step (int step, int alter); +SCM make_chord_step (int step, Rational alter); SCM make_simple_markup (SCM a); bool is_duration (int t); bool is_regular_identifier (SCM id); @@ -157,10 +156,10 @@ void set_music_properties (Music *p, SCM a); /* Keyword tokens with plain escaped name. */ %token ACCEPTS "\\accepts" %token ADDLYRICS "\\addlyrics" -%token ADDQUOTE "\\addquote" %token ALIAS "\\alias" %token ALTERNATIVE "\\alternative" %token BOOK "\\book" +%token BOOKPART "\\bookpart" %token CHANGE "\\change" %token CHORDMODE "\\chordmode" %token CHORDS "\\chords" @@ -184,6 +183,7 @@ void set_music_properties (Music *p, SCM a); %token LYRICSTO "\\lyricsto" %token MARK "\\mark" %token MARKUP "\\markup" +%token MARKUPLINES "\\markuplines" %token MIDI "\\midi" %token NAME "\\name" %token NOTEMODE "\\notemode" @@ -256,6 +256,13 @@ If we give names, Bison complains. %token E_UNSIGNED %token UNSIGNED +/* Artificial tokens, for more generic function syntax */ +%token EXPECT_MARKUP; +%token EXPECT_MUSIC; +%token EXPECT_SCM; +/* After the last argument. */ +%token EXPECT_NO_MORE_ARGS; + %token BOOK_IDENTIFIER %token CHORDMODIFIER_PITCH %token CHORD_MODIFIER @@ -274,25 +281,16 @@ If we give names, Bison complains. %token MARKUP_HEAD_SCM0_MARKUP1 %token MARKUP_HEAD_SCM0_SCM1 %token MARKUP_HEAD_SCM0_SCM1_MARKUP2 +%token MARKUP_HEAD_SCM0_SCM1_MARKUP2_MARKUP3 +%token MARKUP_HEAD_SCM0_MARKUP1_MARKUP2 %token MARKUP_HEAD_SCM0_SCM1_SCM2 +%token MARKUP_LIST_HEAD_EMPTY +%token MARKUP_LIST_HEAD_LIST0 +%token MARKUP_LIST_HEAD_SCM0 +%token MARKUP_LIST_HEAD_SCM0_LIST1 +%token MARKUP_LIST_HEAD_SCM0_SCM1_LIST2 %token MARKUP_IDENTIFIER %token MUSIC_FUNCTION -%token MUSIC_FUNCTION_MARKUP -%token MUSIC_FUNCTION_MARKUP_MARKUP -%token MUSIC_FUNCTION_MARKUP_MARKUP_MUSIC -%token MUSIC_FUNCTION_MARKUP_MUSIC -%token MUSIC_FUNCTION_MARKUP_MUSIC_MUSIC -%token MUSIC_FUNCTION_MUSIC -%token MUSIC_FUNCTION_MUSIC_MUSIC -%token MUSIC_FUNCTION_SCM -%token MUSIC_FUNCTION_SCM_MUSIC -%token MUSIC_FUNCTION_SCM_MUSIC_MUSIC -%token MUSIC_FUNCTION_SCM_SCM_MUSIC_MUSIC -%token MUSIC_FUNCTION_SCM_SCM -%token MUSIC_FUNCTION_SCM_SCM_MUSIC -%token MUSIC_FUNCTION_SCM_SCM_SCM -%token MUSIC_FUNCTION_SCM_SCM_SCM_MUSIC -%token MUSIC_FUNCTION_SCM_SCM_SCM_SCM_MUSIC %token MUSIC_IDENTIFIER %token NOTENAME_PITCH %token NUMBER_IDENTIFIER @@ -309,9 +307,11 @@ If we give names, Bison complains. %type book_block %type book_body +%type bookpart_block +%type bookpart_body %type bare_unsigned -%type figured_bass_alteration +%type figured_bass_alteration %type dots %type exclamations %type optional_rest @@ -361,10 +361,7 @@ If we give names, Bison complains. %type absolute_pitch %type assignment_id %type bare_number -%type music_function_event -%type music_function_chord_body -%type music_function_musicless_prefix -%type music_function_musicless_function +%type unsigned_number %type bass_figure %type figured_bass_modification %type br_bass_figure @@ -386,6 +383,12 @@ If we give names, Bison complains. %type figure_spec %type fraction %type full_markup +%type full_markup_list +%type function_scm_argument +%type function_arglist +%type function_arglist_music_last +%type function_arglist_nonmusic_last +%type function_arglist_nonmusic %type identifier_init %type lilypond_header %type lilypond_header_body @@ -395,6 +398,7 @@ If we give names, Bison complains. %type markup_braced_list %type markup_braced_list_body %type markup_composed_list +%type markup_command_list %type markup_head_1_item %type markup_head_1_list %type markup_list @@ -402,6 +406,9 @@ If we give names, Bison complains. %type mode_changing_head %type mode_changing_head_with_context %type multiplied_duration +%type music_function_identifier_musicless_prefix +%type music_function_event +%type music_function_chord_body %type new_chord %type new_lyrics %type number_expression @@ -416,6 +423,7 @@ If we give names, Bison complains. %type pitch_also_in_chords %type post_events %type property_operation +%type property_path property_path_revved %type scalar %type script_abbreviation %type simple_chord_elements @@ -427,7 +435,6 @@ If we give names, Bison complains. %type step_number %type step_numbers %type string -%type function_scm_argument %type score_block %type score_body @@ -470,6 +477,12 @@ toplevel_expression: scm_call_2 (proc, PARSER->self_scm (), book->self_scm ()); book->unprotect (); } + | bookpart_block { + Book *bookpart = $1; + SCM proc = PARSER->lexer_->lookup_identifier ("toplevel-bookpart-handler"); + scm_call_2 (proc, PARSER->self_scm (), bookpart->self_scm ()); + bookpart->unprotect (); + } | score_block { Score *score = $1; @@ -483,6 +496,10 @@ toplevel_expression: scm_call_2 (proc, PARSER->self_scm (), music->self_scm ()); } | full_markup { + SCM proc = PARSER->lexer_->lookup_identifier ("toplevel-text-handler"); + scm_call_2 (proc, PARSER->self_scm (), scm_list_1 ($1)); + } + | full_markup_list { SCM proc = PARSER->lexer_->lookup_identifier ("toplevel-text-handler"); scm_call_2 (proc, PARSER->self_scm (), $1); } @@ -510,7 +527,7 @@ embedded_scm: lilypond_header_body: { - $$ = get_header(PARSER); + $$ = get_header (PARSER); PARSER->lexer_->add_scope ($$); } | lilypond_header_body assignment { @@ -557,6 +574,10 @@ identifier_init: $$ = $1->self_scm (); $1->unprotect (); } + | bookpart_block { + $$ = $1->self_scm (); + $1->unprotect (); + } | output_def { $$ = $1->self_scm (); $1->unprotect (); @@ -606,11 +627,11 @@ context_def_spec_block: context_def_spec_body: /**/ { $$ = Context_def::make_scm (); - unsmob_context_def ($$)->set_spot (@$); + unsmob_context_def ($$)->origin ()->set_spot (@$); } | CONTEXT_DEF_IDENTIFIER { $$ = $1; - unsmob_context_def ($$)->set_spot (@$); + unsmob_context_def ($$)->origin ()->set_spot (@$); } | context_def_spec_body GROBDESCRIPTIONS embedded_scm { Context_def*td = unsmob_context_def ($$); @@ -633,6 +654,7 @@ context_def_spec_body: book_block: BOOK '{' book_body '}' { $$ = $3; + pop_paper (PARSER); } ; @@ -642,26 +664,47 @@ book_block: book_body: { $$ = new Book; - $$->set_spot (@$); + init_papers (PARSER); + $$->origin ()->set_spot (@$); $$->paper_ = dynamic_cast (unsmob_output_def (PARSER->lexer_->lookup_identifier ("$defaultpaper"))->clone ()); $$->paper_->unprotect (); + push_paper (PARSER, $$->paper_); $$->header_ = PARSER->lexer_->lookup_identifier ("$defaultheader"); } | BOOK_IDENTIFIER { $$ = unsmob_book ($1); - $$->set_spot (@$); + $$->protect (); + $$->origin ()->set_spot (@$); } | book_body paper_block { $$->paper_ = $2; $2->unprotect (); + set_paper (PARSER, $2); + } + | book_body bookpart_block { + Book *bookpart = $2; + SCM proc = PARSER->lexer_->lookup_identifier ("book-bookpart-handler"); + scm_call_2 (proc, $$->self_scm (), bookpart->self_scm ()); + bookpart->unprotect (); } | book_body score_block { - SCM s = $2->self_scm (); - $$->add_score (s); - $2->unprotect(); + Score *score = $2; + SCM proc = PARSER->lexer_->lookup_identifier ("book-score-handler"); + scm_call_2 (proc, $$->self_scm (), score->self_scm ()); + score->unprotect (); + } + | book_body composite_music { + Music *music = unsmob_music ($2); + SCM proc = PARSER->lexer_->lookup_identifier ("book-music-handler"); + scm_call_3 (proc, PARSER->self_scm (), $$->self_scm (), music->self_scm ()); } | book_body full_markup { - $$->add_score ($2); + SCM proc = PARSER->lexer_->lookup_identifier ("book-text-handler"); + scm_call_2 (proc, $$->self_scm (), scm_list_1 ($2)); + } + | book_body full_markup_list { + SCM proc = PARSER->lexer_->lookup_identifier ("book-text-handler"); + scm_call_2 (proc, $$->self_scm (), $2); } | book_body lilypond_header { $$->header_ = $2; @@ -669,12 +712,64 @@ book_body: | book_body error { $$->paper_ = 0; $$->scores_ = SCM_EOL; + $$->bookparts_ = SCM_EOL; } | book_body object_id_setting { $$->user_key_ = ly_scm2string ($2); } ; +bookpart_block: + BOOKPART '{' bookpart_body '}' { + $$ = $3; + } + ; + +bookpart_body: + { + $$ = new Book; + $$->origin ()->set_spot (@$); + } + | BOOK_IDENTIFIER { + $$ = unsmob_book ($1); + $$->protect (); + $$->origin ()->set_spot (@$); + } + | bookpart_body paper_block { + $$->paper_ = $2; + $2->unprotect (); + } + | bookpart_body score_block { + Score *score = $2; + SCM proc = PARSER->lexer_->lookup_identifier ("bookpart-score-handler"); + scm_call_2 (proc, $$->self_scm (), score->self_scm ()); + score->unprotect (); + } + | bookpart_body composite_music { + Music *music = unsmob_music ($2); + SCM proc = PARSER->lexer_->lookup_identifier ("bookpart-music-handler"); + scm_call_3 (proc, PARSER->self_scm (), $$->self_scm (), music->self_scm ()); + } + | bookpart_body full_markup { + SCM proc = PARSER->lexer_->lookup_identifier ("bookpart-text-handler"); + scm_call_2 (proc, $$->self_scm (), scm_list_1 ($2)); + } + | bookpart_body full_markup_list { + SCM proc = PARSER->lexer_->lookup_identifier ("bookpart-text-handler"); + scm_call_2 (proc, $$->self_scm (), $2); + } + | bookpart_body lilypond_header { + $$->header_ = $2; + } + | bookpart_body error { + $$->paper_ = 0; + $$->scores_ = SCM_EOL; + } + | bookpart_body object_id_setting { + $$->user_key_ = ly_scm2string ($2); + } + ; + score_block: SCORE '{' score_body '}' { $$ = $3; @@ -690,18 +785,18 @@ score_body: // pass ownernship to C++ again. $$ = unsmob_score (score); $$->protect (); - $$->set_spot (@$); + $$->origin ()->set_spot (@$); } | SCORE_IDENTIFIER { $$ = unsmob_score ($1); $$->protect (); - $$->set_spot (@$); + $$->origin ()->set_spot (@$); } | score_body object_id_setting { $$->user_key_ = ly_scm2string ($2); } | score_body lilypond_header { - $$->header_ = $2; + $$->set_header ($2); } | score_body output_def { if ($2->lookup_variable (ly_symbol2scm ("is-paper")) == SCM_BOOL_T) @@ -731,6 +826,7 @@ paper_block: if ($$->lookup_variable (ly_symbol2scm ("is-paper")) != SCM_BOOL_T) { PARSER->parser_error (@1, _ ("need \\paper for paper block")); + $1->unprotect (); $$ = get_paper (PARSER); } } @@ -779,9 +875,11 @@ output_def_body: } | output_def_head_with_mode_switch '{' OUTPUT_DEF_IDENTIFIER { $1->unprotect (); + Output_def *o = unsmob_output_def ($3); o->input_origin_.set_spot (@$); $$ = o; + $$->protect (); PARSER->lexer_->remove_scope (); PARSER->lexer_->add_scope (o->scope_); } @@ -798,8 +896,20 @@ output_def_body: tempo_event: TEMPO steno_duration '=' bare_unsigned { - $$ = MAKE_SYNTAX ("tempo", @$, $2, scm_int2num ($4)); - } + $$ = 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 full_markup steno_duration '=' bare_unsigned { + $$ = MAKE_SYNTAX ("tempo", @$, $2, $3, scm_int2num ($5)); + } + | TEMPO string { + $$ = MAKE_SYNTAX ("tempoText", @$, make_simple_markup($2) ); + } + | TEMPO full_markup { + $$ = MAKE_SYNTAX ("tempoText", @$, $2 ); + } ; /* @@ -827,7 +937,7 @@ music_list: } | music_list error { - Music *m = MY_MAKE_MUSIC("Music"); + Music *m = MY_MAKE_MUSIC("Music", @$); // ugh. code dup m->set_property ("error-found", SCM_BOOL_T); SCM s = $$; @@ -858,9 +968,9 @@ alternative_music: repeated_music: - REPEAT simple_string bare_unsigned music alternative_music + REPEAT simple_string unsigned_number music alternative_music { - $$ = MAKE_SYNTAX ("repeat", @$, $2, scm_int2num ($3), $4, $5); + $$ = MAKE_SYNTAX ("repeat", @$, $2, $3, $4, $5); } ; @@ -921,72 +1031,48 @@ function_scm_argument: | simple_string ; -/* -TODO: use code generation for this -*/ -music_function_musicless_function: - MUSIC_FUNCTION { - $$ = scm_list_2 ($1, make_input (@$)); - } - | MUSIC_FUNCTION_SCM function_scm_argument { - $$ = scm_list_3 ($1, make_input (@$), $2); - } - | MUSIC_FUNCTION_MARKUP full_markup { - $$ = scm_list_3 ($1, make_input (@$), $2); - } - | MUSIC_FUNCTION_SCM_SCM function_scm_argument function_scm_argument { - $$ = scm_list_4 ($1, make_input (@$), $2, $3); - } - | MUSIC_FUNCTION_SCM_SCM_SCM function_scm_argument function_scm_argument function_scm_argument { - $$ = scm_list_5 ($1, make_input (@$), $2, $3, $4); - } - | MUSIC_FUNCTION_MARKUP_MARKUP full_markup full_markup { - $$ = scm_list_4 ($1, make_input (@$), $2, $3); +/* 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 +and this rule returns the reversed list of arguments. */ + +function_arglist_music_last: + EXPECT_MUSIC function_arglist music { + $$ = scm_cons ($3, $2); } ; -/* -TODO: use code generation for this -*/ -music_function_musicless_prefix: - MUSIC_FUNCTION_MUSIC { - $$ = scm_list_2 ($1, make_input (@$)); +function_arglist_nonmusic_last: + EXPECT_MARKUP function_arglist full_markup { + $$ = scm_cons ($3, $2); } - | MUSIC_FUNCTION_SCM_MUSIC function_scm_argument { - $$ = scm_list_3 ($1, make_input (@$), $2); + | EXPECT_SCM function_arglist function_scm_argument { + $$ = scm_cons ($3, $2); } - | MUSIC_FUNCTION_SCM_SCM_MUSIC function_scm_argument function_scm_argument { - $$ = scm_list_4 ($1, make_input (@$), $2, $3); + ; + +function_arglist_nonmusic: EXPECT_NO_MORE_ARGS { + $$ = SCM_EOL; } - | MUSIC_FUNCTION_SCM_SCM_SCM_MUSIC function_scm_argument function_scm_argument function_scm_argument { - $$ = scm_list_5 ($1, make_input (@$), $2, $3, $4); + | EXPECT_MARKUP function_arglist_nonmusic full_markup { + $$ = scm_cons ($3, $2); } - | MUSIC_FUNCTION_SCM_SCM_SCM_SCM_MUSIC function_scm_argument function_scm_argument function_scm_argument function_scm_argument { - $$ = scm_list_n ($1, make_input (@$), $2, $3, $4, $5, SCM_UNDEFINED); + | EXPECT_SCM function_arglist_nonmusic function_scm_argument { + $$ = scm_cons ($3, $2); } - | MUSIC_FUNCTION_MARKUP_MUSIC full_markup { - $$ = scm_list_3 ($1, make_input (@$), $2); + ; + +function_arglist: EXPECT_NO_MORE_ARGS { + /* This is for 0-ary functions, so they don't need to + read a lookahead token */ + $$ = SCM_EOL; } + | function_arglist_music_last + | function_arglist_nonmusic_last ; generic_prefix_music_scm: - music_function_musicless_function { - $$ = $1; - } - | music_function_musicless_prefix music { - $$ = ly_append2 ($1, scm_list_1 ($2)); - } - | MUSIC_FUNCTION_MUSIC_MUSIC music music { - $$ = scm_list_4 ($1, make_input (@$), $2, $3); - } - | MUSIC_FUNCTION_SCM_MUSIC_MUSIC function_scm_argument music music { - $$ = scm_list_5 ($1, make_input (@$), $2, $3, $4); - } - | MUSIC_FUNCTION_SCM_SCM_MUSIC_MUSIC function_scm_argument function_scm_argument music music { - $$ = scm_list_n ($1, make_input (@$), $2, $3, $4, $5, SCM_UNDEFINED); - } - | MUSIC_FUNCTION_MARKUP_MUSIC_MUSIC full_markup music music { - $$ = scm_list_5 ($1, make_input (@$), $2, $3, $4); + MUSIC_FUNCTION function_arglist { + $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($2, SCM_EOL)); } ; @@ -1003,7 +1089,7 @@ prefix_composite_music: generic_prefix_music_scm { $$ = run_music_function (PARSER, $1); } - | CONTEXT simple_string optional_id optional_context_mod music { + | CONTEXT simple_string optional_id optional_context_mod music { $$ = MAKE_SYNTAX ("context-specification", @$, $2, $3, $5, $4, SCM_BOOL_F); } | NEWCONTEXT simple_string optional_id optional_context_mod music { @@ -1105,11 +1191,11 @@ mode_changing_head_with_context: relative_music: RELATIVE absolute_pitch music { Pitch start = *unsmob_pitch ($2); - $$ = make_music_relative (start, $3); + $$ = make_music_relative (start, $3, @$); } | RELATIVE composite_music { Pitch middle_c (0, 0, 0); - $$ = make_music_relative (middle_c, $2); + $$ = make_music_relative (middle_c, $2, @$); } ; @@ -1149,6 +1235,22 @@ context_change: } ; + +property_path_revved: + embedded_scm { + $$ = scm_cons ($1, SCM_EOL); + } + | property_path_revved embedded_scm { + $$ = scm_cons ($2, $1); + } + ; + +property_path: + property_path_revved { + $$ = scm_reverse_x ($1, SCM_EOL); + } + ; + property_operation: STRING '=' scalar { $$ = scm_list_3 (ly_symbol2scm ("assign"), @@ -1158,13 +1260,10 @@ property_operation: $$ = scm_list_2 (ly_symbol2scm ("unset"), scm_string_to_symbol ($2)); } - | OVERRIDE simple_string embedded_scm '=' embedded_scm { - $$ = scm_list_4 (ly_symbol2scm ("push"), - scm_string_to_symbol ($2), $5, $3); - } - | OVERRIDE simple_string embedded_scm embedded_scm '=' embedded_scm { - $$ = scm_list_5 (ly_symbol2scm ("push"), - scm_string_to_symbol ($2), $6, $4, $3); + | OVERRIDE simple_string property_path '=' embedded_scm { + $$ = scm_append (scm_list_2 (scm_list_3 (ly_symbol2scm ("push"), + scm_string_to_symbol ($2), $5), + $3)); } | REVERT simple_string embedded_scm { $$ = scm_list_3 (ly_symbol2scm ("pop"), @@ -1210,17 +1309,12 @@ context_prop_spec: ; simple_music_property_def: - OVERRIDE context_prop_spec embedded_scm '=' scalar { - $$ = scm_list_5 (scm_car ($2), - ly_symbol2scm ("OverrideProperty"), - scm_cadr ($2), - $5, $3); - } - | OVERRIDE context_prop_spec embedded_scm embedded_scm '=' scalar { - $$ = scm_list_n (scm_car ($2), - ly_symbol2scm ("OverrideProperty"), - scm_cadr ($2), - $6, $4, $3, SCM_UNDEFINED); + OVERRIDE context_prop_spec property_path '=' scalar { + $$ = scm_append (scm_list_2 (scm_list_n (scm_car ($2), + ly_symbol2scm ("OverrideProperty"), + scm_cadr ($2), + $5, SCM_UNDEFINED), + $3)); } | REVERT context_prop_spec embedded_scm { $$ = scm_list_4 (scm_car ($2), @@ -1356,9 +1450,8 @@ chord_body_element: SCM check = $4; SCM post = $5; - Music *n = MY_MAKE_MUSIC ("NoteEvent"); + Music *n = MY_MAKE_MUSIC ("NoteEvent", @$); n->set_property ("pitch", $1); - n->set_spot (@$); if (q % 2) n->set_property ("cautionary", SCM_BOOL_T); if (ex % 2 || q % 2) @@ -1377,10 +1470,9 @@ chord_body_element: $$ = n->unprotect (); } | DRUM_PITCH post_events { - Music *n = MY_MAKE_MUSIC ("NoteEvent"); + Music *n = MY_MAKE_MUSIC ("NoteEvent", @$); n->set_property ("duration", $2); n->set_property ("drum-type", $1); - n->set_spot (@$); if (scm_is_pair ($2)) { SCM arts = scm_reverse_x ($2, SCM_EOL); @@ -1393,24 +1485,38 @@ chord_body_element: } ; +music_function_identifier_musicless_prefix: MUSIC_FUNCTION { + SCM sig = scm_object_property (yylval.scm, ly_symbol2scm ("music-function-signature")); + if (scm_is_pair (sig) && to_boolean (scm_memq (ly_music_p_proc, scm_cdr (scm_reverse (sig))))) + { + PARSER->parser_error (@$, "Music function applied to event may not have a Music argument, except as the last argument."); + } + } + ; + music_function_chord_body: - music_function_musicless_function { - $$ = $1; + /* We could allow chord functions to have multiple music arguments, + but it's more consistent with music_function_event if we + prohibit it here too */ + music_function_identifier_musicless_prefix EXPECT_MUSIC function_arglist_nonmusic chord_body_element { + $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($3, scm_list_1 ($4))); } - | music_function_musicless_prefix chord_body_element { - $$ = ly_append2 ($1, scm_list_1 ($2)); + | music_function_identifier_musicless_prefix function_arglist_nonmusic { + $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($2, SCM_EOL)); } ; music_function_event: - music_function_musicless_prefix post_event { - $$ = ly_append2 ($1, scm_list_1 ($2)); + /* Post-events can only have the last argument as music, without this + restriction we get a shift/reduce conflict from e.g. + c8-\partcombine c8 -. */ + music_function_identifier_musicless_prefix EXPECT_MUSIC function_arglist_nonmusic post_event { + $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($3, scm_list_1 ($4))); } - | music_function_musicless_function { - $$ = $1; + | music_function_identifier_musicless_prefix function_arglist_nonmusic { + $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($2, SCM_EOL)); } ; - command_element: command_event { @@ -1420,15 +1526,13 @@ command_element: $$ = MAKE_SYNTAX ("skip-music", @$, $2); } | E_BRACKET_OPEN { - Music *m = MY_MAKE_MUSIC ("LigatureEvent"); + Music *m = MY_MAKE_MUSIC ("LigatureEvent", @$); m->set_property ("span-direction", scm_from_int (START)); - m->set_spot (@$); $$ = m->unprotect(); } | E_BRACKET_CLOSE { - Music *m = MY_MAKE_MUSIC ("LigatureEvent"); + Music *m = MY_MAKE_MUSIC ("LigatureEvent", @$); m->set_property ("span-direction", scm_from_int (STOP)); - m->set_spot (@$); $$ = m->unprotect (); } | E_BACKSLASH { @@ -1468,22 +1572,22 @@ command_element: command_event: E_TILDE { - $$ = MY_MAKE_MUSIC ("PesOrFlexaEvent")->unprotect (); + $$ = MY_MAKE_MUSIC ("PesOrFlexaEvent", @$)->unprotect (); } | MARK DEFAULT { - Music *m = MY_MAKE_MUSIC ("MarkEvent"); + Music *m = MY_MAKE_MUSIC ("MarkEvent", @$); $$ = m->unprotect (); } | tempo_event { $$ = $1; } | KEY DEFAULT { - Music *key = MY_MAKE_MUSIC ("KeyChangeEvent"); + Music *key = MY_MAKE_MUSIC ("KeyChangeEvent", @$); $$ = key->unprotect (); } | KEY NOTENAME_PITCH SCM_IDENTIFIER { - Music *key = MY_MAKE_MUSIC ("KeyChangeEvent"); + Music *key = MY_MAKE_MUSIC ("KeyChangeEvent", @$); if (scm_ilength ($3) > 0) { key->set_property ("pitch-alist", $3); @@ -1518,12 +1622,12 @@ post_event: | HYPHEN { if (!PARSER->lexer_->is_lyric_state ()) PARSER->parser_error (@1, _ ("have to be in Lyric mode for lyrics")); - $$ = MY_MAKE_MUSIC ("HyphenEvent")->unprotect (); + $$ = MY_MAKE_MUSIC ("HyphenEvent", @$)->unprotect (); } | EXTENDER { if (!PARSER->lexer_->is_lyric_state ()) PARSER->parser_error (@1, _ ("have to be in Lyric mode for lyrics")); - $$ = MY_MAKE_MUSIC ("ExtenderEvent")->unprotect (); + $$ = MY_MAKE_MUSIC ("ExtenderEvent", @$)->unprotect (); } | script_dir direction_reqd_event { if ($1) @@ -1546,9 +1650,8 @@ post_event: string_number_event: E_UNSIGNED { - Music *s = MY_MAKE_MUSIC ("StringNumberEvent"); + Music *s = MY_MAKE_MUSIC ("StringNumberEvent", @$); s->set_property ("string-number", scm_from_int ($1)); - s->set_spot (@$); $$ = s->unprotect (); } ; @@ -1593,20 +1696,19 @@ direction_less_event: if (unsmob_music (predefd)) { m = unsmob_music (predefd)->clone (); + m->set_spot (@$); } else { - m = MY_MAKE_MUSIC ("Music"); + m = MY_MAKE_MUSIC ("Music", @$); } - m->set_spot (@$); $$ = m->unprotect (); } | EVENT_IDENTIFIER { $$ = $1; } | tremolo_type { - Music *a = MY_MAKE_MUSIC ("TremoloEvent"); - a->set_spot (@$); + Music *a = MY_MAKE_MUSIC ("TremoloEvent", @$); a->set_property ("tremolo-type", scm_from_int ($1)); $$ = a->unprotect (); } @@ -1618,7 +1720,7 @@ direction_reqd_event: } | script_abbreviation { SCM s = PARSER->lexer_->lookup_identifier ("dash" + ly_scm2string ($1)); - Music *a = MY_MAKE_MUSIC ("ArticulationEvent"); + Music *a = MY_MAKE_MUSIC ("ArticulationEvent", @$); if (scm_is_string (s)) a->set_property ("articulation-type", s); else PARSER->parser_error (@1, _ ("expecting string as script definition")); @@ -1629,7 +1731,7 @@ direction_reqd_event: octave_check: /**/ { $$ = SCM_EOL; } | '=' { $$ = scm_from_int (0); } - | '=' sub_quotes { $$ = scm_from_int ($2); } + | '=' sub_quotes { $$ = scm_from_int (-$2); } | '=' sup_quotes { $$ = scm_from_int ($2); } ; @@ -1681,7 +1783,7 @@ steno_tonic_pitch: $$ = p.smobbed_copy (); } | TONICNAME_PITCH sub_quotes { - Pitch p =* unsmob_pitch ($1); + Pitch p = *unsmob_pitch ($1); p = p.transposed (Pitch (-$2,0,0)); $$ = p.smobbed_copy (); @@ -1701,47 +1803,44 @@ pitch_also_in_chords: gen_text_def: full_markup { - Music *t = MY_MAKE_MUSIC ("TextScriptEvent"); + Music *t = MY_MAKE_MUSIC ("TextScriptEvent", @$); t->set_property ("text", $1); - t->set_spot (@$); $$ = t->unprotect (); } | string { - Music *t = MY_MAKE_MUSIC ("TextScriptEvent"); + Music *t = MY_MAKE_MUSIC ("TextScriptEvent", @$); t->set_property ("text", make_simple_markup ($1)); - t->set_spot (@$); $$ = t->unprotect (); } | DIGIT { - Music *t = MY_MAKE_MUSIC ("FingeringEvent"); + Music *t = MY_MAKE_MUSIC ("FingeringEvent", @$); t->set_property ("digit", scm_from_int ($1)); - t->set_spot (@$); $$ = t->unprotect (); } ; script_abbreviation: '^' { - $$ = scm_makfrom0str ("Hat"); + $$ = scm_from_locale_string ("Hat"); } | '+' { - $$ = scm_makfrom0str ("Plus"); + $$ = scm_from_locale_string ("Plus"); } | '-' { - $$ = scm_makfrom0str ("Dash"); + $$ = scm_from_locale_string ("Dash"); } | '|' { - $$ = scm_makfrom0str ("Bar"); + $$ = scm_from_locale_string ("Bar"); } | ANGLE_CLOSE { - $$ = scm_makfrom0str ("Larger"); + $$ = scm_from_locale_string ("Larger"); } | '.' { - $$ = scm_makfrom0str ("Dot"); + $$ = scm_from_locale_string ("Dot"); } | '_' { - $$ = scm_makfrom0str ("Underscore"); + $$ = scm_from_locale_string ("Underscore"); } ; @@ -1846,20 +1945,18 @@ bass_number: ; figured_bass_alteration: - '-' { $$ = -2; } - | '+' { $$ = 2; } - | '!' { $$ = 0; } + '-' { $$ = ly_rational2scm (FLAT_ALTERATION); } + | '+' { $$ = ly_rational2scm (SHARP_ALTERATION); } + | '!' { $$ = scm_from_int (0); } ; bass_figure: FIGURE_SPACE { - Music *bfr = MY_MAKE_MUSIC ("BassFigureEvent"); - $$ = bfr->self_scm (); - bfr->unprotect (); - bfr->set_spot (@1); + Music *bfr = MY_MAKE_MUSIC ("BassFigureEvent", @$); + $$ = bfr->unprotect (); } | bass_number { - Music *bfr = MY_MAKE_MUSIC ("BassFigureEvent"); + Music *bfr = MY_MAKE_MUSIC ("BassFigureEvent", @$); $$ = bfr->self_scm (); if (scm_is_number ($1)) @@ -1868,7 +1965,6 @@ bass_figure: bfr->set_property ("text", $1); bfr->unprotect (); - bfr->set_spot (@1); } | bass_figure ']' { $$ = $1; @@ -1876,11 +1972,11 @@ bass_figure: } | bass_figure figured_bass_alteration { Music *m = unsmob_music ($1); - if ($2) { + if (scm_to_double ($2)) { SCM salter = m->get_property ("alteration"); - int alter = scm_is_number (salter) ? scm_to_int (salter) : 0; + SCM alter = scm_is_number (salter) ? salter : scm_from_int (0); m->set_property ("alteration", - scm_from_int (alter + $2)); + scm_sum (alter, $2)); } else { m->set_property ("alteration", scm_from_int (0)); } @@ -1899,6 +1995,10 @@ bass_figure: { m->set_property ("no-continuation", SCM_BOOL_T); } + else if ($2 == ly_symbol2scm ("backslash")) + { + m->set_property ("augmented-slash", SCM_BOOL_T); + } } ; @@ -1913,6 +2013,9 @@ figured_bass_modification: | '/' { $$ = ly_symbol2scm ("slash"); } + | E_BACKSLASH { + $$ = ly_symbol2scm ("backslash"); + } ; br_bass_figure: @@ -1953,9 +2056,9 @@ simple_element: Music *n = 0; if ($6) - n = MY_MAKE_MUSIC ("RestEvent"); + n = MY_MAKE_MUSIC ("RestEvent", @$); else - n = MY_MAKE_MUSIC ("NoteEvent"); + n = MY_MAKE_MUSIC ("NoteEvent", @$); n->set_property ("pitch", $1); n->set_property ("duration", $5); @@ -1971,11 +2074,10 @@ simple_element: if ($2 % 2 || $3 % 2) n->set_property ("force-accidental", SCM_BOOL_T); - n->set_spot (@$); $$ = n->unprotect (); } | DRUM_PITCH optional_notemode_duration { - Music *n = MY_MAKE_MUSIC ("NoteEvent"); + Music *n = MY_MAKE_MUSIC ("NoteEvent", @$); n->set_property ("duration", $2); n->set_property ("drum-type", $1); @@ -1985,24 +2087,22 @@ simple_element: Music *ev = 0; if (ly_scm2string ($1) == "s") { /* Space */ - ev = MY_MAKE_MUSIC ("SkipEvent"); + ev = MY_MAKE_MUSIC ("SkipEvent", @$); } else { - ev = MY_MAKE_MUSIC ("RestEvent"); + ev = MY_MAKE_MUSIC ("RestEvent", @$); } ev->set_property ("duration", $2); - ev->set_spot (@$); $$ = ev->unprotect (); } | lyric_element optional_notemode_duration { if (!PARSER->lexer_->is_lyric_state ()) PARSER->parser_error (@1, _ ("have to be in Lyric mode for lyrics")); - Music *levent = MY_MAKE_MUSIC ("LyricEvent"); + Music *levent = MY_MAKE_MUSIC ("LyricEvent", @$); levent->set_property ("text", $1); levent->set_property ("duration",$2); - levent->set_spot (@$); $$= levent->unprotect (); } ; @@ -2092,10 +2192,10 @@ step_number: $$ = make_chord_step ($1, 0); } | bare_unsigned '+' { - $$ = make_chord_step ($1, SHARP); + $$ = make_chord_step ($1, SHARP_ALTERATION); } | bare_unsigned CHORD_MINUS { - $$ = make_chord_step ($1, FLAT); + $$ = make_chord_step ($1, FLAT_ALTERATION); } ; @@ -2163,6 +2263,14 @@ bare_unsigned: } ; +unsigned_number: + bare_unsigned { $$ = scm_from_int ($1); } + | NUMBER_IDENTIFIER { + $$ = $1; + } + ; + + exclamations: { $$ = 0; } | exclamations '!' { $$ ++; } @@ -2189,6 +2297,15 @@ lyric_markup: } ; +full_markup_list: + MARKUPLINES + { PARSER->lexer_->push_markup_state (); } + markup_list { + $$ = $3; + PARSER->lexer_->pop_state (); + } + ; + full_markup: MARKUP_IDENTIFIER { $$ = $1; @@ -2220,6 +2337,9 @@ markup_list: | markup_braced_list { $$ = $1; } + | markup_command_list { + $$ = scm_list_1 ($1); + } ; markup_composed_list: @@ -2245,6 +2365,24 @@ markup_braced_list_body: } ; +markup_command_list: + MARKUP_LIST_HEAD_EMPTY { + $$ = scm_list_1 ($1); + } + | MARKUP_LIST_HEAD_LIST0 markup_list { + $$ = scm_list_2 ($1, $2); + } + | MARKUP_LIST_HEAD_SCM0 embedded_scm { + $$ = scm_list_2 ($1, $2); + } + | MARKUP_LIST_HEAD_SCM0_LIST1 embedded_scm markup_list { + $$ = scm_list_3 ($1, $2, $3); + } + | MARKUP_LIST_HEAD_SCM0_SCM1_LIST2 embedded_scm embedded_scm markup_list { + $$ = scm_list_4 ($1, $2, $3, $4); + } + ; + markup_head_1_item: MARKUP_HEAD_MARKUP0 { $$ = scm_list_1 ($1); @@ -2297,6 +2435,12 @@ simple_markup: | 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); } @@ -2321,11 +2465,9 @@ markup: %% void -Lily_parser::set_yydebug (bool ) +Lily_parser::set_yydebug (bool x) { -#if 0 - yydebug = 1; -#endif + yydebug = x; } void @@ -2406,7 +2548,7 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid) SCM get_next_unique_context_id () { - return scm_makfrom0str ("$uniqueContextId"); + return scm_from_locale_string ("$uniqueContextId"); } @@ -2416,7 +2558,7 @@ get_next_unique_lyrics_context_id () static int new_context_count; char s[128]; snprintf (s, sizeof (s)-1, "uniqueContext%d", new_context_count++); - return scm_makfrom0str (s); + return scm_from_locale_string (s); } @@ -2459,6 +2601,13 @@ is_regular_identifier (SCM id) return v; } +Music * +make_music_with_input (SCM name, Input where) +{ + Music *m = make_music_by_name (name); + m->set_spot (where); + return m; +} SCM get_first_context_id (SCM type, Music *m) @@ -2489,15 +2638,15 @@ void set_music_properties (Music *p, SCM a) { for (SCM k = a; scm_is_pair (k); k = scm_cdr (k)) - p->internal_set_property (scm_caar (k), scm_cdar (k)); + p->set_property (scm_caar (k), scm_cdar (k)); } SCM -make_chord_step (int step, int alter) +make_chord_step (int step, Rational alter) { if (step == 7) - alter += FLAT; + alter += FLAT_ALTERATION; while (step < 0) step += 7; @@ -2523,9 +2672,9 @@ ly_input_procedure_p (SCM x) } SCM -make_music_relative (Pitch start, SCM music) +make_music_relative (Pitch start, SCM music, Input loc) { - Music *relative = MY_MAKE_MUSIC ("RelativeOctaveMusic"); + Music *relative = MY_MAKE_MUSIC ("RelativeOctaveMusic", loc); relative->set_property ("element", music); Music *m = unsmob_music (music);