X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparser.yy;h=87edcdafed7cc33c4cf48e4dc68c4998789e67dd;hb=f8c6b50476be93fc7e0e30921615992f1542c48c;hp=05227ca9200853a39922e11079eff90afcdae508;hpb=a7f382bc109eda80a5ff4328d99aeb1ba3155fb6;p=lilypond.git diff --git a/lily/parser.yy b/lily/parser.yy index 05227ca920..87edcdafed 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -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->lexer_->override_input (location).smobbed_copy (), ##__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_cons (parser->lexer_->override_input (location).smobbed_copy (), 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 (); @@ -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" @@ -497,6 +510,7 @@ embedded_scm_bare_arg: $$ = parser->lexer_->eval_scm_token ($1, @1); } | FRACTION + | partial_markup | full_markup_list | context_modification | score_block @@ -530,8 +544,8 @@ embedded_scm_arg: scm_function_call: SCM_FUNCTION function_arglist { - $$ = MAKE_SYNTAX ("music-function", @$, - $1, $2); + $$ = MAKE_SYNTAX (music_function, @$, + $1, $2); } ; @@ -554,7 +568,7 @@ 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 @@ -587,7 +601,7 @@ embedded_lilypond: $3 = scm_cons ($2, $3); if (unsmob ($1)) $3 = scm_cons ($1, $3); - $$ = MAKE_SYNTAX ("sequential-music", @$, $3); + $$ = MAKE_SYNTAX (sequential_music, @$, $3); } | error { parser->error_level_ = 1; @@ -679,8 +693,94 @@ identifier_init_nonumber: | FRACTION | string | 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: @@ -994,8 +1094,7 @@ score_items: } } else if (!unsmob ($$)) { if (unsmob ($2)) { - SCM scorify = ly_lily_module_constant ("scorify-music"); - $2 = scm_call_1 (scorify, $2); + $2 = Lily::scorify_music ($2); } if (unsmob ($2)) { @@ -1181,13 +1280,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); + $$ = MAKE_SYNTAX (tempo, @$, $2, $3, $5); } | TEMPO scalar { - $$ = MAKE_SYNTAX ("tempo", @$, $2); + $$ = MAKE_SYNTAX (tempo, @$, $2); } %prec ':' ; @@ -1230,7 +1329,7 @@ pitch_as_music: if (!unsmob ($$)) { parser->parser_error (@1, _ ("music expected")); - $$ = MAKE_SYNTAX ("void-music", @$); + $$ = MAKE_SYNTAX (void_music, @$); } } ; @@ -1297,29 +1396,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)); } ; @@ -1412,23 +1511,31 @@ context_prefix: SCM mods = SCM_EOL; if (ctxmod) mods = ctxmod->get_mods (); - $$ = START_MAKE_SYNTAX ("context-specification", $2, $3, mods, SCM_BOOL_F); + $$ = 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); + $$ = START_MAKE_SYNTAX (context_specification, $2, $3, mods, SCM_BOOL_T); } ; new_lyrics: - ADDLYRICS lyric_mode_music { - $$ = scm_list_1 ($2); + 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 lyric_mode_music { - $$ = scm_cons ($3, $1); + | 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); } ; @@ -1453,11 +1560,11 @@ basic_music: | repeated_music | music_bare | LYRICSTO simple_string lyric_mode_music { - $$ = MAKE_SYNTAX ("lyric-combine", @$, $2, SCM_EOL, $3); + $$ = MAKE_SYNTAX (lyric_combine, @$, $2, SCM_EOL, $3); } | LYRICSTO symbol '=' simple_string lyric_mode_music { - $$ = MAKE_SYNTAX ("lyric_combine", @$, $3, $2, $4); + $$ = MAKE_SYNTAX (lyric_combine, @$, $3, $2, $4); } ; @@ -1473,7 +1580,7 @@ contexted_basic_music: Input i; i.set_location (@1, @2); $$ = FINISH_MAKE_SYNTAX ($1, i, $2); - $$ = MAKE_SYNTAX ("add-lyrics", @$, $$, scm_reverse_x ($3, SCM_EOL)); + $$ = MAKE_SYNTAX (add_lyrics, @$, $$, scm_reverse_x ($3, SCM_EOL)); } %prec COMPOSITE | context_prefix contextable_music { @@ -1490,7 +1597,7 @@ composite_music: | contexted_basic_music | basic_music new_lyrics { - $$ = MAKE_SYNTAX ("add-lyrics", @$, $1, scm_reverse_x ($2, SCM_EOL)); + $$ = MAKE_SYNTAX (add_lyrics, @$, $1, scm_reverse_x ($2, SCM_EOL)); } %prec COMPOSITE ; @@ -1579,8 +1686,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; @@ -1994,6 +2100,56 @@ function_arglist_skip_nonbackup: } ; +// 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; + } + ; + function_arglist_common: EXPECT_NO_MORE_ARGS { $$ = SCM_EOL; @@ -2193,8 +2349,8 @@ function_arglist_skip_backup: music_function_call: MUSIC_FUNCTION function_arglist { - $$ = MAKE_SYNTAX ("music-function", @$, - $1, $2); + $$ = MAKE_SYNTAX (music_function, @$, + $1, $2); } ; @@ -2227,7 +2383,7 @@ mode_changed_music: mode_changing_head grouped_music_list { if (scm_is_eq ($1, ly_symbol2scm ("chords"))) { - $$ = MAKE_SYNTAX ("unrelativable-music", @$, $2); + $$ = MAKE_SYNTAX (unrelativable_music, @$, $2); } else { @@ -2240,10 +2396,10 @@ mode_changed_music: SCM mods = SCM_EOL; if (ctxmod) mods = ctxmod->get_mods (); - $$ = MAKE_SYNTAX ("context-specification", @$, $1, SCM_EOL, mods, SCM_BOOL_T, $3); + $$ = 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 (); } @@ -2309,7 +2465,7 @@ mode_changing_head_with_context: context_change: CHANGE symbol '=' simple_string { - $$ = MAKE_SYNTAX ("context-change", @$, $2, $4); + $$ = MAKE_SYNTAX (context_change, @$, $2, $4); } ; @@ -2530,40 +2686,31 @@ simple_revert_context: music_property_def: OVERRIDE grob_prop_path '=' scalar { if (SCM_UNBNDP ($2)) - $$ = MAKE_SYNTAX ("void-music", @$); - else { - $$ = MAKE_SYNTAX ("property-operation", @$, + $$ = MAKE_SYNTAX (void_music, @$); + else + $$ = MAKE_SYNTAX (property_override, @$, scm_car ($2), - ly_symbol2scm ("OverrideProperty"), - scm_cadr ($2), - $4, - scm_cddr ($2)); - } + scm_cdr ($2), + $4); } | REVERT simple_revert_context revert_arg { - $$ = MAKE_SYNTAX ("property-operation", @$, - $2, - ly_symbol2scm ("RevertProperty"), - scm_car ($3), - scm_cdr ($3)); + $$ = MAKE_SYNTAX (property_revert, @$, $2, $3); } | SET context_prop_spec '=' scalar { if (SCM_UNBNDP ($2)) - $$ = MAKE_SYNTAX ("void-music", @$); + $$ = MAKE_SYNTAX (void_music, @$); else - $$ = MAKE_SYNTAX ("property-operation", @$, + $$ = MAKE_SYNTAX (property_set, @$, scm_car ($2), - ly_symbol2scm ("PropertySet"), scm_cadr ($2), $4); } | UNSET context_prop_spec { if (SCM_UNBNDP ($2)) - $$ = MAKE_SYNTAX ("void-music", @$); + $$ = MAKE_SYNTAX (void_music, @$); else - $$ = MAKE_SYNTAX ("property-operation", @$, + $$ = MAKE_SYNTAX (property_unset, @$, scm_car ($2), - ly_symbol2scm ("PropertyUnset"), scm_cadr ($2)); } ; @@ -2597,8 +2744,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"))); @@ -2639,13 +2785,13 @@ event_chord: | 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 @@ -2674,11 +2820,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)); } ; @@ -2751,8 +2897,8 @@ music_function_chord_body: event_function_event: EVENT_FUNCTION function_arglist { - $$ = MAKE_SYNTAX ("music-function", @$, - $1, $2); + $$ = MAKE_SYNTAX (music_function, @$, + $1, $2); } ; @@ -3258,9 +3404,9 @@ pitch_or_music: SCM elts = ly_append2 ($1, scm_reverse_x ($2, SCM_EOL)); - $$ = MAKE_SYNTAX ("event-chord", @1, elts); + $$ = MAKE_SYNTAX (event_chord, @1, elts); } else if (!unsmob ($1)) - $$ = MAKE_SYNTAX ("event-chord", @1, $1); + $$ = MAKE_SYNTAX (event_chord, @1, $1); // A mere pitch drops through. } %prec ':' ; @@ -3304,7 +3450,7 @@ 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 ($$)->set_property ("articulations", scm_reverse_x ($3, SCM_EOL)); @@ -3500,22 +3646,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_head_1_list 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 { @@ -3567,14 +3726,14 @@ markup_uncomposed_list: 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); } ; @@ -3650,7 +3809,7 @@ simple_markup: 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 { @@ -3665,7 +3824,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 { @@ -3684,7 +3843,7 @@ Lily_parser::set_yydebug (bool x) SCM Lily_parser::do_yyparse () { - return scm_c_with_fluid (ly_lily_module_constant ("%parser"), + return scm_c_with_fluid (Lily::f_parser, self_scm (), do_yyparse_trampoline, static_cast (this)); @@ -3790,7 +3949,7 @@ 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; @@ -3895,12 +4054,12 @@ make_music_from_simple (Lily_parser *parser, Input loc, SCM simple) 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 (simple)) return MAKE_SYNTAX - ("event-chord", + (event_chord, loc, make_chord_elements (loc, simple, parser->default_duration_.smobbed_copy (), @@ -3936,14 +4095,12 @@ make_duration (SCM d, int dots) 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 (); } @@ -3951,8 +4108,7 @@ 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 (scm_car (s))->set_spot (loc);