X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparser.yy;h=3e7625f45f8cafbbe578bfa803e2d2a4819bedbe;hb=1d9fc4b1512eb69a28677890dc26658c3552c6cd;hp=0c7b13da9b827c07039a4b3667c6cdd4991a22be;hpb=99cdab1574d096dc4906e3f5d2c4f79cbc409761;p=lilypond.git diff --git a/lily/parser.yy b/lily/parser.yy index 0c7b13da9b..3e7625f45f 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -2,7 +2,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2014 Han-Wen Nienhuys + Copyright (C) 1997--2015 Han-Wen Nienhuys Jan Nieuwenhuizen LilyPond is free software: you can redistribute it and/or modify @@ -41,9 +41,7 @@ do { \ if (scm_is_eq (value, SCM_UNSPECIFIED)) \ break; \ - SCM s = scm_call_2 (ly_lily_module_constant ("value->lily-string"), \ - value, \ - parser->self_scm ()); \ + SCM s = Display::value_to_lily_string (value); \ char *p = scm_to_locale_string (s); \ fputs (p, file); \ free (p); \ @@ -130,6 +128,7 @@ using namespace std; #include "lily-guile.hh" #include "lily-lexer.hh" #include "lily-parser.hh" +#include "ly-module.hh" #include "main.hh" #include "misc.hh" #include "music.hh" @@ -139,6 +138,7 @@ using namespace std; #include "score.hh" #include "text-interface.hh" #include "warn.hh" +#include "lily-imports.hh" void Lily_parser::parser_error (Input const *i, Lily_parser *parser, SCM *, const string &s) @@ -187,18 +187,30 @@ Lily_parser::parser_error (Input const *i, Lily_parser *parser, SCM *, const str parser->lexer_->override_input (spot)) /* ES TODO: -- Don't use lily module, create a new module instead. - delay application of the function */ -#define LOWLEVEL_MAKE_SYNTAX(proc, args) \ - scm_apply_0 (proc, args) + +#define LOWLEVEL_MAKE_SYNTAX(location, proc, ...) \ + with_location \ + (parser->lexer_->override_input (location).smobbed_copy (), \ + proc, \ + ##__VA_ARGS__) + /* Syntactic Sugar. */ #define MAKE_SYNTAX(name, location, ...) \ - LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant (name), scm_list_n (parser->self_scm (), make_input (parser->lexer_->override_input (location)), ##__VA_ARGS__, SCM_UNDEFINED)) + LOWLEVEL_MAKE_SYNTAX (location, Syntax::name, ##__VA_ARGS__) + #define START_MAKE_SYNTAX(name, ...) \ - scm_list_n (ly_lily_module_constant (name) , ##__VA_ARGS__, SCM_UNDEFINED) + scm_list_n (Syntax::name, ##__VA_ARGS__, SCM_UNDEFINED) + #define FINISH_MAKE_SYNTAX(start, location, ...) \ - LOWLEVEL_MAKE_SYNTAX (scm_car (start), scm_cons2 (parser->self_scm (), make_input (parser->lexer_->override_input (location)), scm_append_x (scm_list_2 (scm_cdr (start), scm_list_n (__VA_ARGS__, SCM_UNDEFINED))))) + LOWLEVEL_MAKE_SYNTAX \ + (location, \ + Guile_user::apply, \ + scm_car (start), \ + scm_append_x \ + (scm_list_2 (scm_cdr (start), \ + scm_list_n (__VA_ARGS__, SCM_UNDEFINED)))) SCM get_next_unique_context_id (); SCM get_next_unique_lyrics_context_id (); @@ -216,11 +228,11 @@ static Music *make_music_with_input (SCM name, Input where); SCM check_scheme_arg (Lily_parser *parser, Input loc, SCM arg, SCM args, SCM pred, SCM disp = SCM_UNDEFINED); SCM make_music_from_simple (Lily_parser *parser, Input loc, SCM pitch); -SCM loc_on_music (Input loc, SCM arg); +SCM loc_on_music (Lily_parser *parser, Input loc, SCM arg); SCM make_chord_elements (Input loc, SCM pitch, SCM dur, SCM modification_list); SCM make_chord_step (SCM step, Rational alter); SCM make_simple_markup (SCM a); -SCM make_duration (SCM t, int dots = 0); +SCM make_duration (SCM t, int dots = 0, SCM factor = SCM_UNDEFINED); bool is_regular_identifier (SCM id, bool multiple=false); SCM try_string_variants (SCM pred, SCM str); int yylex (YYSTYPE *s, YYLTYPE *loc, Lily_parser *parser); @@ -253,6 +265,7 @@ int yylex (YYSTYPE *s, YYLTYPE *loc, Lily_parser *parser); %token DESCRIPTION "\\description" %token DRUMMODE "\\drummode" %token DRUMS "\\drums" +%token ETC "\\etc" %token FIGUREMODE "\\figuremode" %token FIGURES "\\figures" %token HEADER "\\header" @@ -334,7 +347,8 @@ If we give names, Bison complains. %token CHORD_REPETITION %token CONTEXT_MOD_IDENTIFIER %token DRUM_PITCH -%token PITCH_IDENTIFIER + /* Artificial token for durations in argument lists */ +%token DURATION_ARG %token DURATION_IDENTIFIER %token EVENT_IDENTIFIER %token EVENT_FUNCTION @@ -348,6 +362,7 @@ If we give names, Bison complains. %token MUSIC_IDENTIFIER %token NOTENAME_PITCH %token NUMBER_IDENTIFIER +%token PITCH_IDENTIFIER %token REAL %token RESTNAME %token SCM_ARG @@ -400,34 +415,34 @@ toplevel_expression: } | book_block { SCM proc = parser->lexer_->lookup_identifier ("toplevel-book-handler"); - scm_call_2 (proc, parser->self_scm (), $1); + scm_call_1 (proc, $1); } | bookpart_block { SCM proc = parser->lexer_->lookup_identifier ("toplevel-bookpart-handler"); - scm_call_2 (proc, parser->self_scm (), $1); + scm_call_1 (proc, $1); } | BOOK_IDENTIFIER { SCM proc = parser->lexer_->lookup_identifier - (unsmob_book($1)->paper_ + (unsmob($1)->paper_ ? "toplevel-book-handler" : "toplevel-bookpart-handler"); - scm_call_2 (proc, parser->self_scm (), $1); + scm_call_1 (proc, $1); } | score_block { SCM proc = parser->lexer_->lookup_identifier ("toplevel-score-handler"); - scm_call_2 (proc, parser->self_scm (), $1); + scm_call_1 (proc, $1); } | composite_music { SCM proc = parser->lexer_->lookup_identifier ("toplevel-music-handler"); - scm_call_2 (proc, parser->self_scm (), $1); + scm_call_1 (proc, $1); } | full_markup { SCM proc = parser->lexer_->lookup_identifier ("toplevel-text-handler"); - scm_call_2 (proc, parser->self_scm (), scm_list_1 ($1)); + scm_call_1 (proc, scm_list_1 ($1)); } | full_markup_list { SCM proc = parser->lexer_->lookup_identifier ("toplevel-text-handler"); - scm_call_2 (proc, parser->self_scm (), $1); + scm_call_1 (proc, $1); } | SCM_TOKEN { // Evaluate and ignore #xxx, as opposed to \xxx @@ -443,19 +458,19 @@ toplevel_expression: if (scm_is_pair (out)) { SCM proc = parser->lexer_->lookup_identifier ("toplevel-text-handler"); - scm_call_2 (proc, parser->self_scm (), out); - } else if (unsmob_score ($1)) + scm_call_1 (proc, out); + } else if (unsmob ($1)) { SCM proc = parser->lexer_->lookup_identifier ("toplevel-score-handler"); - scm_call_2 (proc, parser->self_scm (), $1); - } else if (Output_def * od = unsmob_output_def ($1)) { + scm_call_1 (proc, $1); + } else if (Output_def * od = unsmob ($1)) { SCM id = SCM_EOL; - if (od->c_variable ("is-paper") == SCM_BOOL_T) + if (to_boolean (od->c_variable ("is-paper"))) id = ly_symbol2scm ("$defaultpaper"); - else if (od->c_variable ("is-midi") == SCM_BOOL_T) + else if (to_boolean (od->c_variable ("is-midi"))) id = ly_symbol2scm ("$defaultmidi"); - else if (od->c_variable ("is-layout") == SCM_BOOL_T) + else if (to_boolean (od->c_variable ("is-layout"))) id = ly_symbol2scm ("$defaultlayout"); parser->lexer_->set_identifier (id, $1); @@ -464,13 +479,13 @@ toplevel_expression: } | output_def { SCM id = SCM_EOL; - Output_def * od = unsmob_output_def ($1); + Output_def * od = unsmob ($1); - if (od->c_variable ("is-paper") == SCM_BOOL_T) + if (to_boolean (od->c_variable ("is-paper"))) id = ly_symbol2scm ("$defaultpaper"); - else if (od->c_variable ("is-midi") == SCM_BOOL_T) + else if (to_boolean (od->c_variable ("is-midi"))) id = ly_symbol2scm ("$defaultmidi"); - else if (od->c_variable ("is-layout") == SCM_BOOL_T) + else if (to_boolean (od->c_variable ("is-layout"))) id = ly_symbol2scm ("$defaultlayout"); parser->lexer_->set_identifier (id, $1); @@ -497,6 +512,7 @@ embedded_scm_bare_arg: $$ = parser->lexer_->eval_scm_token ($1, @1); } | FRACTION + | partial_markup | full_markup_list | context_modification | score_block @@ -530,8 +546,8 @@ embedded_scm_arg: scm_function_call: SCM_FUNCTION function_arglist { - $$ = MAKE_SYNTAX ("music-function", @$, - $1, $2); + $$ = MAKE_SYNTAX (music_function, @$, + $1, $2); } ; @@ -554,14 +570,14 @@ embedded_lilypond: // for empty rules, and the only token in the whole // production, EMBEDDED_LILY, is synthetic and also // contains no source location. - $$ = MAKE_SYNTAX ("void-music", @$); + $$ = MAKE_SYNTAX (void_music, @$); } | identifier_init_nonumber | embedded_lilypond_number | post_event post_events { $$ = scm_reverse_x ($2, SCM_EOL); - if (Music *m = unsmob_music ($1)) + if (Music *m = unsmob ($1)) { if (m->is_mus_type ("post-event-wrapper")) $$ = scm_append @@ -583,11 +599,11 @@ embedded_lilypond: | multiplied_duration | music_embedded music_embedded music_list { $3 = scm_reverse_x ($3, SCM_EOL); - if (unsmob_music ($2)) + if (unsmob ($2)) $3 = scm_cons ($2, $3); - if (unsmob_music ($1)) + if (unsmob ($1)) $3 = scm_cons ($1, $3); - $$ = MAKE_SYNTAX ("sequential-music", @$, $3); + $$ = MAKE_SYNTAX (sequential_music, @$, $3); } | error { parser->error_level_ = 1; @@ -647,7 +663,7 @@ identifier_init: | post_event_nofinger post_events { $$ = scm_reverse_x ($2, SCM_EOL); - if (Music *m = unsmob_music ($1)) + if (Music *m = unsmob ($1)) { if (m->is_mus_type ("post-event-wrapper")) $$ = scm_append @@ -678,19 +694,105 @@ identifier_init_nonumber: | pitch_or_music | FRACTION | string - | embedded_scm + | embedded_scm + | partial_markup | full_markup_list | context_modification + | partial_function ETC + { + $$ = MAKE_SYNTAX (partial_music_function, @$, + scm_reverse_x ($1, SCM_EOL)); + } + ; + +// Partial functions +partial_function: + MUSIC_FUNCTION function_arglist_partial + { + $$ = scm_acons ($1, $2, SCM_EOL); + } + | EVENT_FUNCTION function_arglist_partial + { + $$ = scm_acons ($1, $2, SCM_EOL); + } + | SCM_FUNCTION function_arglist_partial + { + $$ = scm_acons ($1, $2, SCM_EOL); + } + | OVERRIDE grob_prop_path '=' + { + if (SCM_UNBNDP ($2)) + $$ = scm_list_1 (SCM_BOOL_F); + else + $$ = scm_cons + (scm_list_3 (Syntax::property_override_function, + scm_cdr ($2), scm_car ($2)), + SCM_EOL); + } + | SET context_prop_spec '=' + { + if (SCM_UNBNDP ($2)) + $$ = scm_list_1 (SCM_BOOL_F); + else + $$ = scm_cons + (scm_list_3 (Syntax::property_set_function, + scm_cadr ($2), scm_car ($2)), + SCM_EOL); + } + | MUSIC_FUNCTION EXPECT_SCM function_arglist_optional partial_function + { + $$ = scm_acons ($1, $3, $4); + } + | EVENT_FUNCTION EXPECT_SCM function_arglist_optional partial_function + { + $$ = scm_acons ($1, $3, $4); + } + | SCM_FUNCTION EXPECT_SCM function_arglist_optional partial_function + { + $$ = scm_acons ($1, $3, $4); + } + | OVERRIDE grob_prop_path '=' partial_function + { + if (SCM_UNBNDP ($2)) + $$ = scm_list_1 (SCM_BOOL_F); + else + $$ = scm_cons + (scm_list_3 (Syntax::property_override_function, + scm_cdr ($2), scm_car ($2)), + $4); + } + | SET context_prop_spec '=' partial_function + { + if (SCM_UNBNDP ($2)) + $$ = scm_list_1 (SCM_BOOL_F); + else + $$ = scm_cons + (scm_list_3 (Syntax::property_set_function, + scm_cadr ($2), scm_car ($2)), + $4); + } + | MUSIC_FUNCTION EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup partial_function + { + $$ = scm_acons ($1, $4, $5); + } + | EVENT_FUNCTION EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup partial_function + { + $$ = scm_acons ($1, $4, $5); + } + | SCM_FUNCTION EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup partial_function + { + $$ = scm_acons ($1, $4, $5); + } ; context_def_spec_block: CONTEXT '{' context_def_spec_body '}' { $$ = $3; - Context_def *td = unsmob_context_def ($$); + Context_def *td = unsmob ($$); if (!td) { $$ = Context_def::make_scm (); - td = unsmob_context_def ($$); + td = unsmob ($$); } td->origin ()->set_spot (@$); } @@ -717,41 +819,41 @@ context_def_spec_body: } | context_def_spec_body context_mod { if (!SCM_UNBNDP ($2)) { - Context_def *td = unsmob_context_def ($$); + Context_def *td = unsmob ($$); if (!td) { $$ = Context_def::make_scm (); - td = unsmob_context_def ($$); + td = unsmob ($$); } - unsmob_context_def ($$)->add_context_mod ($2); + unsmob ($$)->add_context_mod ($2); } } | context_def_spec_body context_modification { - Context_def *td = unsmob_context_def ($$); + Context_def *td = unsmob ($$); if (!td) { $$ = Context_def::make_scm (); - td = unsmob_context_def ($$); + td = unsmob ($$); } - SCM new_mods = unsmob_context_mod ($2)->get_mods (); + SCM new_mods = unsmob ($2)->get_mods (); for (SCM m = new_mods; scm_is_pair (m); m = scm_cdr (m)) { td->add_context_mod (scm_car (m)); } } | context_def_spec_body context_mod_arg { - Context_def *td = unsmob_context_def ($1); + Context_def *td = unsmob ($1); if (scm_is_eq ($2, SCM_UNSPECIFIED)) ; - else if (!td && unsmob_context_def ($2)) + else if (!td && unsmob ($2)) $$ = $2; else { if (!td) { $$ = Context_def::make_scm (); - td = unsmob_context_def ($$); + td = unsmob ($$); } - if (unsmob_music ($2)) { + if (unsmob ($2)) { SCM proc = parser->lexer_->lookup_identifier ("context-mod-music-handler"); - $2 = scm_call_2 (proc, parser->self_scm (), $2); + $2 = scm_call_1 (proc, $2); } - if (Context_mod *cm = unsmob_context_mod ($2)) { + if (Context_mod *cm = unsmob ($2)) { for (SCM m = cm->get_mods (); scm_is_pair (m); m = scm_cdr (m)) { td->add_context_mod (scm_car (m)); } @@ -766,7 +868,7 @@ context_def_spec_body: book_block: BOOK '{' book_body '}' { $$ = $3; - unsmob_book ($$)->origin ()->set_spot (@$); + unsmob ($$)->origin ()->set_spot (@$); pop_paper (parser); parser->lexer_->set_identifier (ly_symbol2scm ("$current-book"), SCM_BOOL_F); } @@ -779,7 +881,7 @@ book_body: { Book *book = new Book; init_papers (parser); - book->paper_ = dynamic_cast (unsmob_output_def (parser->lexer_->lookup_identifier ("$defaultpaper"))->clone ()); + book->paper_ = dynamic_cast (unsmob (parser->lexer_->lookup_identifier ("$defaultpaper"))->clone ()); book->paper_->unprotect (); push_paper (parser, book->paper_); book->header_ = get_header (parser); @@ -790,8 +892,8 @@ book_body: parser->lexer_->set_identifier (ly_symbol2scm ("$current-book"), $1); } | book_body paper_block { - unsmob_book ($1)->paper_ = unsmob_output_def ($2); - set_paper (parser, unsmob_output_def ($2)); + unsmob ($1)->paper_ = unsmob ($2); + set_paper (parser, unsmob ($2)); } | book_body bookpart_block { SCM proc = parser->lexer_->lookup_identifier ("book-bookpart-handler"); @@ -803,7 +905,7 @@ book_body: } | book_body composite_music { SCM proc = parser->lexer_->lookup_identifier ("book-music-handler"); - scm_call_3 (proc, parser->self_scm (), $1, $2); + scm_call_2 (proc, $1, $2); } | book_body full_markup { SCM proc = parser->lexer_->lookup_identifier ("book-text-handler"); @@ -828,18 +930,18 @@ book_body: { SCM proc = parser->lexer_->lookup_identifier ("book-text-handler"); scm_call_2 (proc, $1, out); - } else if (unsmob_score ($2)) + } else if (unsmob ($2)) { SCM proc = parser->lexer_->lookup_identifier ("book-score-handler"); scm_call_2 (proc, $1, $2); - } else if (Output_def *od = unsmob_output_def ($2)) { + } else if (Output_def *od = unsmob ($2)) { SCM id = SCM_EOL; - if (od->c_variable ("is-paper") == SCM_BOOL_T) + if (to_boolean (od->c_variable ("is-paper"))) id = ly_symbol2scm ("$defaultpaper"); - else if (od->c_variable ("is-midi") == SCM_BOOL_T) + else if (to_boolean (od->c_variable ("is-midi"))) id = ly_symbol2scm ("$defaultmidi"); - else if (od->c_variable ("is-layout") == SCM_BOOL_T) + else if (to_boolean (od->c_variable ("is-layout"))) id = ly_symbol2scm ("$defaultlayout"); parser->lexer_->set_identifier (id, $2); @@ -848,10 +950,10 @@ book_body: } | book_body { - parser->lexer_->add_scope (unsmob_book ($1)->header_); + parser->lexer_->add_scope (unsmob ($1)->header_); } lilypond_header | book_body error { - Book *book = unsmob_book ($1); + Book *book = unsmob ($1); book->paper_ = 0; book->scores_ = SCM_EOL; book->bookparts_ = SCM_EOL; @@ -861,7 +963,7 @@ book_body: bookpart_block: BOOKPART '{' bookpart_body '}' { $$ = $3; - unsmob_book ($$)->origin ()->set_spot (@$); + unsmob ($$)->origin ()->set_spot (@$); parser->lexer_->set_identifier (ly_symbol2scm ("$current-bookpart"), SCM_BOOL_F); } ; @@ -876,7 +978,7 @@ bookpart_body: parser->lexer_->set_identifier (ly_symbol2scm ("$current-bookpart"), $1); } | bookpart_body paper_block { - unsmob_book ($$)->paper_ = unsmob_output_def ($2); + unsmob ($$)->paper_ = unsmob ($2); } | bookpart_body score_block { SCM proc = parser->lexer_->lookup_identifier ("bookpart-score-handler"); @@ -884,7 +986,7 @@ bookpart_body: } | bookpart_body composite_music { SCM proc = parser->lexer_->lookup_identifier ("bookpart-music-handler"); - scm_call_3 (proc, parser->self_scm (), $1, $2); + scm_call_2 (proc, $1, $2); } | bookpart_body full_markup { SCM proc = parser->lexer_->lookup_identifier ("bookpart-text-handler"); @@ -909,18 +1011,18 @@ bookpart_body: { SCM proc = parser->lexer_->lookup_identifier ("bookpart-text-handler"); scm_call_2 (proc, $1, out); - } else if (unsmob_score ($2)) + } else if (unsmob ($2)) { SCM proc = parser->lexer_->lookup_identifier ("bookpart-score-handler"); scm_call_2 (proc, $1, $2); - } else if (Output_def *od = unsmob_output_def ($2)) { + } else if (Output_def *od = unsmob ($2)) { SCM id = SCM_EOL; - if (od->c_variable ("is-paper") == SCM_BOOL_T) + if (to_boolean (od->c_variable ("is-paper"))) id = ly_symbol2scm ("$defaultpaper"); - else if (od->c_variable ("is-midi") == SCM_BOOL_T) + else if (to_boolean (od->c_variable ("is-midi"))) id = ly_symbol2scm ("$defaultmidi"); - else if (od->c_variable ("is-layout") == SCM_BOOL_T) + else if (to_boolean (od->c_variable ("is-layout"))) id = ly_symbol2scm ("$defaultlayout"); parser->lexer_->set_identifier (id, $2); @@ -929,13 +1031,13 @@ bookpart_body: } | bookpart_body { - Book *book = unsmob_book ($1); + Book *book = unsmob ($1); if (!ly_is_module (book->header_)) book->header_ = ly_make_module (false); parser->lexer_->add_scope (book->header_); } lilypond_header | bookpart_body error { - Book *book = unsmob_book ($1); + Book *book = unsmob ($1); book->paper_ = 0; book->scores_ = SCM_EOL; } @@ -943,31 +1045,31 @@ bookpart_body: score_block: SCORE '{' score_body '}' { - unsmob_score ($3)->origin ()->set_spot (@$); + unsmob ($3)->origin ()->set_spot (@$); $$ = $3; } ; score_body: score_items { - if (!unsmob_score ($1)) { + if (!unsmob ($1)) { parser->parser_error (@1, _("Missing music in \\score")); $$ = (new Score)->unprotect (); if (scm_is_pair ($1) && ly_is_module (scm_car ($1))) { - unsmob_score ($$)->set_header (scm_car ($1)); + unsmob ($$)->set_header (scm_car ($1)); $1 = scm_cdr ($1); } for (SCM p = scm_reverse_x ($1, SCM_EOL); scm_is_pair (p); p = scm_cdr (p)) { - unsmob_score ($$)-> - add_output_def (unsmob_output_def (scm_car (p))); + unsmob ($$)-> + add_output_def (unsmob (scm_car (p))); } } } | score_body error { - unsmob_score ($$)->error_found_ = true; + unsmob ($$)->error_found_ = true; } ; @@ -984,26 +1086,25 @@ score_items: } | score_items score_item { - Output_def *od = unsmob_output_def ($2); + Output_def *od = unsmob ($2); if (od) { - if (od->lookup_variable (ly_symbol2scm ("is-paper")) == SCM_BOOL_T) + if (to_boolean (od->lookup_variable (ly_symbol2scm ("is-paper")))) { parser->parser_error (@2, _("\\paper cannot be used in \\score, use \\layout instead")); od = 0; $2 = SCM_UNSPECIFIED; } - } else if (!unsmob_score ($$)) { - if (unsmob_music ($2)) { - SCM scorify = ly_lily_module_constant ("scorify-music"); - $2 = scm_call_2 (scorify, $2, parser->self_scm ()); + } else if (!unsmob ($$)) { + if (unsmob ($2)) { + $2 = Lily::scorify_music ($2); } - if (unsmob_score ($2)) + if (unsmob ($2)) { $$ = $2; $2 = SCM_UNSPECIFIED; } } - Score *score = unsmob_score ($$); + Score *score = unsmob ($$); if (score && scm_is_pair ($1)) { if (ly_is_module (scm_car ($1))) { @@ -1013,7 +1114,7 @@ score_items: for (SCM p = scm_reverse_x ($1, SCM_EOL); scm_is_pair (p); p = scm_cdr (p)) { - score->add_output_def (unsmob_output_def (scm_car (p))); + score->add_output_def (unsmob (scm_car (p))); } } if (od) { @@ -1028,7 +1129,7 @@ score_items: } | score_items { - if (Score *score = unsmob_score ($1)) { + if (Score *score = unsmob ($1)) { if (!ly_is_module (score->get_header ())) score->set_header (ly_make_module (false)); parser->lexer_->add_scope (score->get_header ()); @@ -1050,9 +1151,9 @@ score_items: paper_block: output_def { - Output_def *od = unsmob_output_def ($1); + Output_def *od = unsmob ($1); - if (od->lookup_variable (ly_symbol2scm ("is-paper")) != SCM_BOOL_T) + if (!to_boolean (od->lookup_variable (ly_symbol2scm ("is-paper")))) { parser->parser_error (@1, _ ("need \\paper for paper block")); $$ = get_paper (parser)->unprotect (); @@ -1110,7 +1211,7 @@ music_or_context_def: output_def_body: output_def_head_with_mode_switch '{' { - unsmob_output_def ($1)->input_origin_.set_spot (@$); + unsmob ($1)->input_origin_.set_spot (@$); // This is a stupid trick to mark the beginning of the // body for deciding whether to allow // embedded_scm_active to have an output definition @@ -1127,7 +1228,7 @@ output_def_body: // definitions. if (scm_is_pair ($1)) { - Output_def *o = unsmob_output_def ($2); + Output_def *o = unsmob ($2); if (o) { o->input_origin_.set_spot (@$); $1 = o->self_scm (); @@ -1137,15 +1238,14 @@ output_def_body: } else $1 = scm_car ($1); } - if (unsmob_context_def ($2)) - assign_context_def (unsmob_output_def ($1), $2); + if (unsmob ($2)) + assign_context_def (unsmob ($1), $2); // Seems unlikely, but let's be complete: - else if (unsmob_music ($2)) + else if (unsmob ($2)) { SCM proc = parser->lexer_->lookup_identifier ("output-def-music-handler"); - scm_call_3 (proc, parser->self_scm (), - $1, $2); + scm_call_2 (proc, $1, $2); } else if (!scm_is_eq ($2, SCM_UNSPECIFIED)) parser->parser_error (@2, _("bad expression type")); $$ = $1; @@ -1165,14 +1265,13 @@ output_def_body: } music_or_context_def { parser->lexer_->pop_state (); - if (unsmob_context_def ($3)) - assign_context_def (unsmob_output_def ($1), $3); + if (unsmob ($3)) + assign_context_def (unsmob ($1), $3); else { SCM proc = parser->lexer_->lookup_identifier ("output-def-music-handler"); - scm_call_3 (proc, parser->self_scm (), - $1, $3); + scm_call_2 (proc, $1, $3); } $$ = $1; } @@ -1183,13 +1282,13 @@ output_def_body: tempo_event: TEMPO steno_duration '=' tempo_range { - $$ = MAKE_SYNTAX ("tempo", @$, SCM_EOL, $2, $4); + $$ = MAKE_SYNTAX (tempo, @$, SCM_EOL, $2, $4); } - | TEMPO scalar steno_duration '=' tempo_range { - $$ = MAKE_SYNTAX ("tempo", @$, $2, $3, $5); + | TEMPO text steno_duration '=' tempo_range { + $$ = MAKE_SYNTAX (tempo, @$, $2, $3, $5); } - | TEMPO scalar { - $$ = MAKE_SYNTAX ("tempo", @$, $2); + | TEMPO text { + $$ = MAKE_SYNTAX (tempo, @$, $2); } %prec ':' ; @@ -1201,7 +1300,7 @@ music_list: $$ = SCM_EOL; } | music_list music_embedded { - if (unsmob_music ($2)) + if (unsmob ($2)) $$ = scm_cons ($2, $1); } | music_list error { @@ -1222,13 +1321,17 @@ braced_music_list: music: music_assign | lyric_element_music - | pitch_or_music + | pitch_as_music + ; + +pitch_as_music: + pitch_or_music { $$ = make_music_from_simple (parser, @1, $1); - if (!unsmob_music ($$)) + if (!unsmob ($$)) { parser->parser_error (@1, _ ("music expected")); - $$ = MAKE_SYNTAX ("void-music", @$); + $$ = MAKE_SYNTAX (void_music, @$); } } ; @@ -1236,7 +1339,7 @@ music: music_assign music_embedded: music { - if (unsmob_music ($1)->is_mus_type ("post-event")) { + if (unsmob ($1)->is_mus_type ("post-event")) { parser->parser_error (@1, _ ("unexpected post-event")); $$ = SCM_UNSPECIFIED; } @@ -1253,7 +1356,7 @@ music_embedded: { Music *n = MY_MAKE_MUSIC ("NoteEvent", @$); - parser->default_duration_ = *unsmob_duration ($1); + parser->default_duration_ = *unsmob ($1); n->set_property ("duration", $1); if (scm_is_pair ($2)) @@ -1268,7 +1371,7 @@ music_embedded_backup: { if (scm_is_eq ($1, SCM_UNSPECIFIED)) $$ = $1; - else if (Music *m = unsmob_music ($1)) { + else if (Music *m = unsmob ($1)) { if (m->is_mus_type ("post-event")) { parser->parser_error (@1, _ ("unexpected post-event")); @@ -1295,29 +1398,29 @@ music_assign: repeated_music: REPEAT simple_string unsigned_number music { - $$ = MAKE_SYNTAX ("repeat", @$, $2, $3, $4, SCM_EOL); + $$ = MAKE_SYNTAX (repeat, @$, $2, $3, $4, SCM_EOL); } | REPEAT simple_string unsigned_number music ALTERNATIVE braced_music_list { - $$ = MAKE_SYNTAX ("repeat", @$, $2, $3, $4, $6); + $$ = MAKE_SYNTAX (repeat, @$, $2, $3, $4, $6); } ; sequential_music: SEQUENTIAL braced_music_list { - $$ = MAKE_SYNTAX ("sequential-music", @$, $2); + $$ = MAKE_SYNTAX (sequential_music, @$, $2); } | braced_music_list { - $$ = MAKE_SYNTAX ("sequential-music", @$, $1); + $$ = MAKE_SYNTAX (sequential_music, @$, $1); } ; simultaneous_music: SIMULTANEOUS braced_music_list { - $$ = MAKE_SYNTAX ("simultaneous-music", @$, $2); + $$ = MAKE_SYNTAX (simultaneous_music, @$, $2); } | DOUBLE_ANGLE_OPEN music_list DOUBLE_ANGLE_CLOSE { - $$ = MAKE_SYNTAX ("simultaneous-music", @$, scm_reverse_x ($2, SCM_EOL)); + $$ = MAKE_SYNTAX (simultaneous_music, @$, scm_reverse_x ($2, SCM_EOL)); } ; @@ -1347,11 +1450,11 @@ context_modification: } | WITH context_modification_arg { - if (unsmob_music ($2)) { + if (unsmob ($2)) { SCM proc = parser->lexer_->lookup_identifier ("context-mod-music-handler"); - $2 = scm_call_2 (proc, parser->self_scm (), $2); + $2 = scm_call_1 (proc, $2); } - if (unsmob_context_mod ($2)) + if (unsmob ($2)) $$ = $2; else { parser->parser_error (@2, _ ("not a context mod")); @@ -1381,32 +1484,123 @@ context_mod_list: } | context_mod_list context_mod { if (!SCM_UNBNDP ($2)) - unsmob_context_mod ($1)->add_context_mod ($2); + unsmob ($1)->add_context_mod ($2); } | context_mod_list CONTEXT_MOD_IDENTIFIER { - Context_mod *md = unsmob_context_mod ($2); + Context_mod *md = unsmob ($2); if (md) - unsmob_context_mod ($1)->add_context_mods (md->get_mods ()); + unsmob ($1)->add_context_mods (md->get_mods ()); } | context_mod_list context_mod_arg { if (scm_is_eq ($2, SCM_UNSPECIFIED)) ; - else if (unsmob_music ($2)) { + else if (unsmob ($2)) { SCM proc = parser->lexer_->lookup_identifier ("context-mod-music-handler"); - $2 = scm_call_2 (proc, parser->self_scm (), $2); + $2 = scm_call_1 (proc, $2); } - if (unsmob_context_mod ($2)) - unsmob_context_mod ($$)->add_context_mods - (unsmob_context_mod ($2)->get_mods ()); + if (unsmob ($2)) + unsmob ($$)->add_context_mods + (unsmob ($2)->get_mods ()); else { parser->parser_error (@2, _ ("not a context mod")); } } ; -composite_music: - complex_music +context_prefix: + CONTEXT symbol optional_id optional_context_mod { + Context_mod *ctxmod = unsmob ($4); + SCM mods = SCM_EOL; + if (ctxmod) + mods = ctxmod->get_mods (); + $$ = START_MAKE_SYNTAX (context_specification, $2, $3, mods, SCM_BOOL_F); + } + | NEWCONTEXT symbol optional_id optional_context_mod { + Context_mod *ctxmod = unsmob ($4); + SCM mods = SCM_EOL; + if (ctxmod) + mods = ctxmod->get_mods (); + $$ = START_MAKE_SYNTAX (context_specification, $2, $3, mods, SCM_BOOL_T); + } + ; + +new_lyrics: + ADDLYRICS optional_context_mod lyric_mode_music { + Context_mod *ctxmod = unsmob ($2); + SCM mods = SCM_EOL; + if (ctxmod) + mods = ctxmod->get_mods (); + $$ = scm_acons ($3, mods, SCM_EOL); + } + | new_lyrics ADDLYRICS optional_context_mod lyric_mode_music { + Context_mod *ctxmod = unsmob ($3); + SCM mods = SCM_EOL; + if (ctxmod) + mods = ctxmod->get_mods (); + $$ = scm_acons ($4, mods, $1); + } + ; + +/* basic_music is basically the same as composite_music but with + * context-prefixed music and lyricized music explicitly removed. The + * reason is that in a sequence + * + * \new Staff \new Voice { ... } \addlyrics { ... } \addlyrics { ... } + * + * we need to group both \addlyrics together (as they go with the same + * voice) but then combine them with \new Voice { ... }, meaning that + * combining \new Voice { ... } needs higher priority than + * { ... } \addlyrics, and *not* have \new Staff \new Voice { ... } + * combine before combining \new Voice { ... } \addlyrics: only one + * layer of context-prefixed music should assemble before \addlyrics + * is integrated. Total mess, and we sort this mess out with explicit + * rules preferring a single context-prefix. + */ + +basic_music: + music_function_call + | repeated_music | music_bare + | LYRICSTO simple_string lyric_mode_music { + $$ = MAKE_SYNTAX (lyric_combine, @$, $2, SCM_EOL, $3); + } + | LYRICSTO symbol '=' simple_string lyric_mode_music + { + $$ = MAKE_SYNTAX (lyric_combine, @$, $3, $2, $4); + } + ; + +contextable_music: + basic_music + | pitch_as_music + | event_chord + ; + +contexted_basic_music: + context_prefix contextable_music new_lyrics + { + Input i; + i.set_location (@1, @2); + $$ = FINISH_MAKE_SYNTAX ($1, i, $2); + $$ = MAKE_SYNTAX (add_lyrics, @$, $$, scm_reverse_x ($3, SCM_EOL)); + } %prec COMPOSITE + | context_prefix contextable_music + { + $$ = FINISH_MAKE_SYNTAX ($1, @$, $2); + } %prec COMPOSITE + | context_prefix contexted_basic_music + { + $$ = FINISH_MAKE_SYNTAX ($1, @$, $2); + } + ; + +composite_music: + basic_music %prec COMPOSITE + | contexted_basic_music + | basic_music new_lyrics + { + $$ = MAKE_SYNTAX (add_lyrics, @$, $1, scm_reverse_x ($2, SCM_EOL)); + } %prec COMPOSITE ; music_bare: @@ -1494,8 +1688,7 @@ symbol_list_rev: symbol_list_part: symbol_list_element { - SCM sym_l_p = ly_lily_module_constant ("symbol-list?"); - $$ = try_string_variants (sym_l_p, $1); + $$ = try_string_variants (Lily::symbol_list_p, $1); if (SCM_UNBNDP ($$)) { parser->parser_error (@1, _("not a symbol")); $$ = SCM_EOL; @@ -1565,7 +1758,11 @@ function_arglist_nonbackup: (parser, @3, $3), $1, $2); } - | function_arglist_nonbackup_reparse REPARSE duration_length + | function_arglist_nonbackup_reparse REPARSE multiplied_duration + { + $$ = check_scheme_arg (parser, @3, $3, $1, $2); + } + | function_arglist_nonbackup_reparse REPARSE reparsed_rhythm { $$ = check_scheme_arg (parser, @3, $3, $1, $2); } @@ -1587,6 +1784,20 @@ function_arglist_nonbackup: } ; + +reparsed_rhythm: + DURATION_ARG dots multipliers post_events + { + $$ = make_music_from_simple (parser, @$, + make_duration ($1, scm_to_int ($2), $3)); + Music *m = unsmob ($$); + assert (m); + if (scm_is_pair ($4)) + m->set_property ("articulations", + scm_reverse_x ($4, SCM_EOL)); + } %prec ':' + ; + function_arglist_nonbackup_reparse: EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup SCM_IDENTIFIER { @@ -1661,18 +1872,34 @@ function_arglist_nonbackup_reparse: { $$ = $3; if (scm_is_true (scm_call_1 ($2, $4))) + // May be 3 \cm or similar MYREPARSE (@4, $2, REAL, $4); else { SCM d = make_duration ($4); - if (SCM_UNBNDP (d) || scm_is_false (scm_call_1 ($2, d))) - MYREPARSE (@4, $2, REAL, $4); // trigger error - else - MYREPARSE (@4, $2, DURATION_IDENTIFIER, d); + if (!SCM_UNBNDP (d)) { + if (scm_is_true (scm_call_1 ($2, d))) + MYREPARSE (@4, $2, DURATION_IDENTIFIER, d); + else if (scm_is_true + (scm_call_1 + ($2, make_music_from_simple (parser, @4, d)))) + MYREPARSE (@4, $2, DURATION_ARG, d); + else + MYREPARSE (@4, $2, SCM_ARG, $4); // trigger error + } else + MYREPARSE (@4, $2, SCM_ARG, $4); // trigger error } } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup DURATION_IDENTIFIER { + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup DURATION_IDENTIFIER + { $$ = $3; - MYREPARSE (@4, $2, DURATION_IDENTIFIER, $4); + if (scm_is_true (scm_call_1 ($2, $4))) + MYREPARSE (@4, $2, DURATION_IDENTIFIER, $4); + else if (scm_is_true + (scm_call_1 + ($2, make_music_from_simple (parser, @4, $4)))) + MYREPARSE (@4, $2, DURATION_ARG, $4); + else + MYREPARSE (@4, $2, SCM_ARG, $4); // trigger error } ; @@ -1691,7 +1918,7 @@ function_arglist_backup: $$ = scm_cons ($$, $3); else { - $$ = scm_cons (loc_on_music (@3, $1), $3); + $$ = scm_cons (loc_on_music (parser, @3, $1), $3); MYBACKUP (SCM_ARG, $4, @4); } } @@ -1702,7 +1929,7 @@ function_arglist_backup: { $$ = scm_cons ($4, $3); } else { - $$ = scm_cons (loc_on_music (@3, $1), $3); + $$ = scm_cons (loc_on_music (parser, @3, $1), $3); MYBACKUP (EVENT_IDENTIFIER, $4, @4); } } @@ -1718,7 +1945,7 @@ function_arglist_backup: } else if (scm_is_true (scm_call_1 ($2, $4))) $$ = scm_cons ($4, $3); else { - $$ = scm_cons (loc_on_music (@3, $1), $3); + $$ = scm_cons (loc_on_music (parser, @3, $1), $3); MYBACKUP (PITCH_IDENTIFIER, $4, @4); } } @@ -1734,7 +1961,7 @@ function_arglist_backup: } else if (scm_is_true (scm_call_1 ($2, $4))) $$ = scm_cons ($4, $3); else { - $$ = scm_cons (loc_on_music (@3, $1), $3); + $$ = scm_cons (loc_on_music (parser, @3, $1), $3); MYBACKUP (TONICNAME_PITCH, $4, @4); } } @@ -1743,25 +1970,32 @@ function_arglist_backup: if (scm_is_true (scm_call_1 ($2, $4))) $$ = scm_cons ($4, $3); else { - $$ = scm_cons (loc_on_music (@3, $1), $3); + $$ = scm_cons (loc_on_music (parser, @3, $1), $3); MYBACKUP (SCM_IDENTIFIER, $4, @4); } } | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup UNSIGNED { + $$ = $3; if (scm_is_true (scm_call_1 ($2, $4))) - { + // May be 3 \cm or similar MYREPARSE (@4, $2, REAL, $4); - $$ = $3; - } else { + else { SCM d = make_duration ($4); - if (SCM_UNBNDP (d) || scm_is_false (scm_call_1 ($2, d))) - { - $$ = scm_cons (loc_on_music (@3, $1), $3); - MYBACKUP (UNSIGNED, $4, @4); + if (!SCM_UNBNDP (d)) { + if (scm_is_true (scm_call_1 ($2, d))) + MYREPARSE (@4, $2, DURATION_IDENTIFIER, d); + else if (scm_is_true + (scm_call_1 + ($2, make_music_from_simple (parser, @4, d)))) + MYREPARSE (@4, $2, DURATION_ARG, d); + else { + $$ = scm_cons (loc_on_music (parser, @3, $1), $3); + MYBACKUP (UNSIGNED, $4, @4); + } } else { - MYREPARSE (@4, $2, DURATION_IDENTIFIER, d); - $$ = $3; + $$ = scm_cons (loc_on_music (parser, @3, $1), $3); + MYBACKUP (UNSIGNED, $4, @4); } } } @@ -1772,7 +2006,7 @@ function_arglist_backup: $$ = $3; MYREPARSE (@4, $2, REAL, $4); } else { - $$ = scm_cons (loc_on_music (@3, $1), $3); + $$ = scm_cons (loc_on_music (parser, @3, $1), $3); MYBACKUP (REAL, $4, @4); } } @@ -1782,7 +2016,7 @@ function_arglist_backup: { $$ = scm_cons ($4, $3); } else { - $$ = scm_cons (loc_on_music (@3, $1), $3); + $$ = scm_cons (loc_on_music (parser, @3, $1), $3); MYBACKUP (NUMBER_IDENTIFIER, $4, @4); } } @@ -1799,7 +2033,7 @@ function_arglist_backup: if (scm_is_true (scm_call_1 ($2, $$))) $$ = scm_cons ($$, $3); else { - $$ = scm_cons (loc_on_music (@3, $1), $3); + $$ = scm_cons (loc_on_music (parser, @3, $1), $3); MYBACKUP (UNSIGNED, $5, @5); parser->lexer_->push_extra_token (@4, '-'); } @@ -1812,7 +2046,7 @@ function_arglist_backup: MYREPARSE (@5, $2, REAL, n); $$ = $3; } else { - $$ = scm_cons (loc_on_music (@3, $1), $3); + $$ = scm_cons (loc_on_music (parser, @3, $1), $3); MYBACKUP (REAL, n, @5); } } @@ -1822,18 +2056,21 @@ function_arglist_backup: if (scm_is_true (scm_call_1 ($2, n))) { $$ = scm_cons (n, $3); } else { - $$ = scm_cons (loc_on_music (@3, $1), $3); + $$ = scm_cons (loc_on_music (parser, @3, $1), $3); MYBACKUP (NUMBER_IDENTIFIER, n, @5); } } | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup DURATION_IDENTIFIER { + $$ = $3; if (scm_is_true (scm_call_1 ($2, $4))) - { MYREPARSE (@4, $2, DURATION_IDENTIFIER, $4); - $$ = $3; - } else { - $$ = scm_cons (loc_on_music (@3, $1), $3); + else if (scm_is_true + (scm_call_1 + ($2, make_music_from_simple (parser, @4, $4)))) + MYREPARSE (@4, $2, DURATION_ARG, $4); + else { + $$ = scm_cons (loc_on_music (parser, @3, $1), $3); MYBACKUP (DURATION_IDENTIFIER, $4, @4); } } @@ -1848,7 +2085,7 @@ function_arglist_backup: else $$ = scm_cons (res, $3); else { - $$ = scm_cons (loc_on_music (@3, $1), $3); + $$ = scm_cons (loc_on_music (parser, @3, $1), $3); MYBACKUP (SCM_IDENTIFIER, $4, @4); } } @@ -1863,7 +2100,7 @@ function_arglist_backup: else $$ = scm_cons (res, $3); else { - $$ = scm_cons (loc_on_music (@3, $1), $3); + $$ = scm_cons (loc_on_music (parser, @3, $1), $3); MYBACKUP (STRING, $4, @4); } } @@ -1882,7 +2119,12 @@ function_arglist_backup: $$ = check_scheme_arg (parser, @3, $3, $1, $2); } - | function_arglist_backup REPARSE duration_length + | function_arglist_backup REPARSE multiplied_duration + { + $$ = check_scheme_arg (parser, @3, + $3, $1, $2); + } + | function_arglist_backup REPARSE reparsed_rhythm { $$ = check_scheme_arg (parser, @3, $3, $1, $2); @@ -1897,7 +2139,7 @@ function_arglist: function_arglist_nonbackup | EXPECT_OPTIONAL EXPECT_SCM function_arglist_skip_nonbackup DEFAULT { - $$ = scm_cons (loc_on_music (@4, $1), $3); + $$ = scm_cons (loc_on_music (parser, @4, $1), $3); } ; @@ -1905,7 +2147,57 @@ function_arglist_skip_nonbackup: function_arglist_nonbackup | EXPECT_OPTIONAL EXPECT_SCM function_arglist_skip_nonbackup { - $$ = scm_cons (loc_on_music (@3, $1), $3); + $$ = scm_cons (loc_on_music (parser, @3, $1), $3); + } + ; + +// Partial function arglists are returned just in their incomplete +// state: when combined with the music function, the missing parts of +// the signature can be reconstructed +// +// To serve as a partial arglist, the argument list must absolutely +// _not_ be in "skipping optional arguments" mode since then there is +// some backup token that has nowhere to go before \etc. +// +// So we can skim off an arbitrary number of arguments from the end of +// the argument list. The argument list remaining afterwards has to +// be in not-skipping-optional-arguments mode. + +function_arglist_partial: + EXPECT_SCM function_arglist_optional + { + $$ = $2; + } + | EXPECT_SCM function_arglist_partial_optional + { + $$ = $2; + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup + { + $$ = $3; + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_partial + { + $$ = $3; + } + ; + +function_arglist_partial_optional: + EXPECT_SCM function_arglist_optional + { + $$ = $2; + } + | EXPECT_SCM function_arglist_partial_optional + { + $$ = $2; + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup + { + $$ = $3; + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_partial_optional + { + $$ = $3; } ; @@ -1963,7 +2255,12 @@ function_arglist_common: $$ = check_scheme_arg (parser, @3, $3, $1, $2); } - | function_arglist_common_reparse REPARSE duration_length + | function_arglist_common_reparse REPARSE multiplied_duration + { + $$ = check_scheme_arg (parser, @3, + $3, $1, $2); + } + | function_arglist_common_reparse REPARSE reparsed_rhythm { $$ = check_scheme_arg (parser, @3, $3, $1, $2); @@ -2051,19 +2348,34 @@ function_arglist_common_reparse: { $$ = $2; if (scm_is_true (scm_call_1 ($1, $3))) + // May be 3 \cm or similar MYREPARSE (@3, $1, REAL, $3); else { SCM d = make_duration ($3); - if (SCM_UNBNDP (d) || scm_is_false (scm_call_1 ($1, d))) - MYREPARSE (@3, $1, REAL, $3); - else - MYREPARSE (@3, $1, DURATION_IDENTIFIER, d); + if (!SCM_UNBNDP (d)) { + if (scm_is_true (scm_call_1 ($1, d))) + MYREPARSE (@3, $1, DURATION_IDENTIFIER, d); + else if (scm_is_true + (scm_call_1 + ($1, make_music_from_simple (parser, @3, d)))) + MYREPARSE (@3, $1, DURATION_ARG, d); + else + MYREPARSE (@3, $1, SCM_ARG, $3); // trigger error + } else + MYREPARSE (@3, $1, SCM_ARG, $3); // trigger error } } | EXPECT_SCM function_arglist_optional DURATION_IDENTIFIER { $$ = $2; - MYREPARSE (@3, $1, DURATION_IDENTIFIER, $3); + if (scm_is_true (scm_call_1 ($1, $3))) + MYREPARSE (@3, $1, DURATION_IDENTIFIER, $3); + else if (scm_is_true + (scm_call_1 + ($1, make_music_from_simple (parser, @3, $3)))) + MYREPARSE (@3, $1, DURATION_ARG, $3); + else + MYREPARSE (@3, $1, SCM_ARG, $3); // trigger error } | EXPECT_SCM function_arglist_optional '-' UNSIGNED { @@ -2093,7 +2405,7 @@ function_arglist_optional: function_arglist_backup | EXPECT_OPTIONAL EXPECT_SCM function_arglist_skip_backup DEFAULT { - $$ = scm_cons (loc_on_music (@4, $1), $3); + $$ = scm_cons (loc_on_music (parser, @4, $1), $3); } | function_arglist_skip_backup BACKUP ; @@ -2102,14 +2414,14 @@ function_arglist_skip_backup: function_arglist_backup | EXPECT_OPTIONAL EXPECT_SCM function_arglist_skip_backup { - $$ = scm_cons (loc_on_music (@3, $1), $3); + $$ = scm_cons (loc_on_music (parser, @3, $1), $3); } ; music_function_call: MUSIC_FUNCTION function_arglist { - $$ = MAKE_SYNTAX ("music-function", @$, - $1, $2); + $$ = MAKE_SYNTAX (music_function, @$, + $1, $2); } ; @@ -2138,38 +2450,11 @@ lyric_mode_music: | MUSIC_IDENTIFIER ; -complex_music: - music_function_call - | repeated_music { $$ = $1; } - | re_rhythmed_music { $$ = $1; } - | complex_music_prefix music - { - $$ = FINISH_MAKE_SYNTAX ($1, @$, $2); - } - ; - -complex_music_prefix: - CONTEXT symbol optional_id optional_context_mod { - Context_mod *ctxmod = unsmob_context_mod ($4); - SCM mods = SCM_EOL; - if (ctxmod) - mods = ctxmod->get_mods (); - $$ = START_MAKE_SYNTAX ("context-specification", $2, $3, mods, SCM_BOOL_F); - } - | NEWCONTEXT symbol optional_id optional_context_mod { - Context_mod *ctxmod = unsmob_context_mod ($4); - SCM mods = SCM_EOL; - if (ctxmod) - mods = ctxmod->get_mods (); - $$ = START_MAKE_SYNTAX ("context-specification", $2, $3, mods, SCM_BOOL_T); - } - ; - mode_changed_music: mode_changing_head grouped_music_list { - if ($1 == ly_symbol2scm ("chords")) + if (scm_is_eq ($1, ly_symbol2scm ("chords"))) { - $$ = MAKE_SYNTAX ("unrelativable-music", @$, $2); + $$ = MAKE_SYNTAX (unrelativable_music, @$, $2); } else { @@ -2178,14 +2463,14 @@ mode_changed_music: parser->lexer_->pop_state (); } | mode_changing_head_with_context optional_context_mod grouped_music_list { - Context_mod *ctxmod = unsmob_context_mod ($2); + Context_mod *ctxmod = unsmob ($2); SCM mods = SCM_EOL; if (ctxmod) mods = ctxmod->get_mods (); - $$ = MAKE_SYNTAX ("context-specification", @$, $1, SCM_EOL, mods, SCM_BOOL_T, $3); - if ($1 == ly_symbol2scm ("ChordNames")) + $$ = MAKE_SYNTAX (context_specification, @$, $1, SCM_EOL, mods, SCM_BOOL_T, $3); + if (scm_is_eq ($1, ly_symbol2scm ("ChordNames"))) { - $$ = MAKE_SYNTAX ("unrelativable-music", @$, $$); + $$ = MAKE_SYNTAX (unrelativable_music, @$, $$); } parser->lexer_->pop_state (); } @@ -2249,27 +2534,9 @@ mode_changing_head_with_context: } ; -new_lyrics: - ADDLYRICS lyric_mode_music { - $$ = scm_list_1 ($2); - } - | new_lyrics ADDLYRICS lyric_mode_music { - $$ = scm_cons ($3, $1); - } - ; - -re_rhythmed_music: - composite_music new_lyrics { - $$ = MAKE_SYNTAX ("add-lyrics", @$, $1, scm_reverse_x ($2, SCM_EOL)); - } %prec COMPOSITE - | LYRICSTO simple_string lyric_mode_music { - $$ = MAKE_SYNTAX ("lyric-combine", @$, $2, $3); - } - ; - context_change: CHANGE symbol '=' simple_string { - $$ = MAKE_SYNTAX ("context-change", @$, $2, $4); + $$ = MAKE_SYNTAX (context_change, @$, $2, $4); } ; @@ -2454,43 +2721,6 @@ context_prop_spec: } ; -simple_music_property_def: - OVERRIDE grob_prop_path '=' scalar { - if (SCM_UNBNDP ($2)) - $$ = SCM_UNDEFINED; - else { - $$ = scm_list_5 (scm_car ($2), - ly_symbol2scm ("OverrideProperty"), - scm_cadr ($2), - $4, - scm_cddr ($2)); - } - } - | REVERT simple_revert_context revert_arg { - $$ = scm_list_4 ($2, - ly_symbol2scm ("RevertProperty"), - scm_car ($3), - scm_cdr ($3)); - } - | SET context_prop_spec '=' scalar { - if (SCM_UNBNDP ($2)) - $$ = SCM_UNDEFINED; - else - $$ = scm_list_4 (scm_car ($2), - ly_symbol2scm ("PropertySet"), - scm_cadr ($2), - $4); - } - | UNSET context_prop_spec { - if (SCM_UNBNDP ($2)) - $$ = SCM_UNDEFINED; - else - $$ = scm_list_3 (scm_car ($2), - ly_symbol2scm ("PropertyUnset"), - scm_cadr ($2)); - } - ; - // This is all quite awkward for the sake of substantial backward // compatibility while at the same time allowing a more "natural" form @@ -2525,24 +2755,57 @@ simple_revert_context: ; music_property_def: - simple_music_property_def { - if (SCM_UNBNDP ($1)) - $$ = MAKE_SYNTAX ("void-music", @1); + OVERRIDE grob_prop_path '=' scalar { + if (SCM_UNBNDP ($2)) + $$ = MAKE_SYNTAX (void_music, @$); + else + $$ = MAKE_SYNTAX (property_override, @$, + scm_car ($2), + scm_cdr ($2), + $4); + } + | REVERT simple_revert_context revert_arg { + $$ = MAKE_SYNTAX (property_revert, @$, $2, $3); + } + | SET context_prop_spec '=' scalar { + if (SCM_UNBNDP ($2)) + $$ = MAKE_SYNTAX (void_music, @$); + else + $$ = MAKE_SYNTAX (property_set, @$, + scm_car ($2), + scm_cadr ($2), + $4); + } + | UNSET context_prop_spec { + if (SCM_UNBNDP ($2)) + $$ = MAKE_SYNTAX (void_music, @$); else - $$ = LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("property-operation"), scm_cons2 (parser->self_scm (), make_input (@$), $1)); + $$ = MAKE_SYNTAX (property_unset, @$, + scm_car ($2), + scm_cadr ($2)); } ; string: - STRING { - $$ = $1; - } + STRING | full_markup ; -simple_string: STRING { - $$ = $1; +text: + STRING + | full_markup + | embedded_scm_bare + { + if (Text_interface::is_markup ($1)) { + $$ = $1; + } else { + parser->parser_error (@1, (_ ("markup expected"))); + $$ = scm_string (SCM_EOL); + } } + ; + +simple_string: STRING | embedded_scm_bare { if (scm_is_string ($1)) { @@ -2562,8 +2825,7 @@ symbol: { // This is a bit of overkill but makes the same // routine responsible for all symbol interpretations. - $$ = try_string_variants (ly_lily_module_constant ("symbol?"), - $1); + $$ = try_string_variants (Guile_user::symbol_p, $1); if (SCM_UNBNDP ($$)) { parser->parser_error (@1, (_ ("symbol expected"))); @@ -2597,20 +2859,20 @@ event_chord: simple_element post_events { // Let the rhythmic music iterator sort this mess out. if (scm_is_pair ($2)) { - unsmob_music ($$)->set_property ("articulations", + unsmob ($$)->set_property ("articulations", scm_reverse_x ($2, SCM_EOL)); } } %prec ':' | CHORD_REPETITION optional_notemode_duration post_events { Input i; i.set_location (@1, @3); - $$ = MAKE_SYNTAX ("repetition-chord", i, + $$ = MAKE_SYNTAX (repetition_chord, i, $2, scm_reverse_x ($3, SCM_EOL)); } %prec ':' | MULTI_MEASURE_REST optional_notemode_duration post_events { Input i; i.set_location (@1, @3); - $$ = MAKE_SYNTAX ("multi-measure-rest", i, $2, + $$ = MAKE_SYNTAX (multi_measure_rest, i, $2, scm_reverse_x ($3, SCM_EOL)); } %prec ':' | tempo_event @@ -2621,17 +2883,17 @@ event_chord: note_chord_element: chord_body optional_notemode_duration post_events { - Music *m = unsmob_music ($1); - SCM dur = unsmob_duration ($2)->smobbed_copy (); + Music *m = unsmob ($1); + SCM dur = unsmob ($2)->smobbed_copy (); SCM es = m->get_property ("elements"); SCM postevs = scm_reverse_x ($3, SCM_EOL); for (SCM s = es; scm_is_pair (s); s = scm_cdr (s)) - unsmob_music (scm_car (s))->set_property ("duration", dur); + unsmob (scm_car (s))->set_property ("duration", dur); es = ly_append2 (es, postevs); - m-> set_property ("elements", es); - m->set_spot (@$); + m->set_property ("elements", es); + m->set_spot (parser->lexer_->override_input (@$)); $$ = m->self_scm (); } %prec ':' ; @@ -2639,11 +2901,11 @@ note_chord_element: chord_body: ANGLE_OPEN chord_body_elements ANGLE_CLOSE { - $$ = MAKE_SYNTAX ("event-chord", @$, scm_reverse_x ($2, SCM_EOL)); + $$ = MAKE_SYNTAX (event_chord, @$, scm_reverse_x ($2, SCM_EOL)); } | FIGURE_OPEN figure_list FIGURE_CLOSE { - $$ = MAKE_SYNTAX ("event-chord", @$, scm_reverse_x ($2, SCM_EOL)); + $$ = MAKE_SYNTAX (event_chord, @$, scm_reverse_x ($2, SCM_EOL)); } ; @@ -2656,7 +2918,7 @@ chord_body_elements: ; chord_body_element: - pitch exclamations questions octave_check post_events + pitch_or_tonic_pitch exclamations questions octave_check post_events { bool q = to_boolean ($3); bool ex = to_boolean ($2); @@ -2694,11 +2956,11 @@ chord_body_element: } | music_function_chord_body { - Music *m = unsmob_music ($1); + Music *m = unsmob ($1); while (m && m->is_mus_type ("music-wrapper-music")) { $$ = m->get_property ("element"); - m = unsmob_music ($$); + m = unsmob ($$); } if (!(m && m->is_mus_type ("rhythmic-event"))) { @@ -2716,8 +2978,8 @@ music_function_chord_body: event_function_event: EVENT_FUNCTION function_arglist { - $$ = MAKE_SYNTAX ("music-function", @$, - $1, $2); + $$ = MAKE_SYNTAX (music_function, @$, + $1, $2); } ; @@ -2727,7 +2989,7 @@ post_events: } | post_events post_event { $$ = $1; - if (Music *m = unsmob_music ($2)) + if (Music *m = unsmob ($2)) { if (m->is_mus_type ("post-event-wrapper")) { @@ -2738,7 +3000,7 @@ post_events: $$ = scm_cons (scm_car (p), $$); } } else { - m->set_spot (@2); + m->set_spot (parser->lexer_->override_input (@2)); $$ = scm_cons ($2, $$); } } @@ -2751,12 +3013,12 @@ post_event_nofinger: } | script_dir music_function_call { $$ = $2; - if (!unsmob_music ($2)->is_mus_type ("post-event")) { + if (!unsmob ($2)->is_mus_type ("post-event")) { parser->parser_error (@2, _ ("post-event expected")); $$ = SCM_UNSPECIFIED; } else if (!SCM_UNBNDP ($1)) { - unsmob_music ($$)->set_property ("direction", $1); + unsmob ($$)->set_property ("direction", $1); } } | HYPHEN { @@ -2772,7 +3034,7 @@ post_event_nofinger: | script_dir direction_reqd_event { if (!SCM_UNBNDP ($1)) { - Music *m = unsmob_music ($2); + Music *m = unsmob ($2); m->set_property ("direction", $1); } $$ = $2; @@ -2780,7 +3042,7 @@ post_event_nofinger: | script_dir direction_less_event { if (!SCM_UNBNDP ($1)) { - Music *m = unsmob_music ($2); + Music *m = unsmob ($2); m->set_property ("direction", $1); } $$ = $2; @@ -2788,12 +3050,12 @@ post_event_nofinger: | '^' fingering { $$ = $2; - unsmob_music ($$)->set_property ("direction", scm_from_int (UP)); + unsmob ($$)->set_property ("direction", scm_from_int (UP)); } | '_' fingering { $$ = $2; - unsmob_music ($$)->set_property ("direction", scm_from_int (DOWN)); + unsmob ($$)->set_property ("direction", scm_from_int (DOWN)); } ; @@ -2836,7 +3098,7 @@ direction_reqd_event: a->set_property ("articulation-type", s); $$ = a->unprotect (); } else { - Music *original = unsmob_music (s); + Music *original = unsmob (s); if (original && original->is_mus_type ("post-event")) { Music *a = original->clone (); a->set_spot (parser->lexer_->override_input (@$)); @@ -2885,8 +3147,8 @@ steno_pitch: NOTENAME_PITCH quotes { if (!scm_is_eq (SCM_INUM0, $2)) { - Pitch p = *unsmob_pitch ($1); - p = p.transposed (Pitch (scm_to_int ($2),0,0)); + Pitch p = *unsmob ($1); + p = p.transposed (Pitch (scm_to_int ($2), 0)); $$ = p.smobbed_copy (); } } @@ -2900,8 +3162,8 @@ steno_tonic_pitch: TONICNAME_PITCH quotes { if (!scm_is_eq (SCM_INUM0, $2)) { - Pitch p = *unsmob_pitch ($1); - p = p.transposed (Pitch (scm_to_int ($2),0,0)); + Pitch p = *unsmob ($1); + p = p.transposed (Pitch (scm_to_int ($2), 0)); $$ = p.smobbed_copy (); } } @@ -2912,13 +3174,18 @@ pitch: | PITCH_IDENTIFIER quotes { if (!scm_is_eq (SCM_INUM0, $2)) { - Pitch p = *unsmob_pitch ($1); - p = p.transposed (Pitch (scm_to_int ($2),0,0)); + Pitch p = *unsmob ($1); + p = p.transposed (Pitch (scm_to_int ($2), 0)); $$ = p.smobbed_copy (); } } ; +pitch_or_tonic_pitch: + pitch + | steno_tonic_pitch + ; + gen_text_def: full_markup { Music *t = MY_MAKE_MUSIC ("TextScriptEvent", @$); @@ -2933,7 +3200,7 @@ gen_text_def: } | embedded_scm { - Music *m = unsmob_music ($1); + Music *m = unsmob ($1); if (m && m->is_mus_type ("post-event")) $$ = $1; else if (Text_interface::is_markup ($1)) { @@ -2955,25 +3222,25 @@ fingering: script_abbreviation: '^' { - $$ = scm_from_locale_string ("Hat"); + $$ = scm_from_ascii_string ("Hat"); } | '+' { - $$ = scm_from_locale_string ("Plus"); + $$ = scm_from_ascii_string ("Plus"); } | '-' { - $$ = scm_from_locale_string ("Dash"); + $$ = scm_from_ascii_string ("Dash"); } | '!' { - $$ = scm_from_locale_string ("Bang"); + $$ = scm_from_ascii_string ("Bang"); } | ANGLE_CLOSE { - $$ = scm_from_locale_string ("Larger"); + $$ = scm_from_ascii_string ("Larger"); } | '.' { - $$ = scm_from_locale_string ("Dot"); + $$ = scm_from_ascii_string ("Dot"); } | '_' { - $$ = scm_from_locale_string ("Underscore"); + $$ = scm_from_ascii_string ("Underscore"); } ; @@ -2983,19 +3250,13 @@ script_dir: | '-' { $$ = SCM_UNDEFINED; } ; -duration_length: - multiplied_duration { - $$ = $1; - } - ; - maybe_notemode_duration: { $$ = SCM_UNDEFINED; } %prec ':' | multiplied_duration { $$ = $1; - parser->default_duration_ = *unsmob_duration ($$); + parser->default_duration_ = *unsmob ($$); } ; @@ -3018,26 +3279,13 @@ steno_duration: } } | DURATION_IDENTIFIER dots { - Duration *d = unsmob_duration ($1); - Duration k (d->duration_log (), - d->dot_count () + scm_to_int ($2)); - k = k.compressed (d->factor ()); - scm_remember_upto_here_1 ($1); - $$ = k.smobbed_copy (); + $$ = make_duration ($1, scm_to_int ($2)); } ; multiplied_duration: - steno_duration { - $$ = $1; - } - | multiplied_duration '*' UNSIGNED { - $$ = unsmob_duration ($$)->compressed (scm_to_int ($3)).smobbed_copy (); - } - | multiplied_duration '*' FRACTION { - Rational m (scm_to_int (scm_car ($3)), scm_to_int (scm_cdr ($3))); - - $$ = unsmob_duration ($$)->compressed (m).smobbed_copy (); + steno_duration multipliers { + $$ = make_duration ($1, 0, $2); } ; @@ -3050,6 +3298,28 @@ dots: } ; +multipliers: + /* empty */ + { + $$ = SCM_UNDEFINED; + } + | multipliers '*' UNSIGNED + { + if (!SCM_UNBNDP ($1)) + $$ = scm_product ($1, $3); + else + $$ = $3; + } + | multipliers '*' FRACTION + { + if (!SCM_UNBNDP ($1)) + $$ = scm_product ($1, scm_divide (scm_car ($3), + scm_cdr ($3))); + else + $$ = scm_divide (scm_car ($3), scm_cdr ($3)); + } + ; + tremolo_type: ':' { $$ = scm_from_int (parser->default_tremolo_type_); @@ -3107,10 +3377,10 @@ bass_figure: } | bass_figure ']' { $$ = $1; - unsmob_music ($1)->set_property ("bracket-stop", SCM_BOOL_T); + unsmob ($1)->set_property ("bracket-stop", SCM_BOOL_T); } | bass_figure figured_bass_alteration { - Music *m = unsmob_music ($1); + Music *m = unsmob ($1); if (scm_to_double ($2)) { SCM salter = m->get_property ("alteration"); SCM alter = scm_is_number (salter) ? salter : scm_from_int (0); @@ -3121,7 +3391,7 @@ bass_figure: } } | bass_figure figured_bass_modification { - Music *m = unsmob_music ($1); + Music *m = unsmob ($1); m->set_property ($2, SCM_BOOL_T); } ; @@ -3148,7 +3418,7 @@ br_bass_figure: } | '[' bass_figure { $$ = $2; - unsmob_music ($$)->set_property ("bracket-start", SCM_BOOL_T); + unsmob ($$)->set_property ("bracket-start", SCM_BOOL_T); } ; @@ -3210,7 +3480,7 @@ pitch_or_music: if (!parser->lexer_->is_chord_state ()) parser->parser_error (@1, _ ("have to be in Chord mode for chords")); if (scm_is_pair ($2)) { - if (unsmob_pitch ($1)) + if (unsmob ($1)) $1 = make_chord_elements (@1, $1, parser->default_duration_.smobbed_copy (), @@ -3218,9 +3488,9 @@ pitch_or_music: SCM elts = ly_append2 ($1, scm_reverse_x ($2, SCM_EOL)); - $$ = MAKE_SYNTAX ("event-chord", @1, elts); - } else if (!unsmob_pitch ($1)) - $$ = MAKE_SYNTAX ("event-chord", @1, $1); + $$ = MAKE_SYNTAX (event_chord, @1, elts); + } else if (!unsmob ($1)) + $$ = MAKE_SYNTAX (event_chord, @1, $1); // A mere pitch drops through. } %prec ':' ; @@ -3264,9 +3534,9 @@ lyric_element: lyric_element_music: lyric_element optional_notemode_duration post_events { - $$ = MAKE_SYNTAX ("lyric-event", @$, $1, $2); + $$ = MAKE_SYNTAX (lyric_event, @$, $1, $2); if (scm_is_pair ($3)) - unsmob_music ($$)->set_property + unsmob ($$)->set_property ("articulations", scm_reverse_x ($3, SCM_EOL)); } %prec ':' ; @@ -3460,22 +3730,35 @@ full_markup_list: } ; -full_markup: +markup_mode: MARKUP - { parser->lexer_->push_markup_state (); } - markup_top { - $$ = $3; + { + parser->lexer_->push_markup_state (); + } + ; + +full_markup: + markup_mode markup_top { + $$ = $2; + parser->lexer_->pop_state (); + } + ; + +partial_markup: + markup_mode markup_partial_function ETC + { + $$ = MAKE_SYNTAX (partial_markup, @2, $2); parser->lexer_->pop_state (); } ; markup_top: markup_list { - $$ = scm_list_2 (ly_lily_module_constant ("line-markup"), $1); + $$ = scm_list_2 (Lily::line_markup, $1); } | markup_head_1_list simple_markup { - $$ = scm_car (MAKE_SYNTAX ("composed-markup-list", + $$ = scm_car (MAKE_SYNTAX (composed_markup_list, @2, $1, scm_list_1 ($2))); } | simple_markup { @@ -3484,7 +3767,7 @@ markup_top: ; markup_scm: - embedded_scm_bare + embedded_scm { if (Text_interface::is_markup ($1)) MYBACKUP (MARKUP_IDENTIFIER, $1, @1); @@ -3520,21 +3803,21 @@ markup_uncomposed_list: SCM nn = parser->lexer_->lookup_identifier ("pitchnames"); parser->lexer_->push_note_state (nn); } '{' score_body '}' { - Score *sc = unsmob_score ($4); + Score *sc = unsmob ($4); sc->origin ()->set_spot (@$); if (sc->defs_.empty ()) { Output_def *od = get_layout (parser); sc->add_output_def (od); od->unprotect (); } - $$ = scm_list_1 (scm_list_2 (ly_lily_module_constant ("score-lines-markup-list"), $4)); + $$ = scm_list_1 (scm_list_2 (Lily::score_lines_markup_list, $4)); parser->lexer_->pop_state (); } ; markup_composed_list: markup_head_1_list markup_uncomposed_list { - $$ = MAKE_SYNTAX ("composed-markup-list", + $$ = MAKE_SYNTAX (composed_markup_list, @2, $1, $2); } ; @@ -3580,6 +3863,37 @@ markup_command_list_arguments: } ; +markup_partial_function: + MARKUP_FUNCTION markup_arglist_partial + { + $$ = scm_list_1 (scm_cons ($1, scm_reverse_x ($2, SCM_EOL))); + } + | markup_head_1_list MARKUP_FUNCTION markup_arglist_partial + { + $$ = scm_cons (scm_cons ($2, scm_reverse_x ($3, SCM_EOL)), + $1); + } + ; + +markup_arglist_partial: + EXPECT_MARKUP markup_arglist_partial + { + $$ = $2; + } + | EXPECT_SCM markup_arglist_partial + { + $$= $2; + } + | EXPECT_MARKUP markup_command_list_arguments + { + $$ = $2; + } + | EXPECT_SCM markup_command_list_arguments + { + $$ = $2; + } + ; + markup_head_1_item: MARKUP_FUNCTION EXPECT_MARKUP markup_command_list_arguments { $$ = scm_cons ($1, scm_reverse_x ($3, SCM_EOL)); @@ -3603,14 +3917,14 @@ simple_markup: SCM nn = parser->lexer_->lookup_identifier ("pitchnames"); parser->lexer_->push_note_state (nn); } '{' score_body '}' { - Score *sc = unsmob_score ($4); + Score *sc = unsmob ($4); sc->origin ()->set_spot (@$); if (sc->defs_.empty ()) { Output_def *od = get_layout (parser); sc->add_output_def (od); od->unprotect (); } - $$ = scm_list_2 (ly_lily_module_constant ("score-markup"), $4); + $$ = scm_list_2 (Lily::score_markup, $4); parser->lexer_->pop_state (); } | MARKUP_FUNCTION markup_command_basic_arguments { @@ -3625,7 +3939,7 @@ simple_markup: markup: markup_head_1_list simple_markup { - $$ = scm_car (MAKE_SYNTAX ("composed-markup-list", + $$ = scm_car (MAKE_SYNTAX (composed_markup_list, @2, $1, scm_list_1 ($2))); } | simple_markup { @@ -3644,12 +3958,19 @@ Lily_parser::set_yydebug (bool x) SCM Lily_parser::do_yyparse () { - SCM retval = SCM_UNDEFINED; - yyparse (this, &retval); - return retval; + return scm_c_with_fluid (Lily::f_parser, + self_scm (), + do_yyparse_trampoline, + static_cast (this)); } - +SCM +Lily_parser::do_yyparse_trampoline (void *parser) +{ + SCM retval = SCM_UNDEFINED; + yyparse (static_cast (parser), &retval); + return retval; +} @@ -3662,8 +3983,8 @@ otherwise, we have to import music classes into the lexer. int Lily_lexer::try_special_identifiers (SCM *destination, SCM sid) { - if (unsmob_book (sid)) { - Book *book = unsmob_book (sid)->clone (); + if (unsmob (sid)) { + Book *book = unsmob (sid)->clone (); *destination = book->self_scm (); book->unprotect (); @@ -3671,30 +3992,30 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid) } else if (scm_is_number (sid)) { *destination = sid; return NUMBER_IDENTIFIER; - } else if (unsmob_context_def (sid)) + } else if (unsmob (sid)) { - *destination = unsmob_context_def (sid)->clone ()->unprotect (); + *destination = unsmob (sid)->clone ()->unprotect (); return SCM_IDENTIFIER; - } else if (unsmob_context_mod (sid)) { - *destination = unsmob_context_mod (sid)->smobbed_copy (); + } else if (unsmob (sid)) { + *destination = unsmob (sid)->smobbed_copy (); return CONTEXT_MOD_IDENTIFIER; - } else if (Music *mus = unsmob_music (sid)) { + } else if (Music *mus = unsmob (sid)) { mus = mus->clone (); *destination = mus->self_scm (); bool is_event = mus->is_mus_type ("post-event"); mus->unprotect (); return is_event ? EVENT_IDENTIFIER : MUSIC_IDENTIFIER; - } else if (unsmob_pitch (sid)) { - *destination = unsmob_pitch (sid)->smobbed_copy (); + } else if (unsmob (sid)) { + *destination = unsmob (sid)->smobbed_copy (); return PITCH_IDENTIFIER; - } else if (unsmob_duration (sid)) { - *destination = unsmob_duration (sid)->smobbed_copy (); + } else if (unsmob (sid)) { + *destination = unsmob (sid)->smobbed_copy (); return DURATION_IDENTIFIER; - } else if (unsmob_output_def (sid)) { - *destination = unsmob_output_def (sid)->clone ()->unprotect (); + } else if (unsmob (sid)) { + *destination = unsmob (sid)->clone ()->unprotect (); return SCM_IDENTIFIER; - } else if (unsmob_score (sid)) { - *destination = unsmob_score (sid)->clone ()->unprotect (); + } else if (unsmob (sid)) { + *destination = unsmob (sid)->clone ()->unprotect (); return SCM_IDENTIFIER; } @@ -3704,7 +4025,7 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid) SCM get_next_unique_context_id () { - return scm_from_locale_string ("$uniqueContextId"); + return scm_from_ascii_string ("$uniqueContextId"); } @@ -3714,7 +4035,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_from_locale_string (s); + return scm_from_ascii_string (s); } // check_scheme_arg checks one argument with a given predicate for use @@ -3743,18 +4064,18 @@ SCM check_scheme_arg (Lily_parser *parser, Input loc, return args; } scm_set_cdr_x (scm_last_pair (args), SCM_EOL); - MAKE_SYNTAX ("argument-error", loc, scm_length (args), pred, + MAKE_SYNTAX (argument_error, loc, scm_length (args), pred, SCM_UNBNDP (disp) ? arg : disp); scm_set_cdr_x (scm_last_pair (args), SCM_BOOL_F); return args; } -SCM loc_on_music (Input loc, SCM arg) +SCM loc_on_music (Lily_parser *parser, Input loc, SCM arg) { - if (Music *m = unsmob_music (arg)) + if (Music *m = unsmob (arg)) { m = m->clone (); - m->set_spot (loc); + m->set_spot (parser->lexer_->override_input (loc)); return m->unprotect (); } return arg; @@ -3830,7 +4151,7 @@ is_regular_identifier (SCM id, bool multiple) SCM make_music_from_simple (Lily_parser *parser, Input loc, SCM simple) { - if (unsmob_music (simple)) + if (unsmob (simple)) return simple; if (parser->lexer_->is_note_state ()) { if (scm_is_symbol (simple)) { @@ -3839,21 +4160,29 @@ make_music_from_simple (Lily_parser *parser, Input loc, SCM simple) n->set_property ("drum-type", simple); return n->unprotect (); } - if (unsmob_pitch (simple)) { + if (unsmob (simple)) { Music *n = MY_MAKE_MUSIC ("NoteEvent", loc); n->set_property ("duration", parser->default_duration_.smobbed_copy ()); n->set_property ("pitch", simple); return n->unprotect (); } + SCM d = simple; + if (scm_is_integer (simple)) + d = make_duration (simple); + if (unsmob (d)) { + Music *n = MY_MAKE_MUSIC ("NoteEvent", loc); + n->set_property ("duration", d); + return n->unprotect (); + } return simple; } else if (parser->lexer_->is_lyric_state ()) { if (Text_interface::is_markup (simple)) - return MAKE_SYNTAX ("lyric-event", loc, simple, + return MAKE_SYNTAX (lyric_event, loc, simple, parser->default_duration_.smobbed_copy ()); } else if (parser->lexer_->is_chord_state ()) { - if (unsmob_pitch (simple)) + if (unsmob (simple)) return MAKE_SYNTAX - ("event-chord", + (event_chord, loc, make_chord_elements (loc, simple, parser->default_duration_.smobbed_copy (), @@ -3877,26 +4206,40 @@ make_simple_markup (SCM a) } SCM -make_duration (SCM d, int dots) +make_duration (SCM d, int dots, SCM factor) { - int t = scm_to_int (d); - if (t > 0 && (t & (t-1)) == 0) - return Duration (intlog2 (t), dots).smobbed_copy (); - else - return SCM_UNDEFINED; + Duration k; + + if (Duration *dur = unsmob (d)) { + if (!dots && SCM_UNBNDP (factor)) + return d; + k = *dur; + if (dots) + k = Duration (k.duration_log (), k.dot_count () + dots) + .compressed (k.factor ()); + } else { + int t = scm_to_int (d); + if (t > 0 && (t & (t-1)) == 0) + k = Duration (intlog2 (t), dots); + else + return SCM_UNDEFINED; + } + + if (!SCM_UNBNDP (factor)) + k = k.compressed (ly_scm2rational (factor)); + + return k.smobbed_copy (); } SCM make_chord_step (SCM step_scm, Rational alter) { - int step = scm_to_int (step_scm); + Pitch m (0, scm_to_int (step_scm) - 1, alter); - if (step == 7) - alter += FLAT_ALTERATION; + // Notename/octave are normalized + if (m.get_notename () == 6) + m = m.transposed (Pitch (0, 0, FLAT_ALTERATION)); - while (step < 0) - step += 7; - Pitch m ((step -1) / 7, (step - 1) % 7, alter); return m.smobbed_copy (); } @@ -3904,11 +4247,10 @@ make_chord_step (SCM step_scm, Rational alter) SCM make_chord_elements (Input loc, SCM pitch, SCM dur, SCM modification_list) { - SCM chord_ctor = ly_lily_module_constant ("construct-chord-elements"); - SCM res = scm_call_3 (chord_ctor, pitch, dur, modification_list); + SCM res = Lily::construct_chord_elements (pitch, dur, modification_list); for (SCM s = res; scm_is_pair (s); s = scm_cdr (s)) { - unsmob_music (scm_car (s))->set_spot (loc); + unsmob (scm_car (s))->set_spot (loc); } return res; }