%{
-#define YYDEBUG 1
-#define YYERROR_VERBOSE 1
-
#define yyerror Lily_parser::parser_error
/* We use custom location type: Input objects */
%parse-param {Lily_parser *parser}
%lex-param {Lily_parser *parser}
+%error-verbose
+%debug
/* We use SCMs to do strings, because it saves us the trouble of
-deleting them. Let's hope that a stack overflow doesnt trigger a move
+deleting them. Let's hope that a stack overflow doesn't trigger a move
of the parse stack onto the heap. */
%left PREC_BOT
scm_apply_0 (proc, args)
/* Syntactic Sugar. */
#define MAKE_SYNTAX(name, location, ...) \
- LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant (name), scm_list_n (parser->self_scm (), make_input (location) , ##__VA_ARGS__, SCM_UNDEFINED));
+ LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant (name), scm_list_n (parser->self_scm (), make_input (location) , ##__VA_ARGS__, SCM_UNDEFINED))
#define START_MAKE_SYNTAX(name, ...) \
scm_list_n (ly_lily_module_constant (name) , ##__VA_ARGS__, SCM_UNDEFINED)
#define FINISH_MAKE_SYNTAX(start, location, ...) \
SCM check_scheme_arg (Lily_parser *parser, Input loc,
SCM arg, SCM args, SCM pred);
SCM loc_on_music (Input loc, SCM arg);
-SCM make_chord_elements (SCM pitch, SCM dur, SCM modification_list);
+SCM make_chord_elements (Input loc, SCM pitch, SCM dur, SCM modification_list);
SCM make_chord_step (int step, Rational alter);
SCM make_simple_markup (SCM a);
bool is_duration (int t);
%type <scm> music
%type <scm> music_bare
%type <scm> music_arg
+%type <scm> music_assign
+%type <scm> music_embedded
+%type <scm> music_or_context_def
%type <scm> complex_music
%type <scm> complex_music_prefix
%type <scm> mode_changed_music
%type <scm> context_def_spec_block
%type <scm> context_def_spec_body
%type <scm> context_mod
+%type <scm> context_mod_arg
+%type <scm> context_mod_embedded
%type <scm> context_mod_list
%type <scm> context_prop_spec
%type <scm> direction_less_char
%type <scm> embedded_scm_bare
%type <scm> embedded_scm_bare_arg
%type <scm> embedded_scm_closed
-%type <scm> embedded_scm_chord_body
%type <scm> event_function_event
%type <scm> figure_list
%type <scm> figure_spec
-%type <scm> fraction
%type <scm> full_markup
%type <scm> full_markup_list
%type <scm> function_arglist
%type <scm> function_arglist_optional
%type <scm> function_arglist_backup
%type <scm> function_arglist_nonbackup
+%type <scm> function_arglist_nonbackup_common
+%type <scm> function_arglist_closed_nonbackup
%type <scm> function_arglist_skip
%type <scm> function_arglist_bare
%type <scm> function_arglist_closed
%type <scm> identifier_init
%type <scm> lilypond
%type <scm> lilypond_header
-%type <scm> lilypond_header_body
%type <scm> lyric_element
%type <scm> lyric_element_arg
%type <scm> lyric_element_music
%type <scm> markup_head_1_list
%type <scm> markup_list
%type <scm> markup_top
+%type <scm> maybe_notemode_duration
%type <scm> mode_changing_head
%type <scm> mode_changing_head_with_context
%type <scm> multiplied_duration
%type <scm> music_function_event
%type <scm> music_function_chord_body
-%type <scm> music_function_chord_body_arglist
%type <scm> new_chord
%type <scm> new_lyrics
%type <scm> number_expression
lilypond
| EMBEDDED_LILY {
SCM nn = parser->lexer_->lookup_identifier ("pitchnames");
- parser->lexer_->push_note_state (alist_to_hashq (nn));
+ parser->lexer_->push_note_state (nn);
} embedded_lilypond {
parser->lexer_->pop_state ();
parser->lexer_->set_identifier (ly_symbol2scm ("parseStringResult"), $3);
toplevel_expression:
- lilypond_header {
- parser->lexer_->set_identifier (ly_symbol2scm ("$defaultheader"), $1);
+ {
+ parser->lexer_->add_scope (get_header (parser));
+ } lilypond_header {
+ parser->lexer_->set_identifier (ly_symbol2scm ("$defaultheader"), $2);
}
| book_block {
Book *book = $1;
embedded_scm_bare:
SCM_TOKEN
{
- $$ = parser->lexer_->eval_scm ($1);
+ $$ = parser->lexer_->eval_scm_token ($1);
}
| SCM_IDENTIFIER
;
$$ = MAKE_SYNTAX ("void-music", @$);
}
| identifier_init
- | music music music_list {
- $$ = MAKE_SYNTAX ("sequential-music", @$,
- scm_cons2 ($1, $2, scm_reverse_x ($3, SCM_EOL)));
+ | music_embedded music_embedded music_list {
+ $3 = scm_reverse_x ($3, SCM_EOL);
+ if (unsmob_music ($2))
+ $3 = scm_cons ($2, $3);
+ if (unsmob_music ($1))
+ $3 = scm_cons ($1, $3);
+ $$ = MAKE_SYNTAX ("sequential-music", @$, $3);
}
| error {
parser->error_level_ = 1;
lilypond_header_body:
- {
- $$ = get_header (parser);
- parser->lexer_->add_scope ($$);
- }
+ /* empty */
| lilypond_header_body assignment {
}
| context_def_spec_block {
$$ = $1;
}
- | music {
- /* Hack: Create event-chord around standalone events.
- Prevents the identifier from being interpreted as a post-event. */
- Music *mus = unsmob_music ($1);
- bool is_event = mus &&
- (scm_memq (ly_symbol2scm ("event"), mus->get_property ("types"))
- != SCM_BOOL_F);
- if (!is_event)
- $$ = $1;
- else
- $$ = MAKE_SYNTAX ("event-chord", @$, scm_list_1 ($1));
+ | music_assign {
+ $$ = $1;
}
| post_event_nofinger {
$$ = $1;
| number_expression {
$$ = $1;
}
+ | FRACTION {
+ $$ = $1;
+ }
| string {
$$ = $1;
}
}
;
+context_mod_arg:
+ embedded_scm
+ | composite_music
+ ;
+
+context_mod_embedded:
+ context_mod_arg
+ {
+ if (unsmob_music ($1)) {
+ SCM proc = parser->lexer_->lookup_identifier ("context-mod-music-handler");
+ $1 = scm_call_2 (proc, parser->self_scm (), $1);
+ }
+ if (unsmob_context_mod ($1))
+ $$ = $1;
+ else {
+ parser->parser_error (@1, _ ("not a context mod"));
+ }
+ }
+ ;
+
+
context_def_spec_body:
/**/ {
$$ = Context_def::make_scm ();
$$ = $1;
unsmob_context_def ($$)->origin ()->set_spot (@$);
}
- | context_def_spec_body embedded_scm {
- if (Context_mod *cm = unsmob_context_mod ($2)) {
- SCM p = cm->get_mods ();
- Context_def*td = unsmob_context_def ($$);
-
- for (; scm_is_pair (p); p = scm_cdr (p)) {
- td->add_context_mod (scm_car (p));
- }
- } else {
- parser->parser_error (@2, _ ("not a context mod"));
- }
- }
| context_def_spec_body context_mod {
unsmob_context_def ($$)->add_context_mod ($2);
}
td->add_context_mod (scm_car (m));
}
}
+ | context_def_spec_body context_mod_embedded {
+ Context_def *td = unsmob_context_def ($$);
+ SCM new_mods = unsmob_context_mod ($2)->get_mods ();
+ for (SCM m = new_mods; scm_is_pair (m); m = scm_cdr (m)) {
+ td->add_context_mod (scm_car (m));
+ }
+ }
;
$$->paper_ = dynamic_cast<Output_def*> (unsmob_output_def (parser->lexer_->lookup_identifier ("$defaultpaper"))->clone ());
$$->paper_->unprotect ();
push_paper (parser, $$->paper_);
- $$->header_ = parser->lexer_->lookup_identifier ("$defaultheader");
+ $$->header_ = get_header (parser);
parser->lexer_->set_identifier (ly_symbol2scm ("$current-book"), $$->self_scm ());
- parser->lexer_->set_identifier (ly_symbol2scm ("book-output-suffix"), SCM_BOOL_F);
- parser->lexer_->set_identifier (ly_symbol2scm ("book-filename"), SCM_BOOL_F);
}
| BOOK_IDENTIFIER {
$$ = unsmob_book ($1);
SCM proc = parser->lexer_->lookup_identifier ("book-text-handler");
scm_call_2 (proc, $$->self_scm (), $2);
}
- | book_body lilypond_header {
- $$->header_ = $2;
- }
+ | book_body
+ {
+ parser->lexer_->add_scope ($1->header_);
+ } lilypond_header
| book_body embedded_scm { }
| book_body error {
$$->paper_ = 0;
SCM proc = parser->lexer_->lookup_identifier ("bookpart-text-handler");
scm_call_2 (proc, $$->self_scm (), $2);
}
- | bookpart_body lilypond_header {
- $$->header_ = $2;
- }
+ | bookpart_body
+ {
+ if (!ly_is_module ($1->header_))
+ $1->header_ = ly_make_module (false);
+ parser->lexer_->add_scope ($1->header_);
+ } lilypond_header
| bookpart_body embedded_scm { }
| bookpart_body error {
$$->paper_ = 0;
$$->protect ();
$$->origin ()->set_spot (@$);
}
- | score_body lilypond_header {
- $$->set_header ($2);
- }
+ | score_body
+ {
+ if (!ly_is_module ($1->get_header ()))
+ $1->set_header (ly_make_module (false));
+ parser->lexer_->add_scope ($1->get_header ());
+ } lilypond_header
| score_body output_def {
if ($2->lookup_variable (ly_symbol2scm ("is-paper")) == SCM_BOOL_T)
{
}
;
+// We need this weird nonterminal because both music as well as a
+// context definition can start with \context and the difference is
+// only apparent after looking at the next token. If it is '{', there
+// is still time to escape from notes mode.
+
+music_or_context_def:
+ music_arg
+ {
+ parser->lexer_->pop_state ();
+ }
+ | CONTEXT
+ {
+ parser->lexer_->pop_state ();
+ } '{' context_def_spec_body '}'
+ {
+ $$ = $4;
+ }
+ ;
+
output_def_body:
output_def_head_with_mode_switch '{' {
$$ = $1;
| output_def_body assignment {
}
- | output_def_body context_def_spec_block {
- assign_context_def ($$, $2);
+ | output_def_body
+ {
+ SCM nn = parser->lexer_->lookup_identifier ("pitchnames");
+ parser->lexer_->push_note_state (nn);
+ } music_or_context_def
+ {
+ if (unsmob_context_def ($3))
+ assign_context_def ($$, $3);
+ else {
+
+ SCM proc = parser->lexer_->lookup_identifier
+ ("output-def-music-handler");
+ scm_call_3 (proc, parser->self_scm (),
+ $1->self_scm (), $3);
+ }
}
| output_def_body error {
/* empty */ {
$$ = SCM_EOL;
}
- | music_list music {
- $$ = scm_cons ($2, $1);
- }
- | music_list embedded_scm {
-
+ | music_list music_embedded {
+ if (unsmob_music ($2))
+ $$ = scm_cons ($2, $1);
}
| music_list error {
Music *m = MY_MAKE_MUSIC("Music", @$);
}
;
-music: simple_music
+music: music_arg
| lyric_element_music
- | composite_music %prec COMPOSITE
+ ;
+
+music_embedded:
+ music
+ | embedded_scm
+ {
+ if (unsmob_music ($1)
+ || scm_is_eq ($1, SCM_UNSPECIFIED))
+ $$ = $1;
+ else
+ {
+ @$.warning (_ ("Ignoring non-music expression"));
+ $$ = SCM_UNSPECIFIED;
+ }
+ }
;
music_arg:
simple_music
+ {
+ if (unsmob_pitch ($1)) {
+ Music *n = MY_MAKE_MUSIC ("NoteEvent", @1);
+ n->set_property ("pitch", $1);
+ n->set_property ("duration",
+ parser->default_duration_.smobbed_copy ());
+ $$ = n->unprotect ();
+ }
+ }
| composite_music %prec COMPOSITE
;
+music_assign:
+ simple_music
+ | composite_music %prec COMPOSITE
+ | lyric_element_music
+ ;
+
repeated_music:
REPEAT simple_string unsigned_number music
{
if (md)
unsmob_context_mod ($1)->add_context_mods (md->get_mods ());
}
- | context_mod_list embedded_scm {
- Context_mod *md = unsmob_context_mod ($2);
- if (md)
- unsmob_context_mod ($1)->add_context_mods (md->get_mods ());
- else
- parser->parser_error (@2, _ ("not a context mod"));
+ | context_mod_list context_mod_embedded {
+ unsmob_context_mod ($1)->add_context_mods
+ (unsmob_context_mod ($2)->get_mods ());
}
;
;
-function_arglist_nonbackup:
+function_arglist_nonbackup_common:
EXPECT_OPTIONAL EXPECT_PITCH function_arglist pitch_also_in_chords {
$$ = scm_cons ($4, $3);
}
| EXPECT_OPTIONAL EXPECT_DURATION function_arglist_closed duration_length {
$$ = scm_cons ($4, $3);
}
- | EXPECT_OPTIONAL EXPECT_SCM function_arglist embedded_scm_arg_closed
- {
- $$ = check_scheme_arg (parser, @4, $4, $3, $2);
- }
- | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed bare_number_closed
- {
- $$ = check_scheme_arg (parser, @4, $4, $3, $2);
- }
| EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed FRACTION
{
$$ = check_scheme_arg (parser, @4, $4, $3, $2);
}
;
+function_arglist_closed_nonbackup:
+ function_arglist_nonbackup_common
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist embedded_scm_arg_closed
+ {
+ $$ = check_scheme_arg (parser, @4, $4, $3, $2);
+ }
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed bare_number_closed
+ {
+ $$ = check_scheme_arg (parser, @4, $4, $3, $2);
+ }
+ ;
+
+function_arglist_nonbackup:
+ function_arglist_nonbackup_common
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist embedded_scm_arg
+ {
+ $$ = check_scheme_arg (parser, @4, $4, $3, $2);
+ }
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed bare_number
+ {
+ $$ = check_scheme_arg (parser, @4, $4, $3, $2);
+ }
+ ;
function_arglist_keep:
function_arglist_common
$$ = check_scheme_arg (parser, @3,
$3, $1, $2);
}
- | function_arglist_backup REPARSE fraction
- {
- $$ = check_scheme_arg (parser, @3,
- $3, $1, $2);
- }
;
function_arglist:
$$ = check_scheme_arg (parser, @3,
$3, $2, $1);
}
- | EXPECT_SCM function_arglist_closed_optional fraction
+ | EXPECT_SCM function_arglist_closed_optional FRACTION
{
$$ = check_scheme_arg (parser, @3,
$3, $2, $1);
function_arglist_closed:
function_arglist_closed_common
- | function_arglist_nonbackup
+ | function_arglist_closed_nonbackup
;
function_arglist_closed_common:
$$ = check_scheme_arg (parser, @3,
$3, $2, $1);
}
- | EXPECT_SCM function_arglist_closed_optional fraction
+ | EXPECT_SCM function_arglist_closed_optional FRACTION
{
$$ = check_scheme_arg (parser, @3,
$3, $2, $1);
mode_changing_head:
NOTEMODE {
SCM nn = parser->lexer_->lookup_identifier ("pitchnames");
- parser->lexer_->push_note_state (alist_to_hashq (nn));
+ parser->lexer_->push_note_state (nn);
$$ = ly_symbol2scm ("notes");
}
| DRUMMODE
{
SCM nn = parser->lexer_->lookup_identifier ("drumPitchNames");
- parser->lexer_->push_note_state (alist_to_hashq (nn));
+ parser->lexer_->push_note_state (nn);
$$ = ly_symbol2scm ("drums");
}
SCM nn = parser->lexer_->lookup_identifier ("chordmodifiers");
parser->lexer_->chordmodifier_tab_ = alist_to_hashq (nn);
nn = parser->lexer_->lookup_identifier ("pitchnames");
- parser->lexer_->push_chord_state (alist_to_hashq (nn));
+ parser->lexer_->push_chord_state (nn);
$$ = ly_symbol2scm ("chords");
}
mode_changing_head_with_context:
DRUMS {
SCM nn = parser->lexer_->lookup_identifier ("drumPitchNames");
- parser->lexer_->push_note_state (alist_to_hashq (nn));
+ parser->lexer_->push_note_state (nn);
$$ = ly_symbol2scm ("DrumStaff");
}
SCM nn = parser->lexer_->lookup_identifier ("chordmodifiers");
parser->lexer_->chordmodifier_tab_ = alist_to_hashq (nn);
nn = parser->lexer_->lookup_identifier ("pitchnames");
- parser->lexer_->push_chord_state (alist_to_hashq (nn));
+ parser->lexer_->push_chord_state (nn);
$$ = ly_symbol2scm ("ChordNames");
}
| LYRICS
| context_def_mod STRING {
$$ = scm_list_2 ($1, $2);
}
- | context_def_mod embedded_scm {
- if (ly_symbol2scm ("consists") != $1)
- {
- $$ = SCM_EOL;
- parser->parser_error (@1, _ ("only \\consists takes non-string argument."));
- }
- else
- {
- $$ = scm_list_2 ($1, $2);
- }
+ | context_def_mod embedded_scm
+ {
+ if (!scm_is_string ($2)
+ && ly_symbol2scm ("consists") != $1
+ && ly_symbol2scm ("remove") != $1)
+ {
+ $$ = SCM_EOL;
+ parser->parser_error (@1, _ ("only \\consists and \\remove take non-string argument."));
+ }
+ else
+ {
+ $$ = scm_list_2 ($1, $2);
+ }
}
;
scalar:
embedded_scm_arg
| bare_number
+ | FRACTION
| lyric_element
;
scalar_closed:
embedded_scm_arg_closed
| bare_number
+ | FRACTION
| lyric_element
;
event_chord:
- /* TODO: Create a special case that avoids the creation of
- EventChords around simple_elements that have no post_events?
- */
- simple_chord_elements post_events {
+ simple_element post_events {
+ // Let the rhythmic music iterator sort this mess out.
+ if (scm_is_pair ($2)) {
+ if (unsmob_pitch ($1)) {
+ Music *n = MY_MAKE_MUSIC ("NoteEvent", @1);
+ n->set_property ("pitch", $1);
+ n->set_property ("duration",
+ parser->default_duration_.smobbed_copy ());
+ $$ = n->unprotect ();
+ }
+ unsmob_music ($$)->set_property ("articulations",
+ scm_reverse_x ($2, SCM_EOL));
+ }
+ }
+ | simple_chord_elements post_events {
SCM elts = ly_append2 ($1, scm_reverse_x ($2, SCM_EOL));
Input i;
Input i;
i.set_location (@1, @3);
$$ = MAKE_SYNTAX ("repetition-chord", i,
- parser->lexer_->chord_repetition_.last_chord_,
- parser->lexer_->chord_repetition_.repetition_function_,
$2, scm_reverse_x ($3, SCM_EOL));
}
| MULTI_MEASURE_REST optional_notemode_duration post_events {
scm_reverse_x ($3, SCM_EOL));
}
| command_element
- /* note chord elements are memorized into
- parser->lexer_->chord_repetition_ so that the chord repetition
- mechanism copy them when a chord repetition symbol is found
- */
- | note_chord_element {
- parser->lexer_->chord_repetition_.last_chord_ = $$;
- }
+ | note_chord_element
;
chord_body_elements:
/* empty */ { $$ = SCM_EOL; }
| chord_body_elements chord_body_element {
- $$ = scm_cons ($2, $1);
+ if (!SCM_UNBNDP ($2))
+ $$ = scm_cons ($2, $1);
}
;
$$ = n->unprotect ();
}
| music_function_chord_body
- ;
-
-/* We can't accept a music argument, not even a closed one,
- * immediately before chord_body_elements, otherwise a function \fun
- * with a signature of two music arguments can't be sorted out
- * properly in a construct like
- * <\fun { c } \fun { c } c>
- * The second call could be interpreted either as a chord constituent
- * or a music expression.
- */
-
-music_function_chord_body_arglist:
- function_arglist_bare
- | EXPECT_SCM music_function_chord_body_arglist embedded_scm_chord_body
{
- $$ = check_scheme_arg (parser, @3,
- $3, $2, $1);
- }
- ;
+ Music *m = unsmob_music ($1);
-embedded_scm_chord_body:
- embedded_scm_bare_arg
- | SCM_FUNCTION music_function_chord_body_arglist {
- $$ = MAKE_SYNTAX ("music-function", @$,
- $1, $2);
+ while (m && m->is_mus_type ("music-wrapper-music")) {
+ $$ = m->get_property ("element");
+ m = unsmob_music ($$);
+ }
+
+ if (!(m && m->is_mus_type ("rhythmic-event"))) {
+ parser->parser_error (@$, _ ("not a rhythmic event"));
+ $$ = SCM_UNDEFINED;
+ }
}
- | bare_number
- | fraction
- | lyric_element
- | chord_body_element
;
music_function_chord_body:
- MUSIC_FUNCTION music_function_chord_body_arglist {
- $$ = MAKE_SYNTAX ("music-function", @$,
- $1, $2);
- }
+ music_function_call
+ | MUSIC_IDENTIFIER
;
// Event functions may only take closed arglists, otherwise it would
}
;
-optional_notemode_duration:
+maybe_notemode_duration:
{
- Duration dd = parser->default_duration_;
- $$ = dd.smobbed_copy ();
+ $$ = SCM_UNDEFINED;
}
| multiplied_duration {
$$ = $1;
parser->default_duration_ = *unsmob_duration ($$);
}
+;
+
+
+optional_notemode_duration:
+ maybe_notemode_duration
+ {
+ if (SCM_UNBNDP ($$))
+ $$ = parser->default_duration_.smobbed_copy ();
+ }
;
steno_duration:
}
;
-fraction:
- FRACTION { $$ = $1; }
- | UNSIGNED '/' UNSIGNED {
- $$ = scm_cons ($1, $3);
- }
- ;
-
dots:
/* empty */ {
$$ = 0;
;
simple_element:
- pitch exclamations questions octave_check optional_notemode_duration optional_rest {
+ pitch exclamations questions octave_check maybe_notemode_duration optional_rest {
if (!parser->lexer_->is_note_state ())
parser->parser_error (@1, _ ("have to be in Note mode for notes"));
-
- Music *n = 0;
- if ($6)
- n = MY_MAKE_MUSIC ("RestEvent", @$);
- else
- n = MY_MAKE_MUSIC ("NoteEvent", @$);
-
- n->set_property ("pitch", $1);
- n->set_property ("duration", $5);
-
- if (scm_is_number ($4))
+ if ($2 || $3 || scm_is_number ($4) || !SCM_UNBNDP ($5) || $6)
{
- int q = scm_to_int ($4);
- n->set_property ("absolute-octave", scm_from_int (q-1));
+ Music *n = 0;
+ if ($6)
+ n = MY_MAKE_MUSIC ("RestEvent", @$);
+ else
+ n = MY_MAKE_MUSIC ("NoteEvent", @$);
+
+ n->set_property ("pitch", $1);
+ if (SCM_UNBNDP ($5))
+ n->set_property ("duration",
+ parser->default_duration_.smobbed_copy ());
+ else
+ n->set_property ("duration", $5);
+
+ if (scm_is_number ($4))
+ {
+ int q = scm_to_int ($4);
+ n->set_property ("absolute-octave", scm_from_int (q-1));
+ }
+
+ if ($3 % 2)
+ n->set_property ("cautionary", SCM_BOOL_T);
+ if ($2 % 2 || $3 % 2)
+ n->set_property ("force-accidental", SCM_BOOL_T);
+
+ $$ = n->unprotect ();
}
-
- if ($3 % 2)
- n->set_property ("cautionary", SCM_BOOL_T);
- if ($2 % 2 || $3 % 2)
- n->set_property ("force-accidental", SCM_BOOL_T);
-
- $$ = n->unprotect ();
}
| DRUM_PITCH optional_notemode_duration {
Music *n = MY_MAKE_MUSIC ("NoteEvent", @$);
;
simple_chord_elements:
- simple_element {
- $$ = scm_list_1 ($1);
- }
- | new_chord {
+ new_chord {
if (!parser->lexer_->is_chord_state ())
parser->parser_error (@1, _ ("have to be in Chord mode for chords"));
$$ = $1;
lyric_element_arg:
lyric_element
| lyric_element multiplied_duration post_events {
- SCM lyric_event = MAKE_SYNTAX ("lyric-event", @$, $1, $2);
- $$ = MAKE_SYNTAX ("event-chord", @$,
- scm_cons (lyric_event,
- scm_reverse_x ($3, SCM_EOL)));
+ $$ = MAKE_SYNTAX ("lyric-event", @$, $1, $2);
+ if (scm_is_pair ($3))
+ unsmob_music ($$)->set_property
+ ("articulations", scm_reverse_x ($3, SCM_EOL));
}
| lyric_element post_event post_events {
- SCM lyric_event =
- MAKE_SYNTAX ("lyric-event", @$, $1,
- parser->default_duration_.smobbed_copy ());
- $$ = MAKE_SYNTAX ("event-chord", @$,
- scm_cons2 (lyric_event, $2,
- scm_reverse_x ($3, SCM_EOL)));
-
+ $$ = MAKE_SYNTAX ("lyric-event", @$, $1,
+ parser->default_duration_.smobbed_copy ());
+ unsmob_music ($$)->set_property
+ ("articulations", scm_cons ($2, scm_reverse_x ($3, SCM_EOL)));
}
| LYRIC_ELEMENT optional_notemode_duration post_events {
- SCM lyric_event = MAKE_SYNTAX ("lyric-event", @$, $1, $2);
- $$ = MAKE_SYNTAX ("event-chord", @$,
- scm_cons (lyric_event,
- scm_reverse_x ($3, SCM_EOL)));
+ $$ = MAKE_SYNTAX ("lyric-event", @$, $1, $2);
+ if (scm_is_pair ($3))
+ unsmob_music ($$)->set_property
+ ("articulations", scm_reverse_x ($3, SCM_EOL));
}
;
lyric_element_music:
lyric_element optional_notemode_duration post_events {
- SCM lyric_event = MAKE_SYNTAX ("lyric-event", @$, $1, $2);
- $$ = MAKE_SYNTAX ("event-chord", @$,
- scm_cons (lyric_event,
- scm_reverse_x ($3, SCM_EOL)));
+ $$ = MAKE_SYNTAX ("lyric-event", @$, $1, $2);
+ if (scm_is_pair ($3))
+ unsmob_music ($$)->set_property
+ ("articulations", scm_reverse_x ($3, SCM_EOL));
}
;
new_chord:
steno_tonic_pitch optional_notemode_duration {
- $$ = make_chord_elements ($1, $2, SCM_EOL);
+ $$ = make_chord_elements (@$, $1, $2, SCM_EOL);
}
| steno_tonic_pitch optional_notemode_duration chord_separator chord_items {
SCM its = scm_reverse_x ($4, SCM_EOL);
- $$ = make_chord_elements ($1, $2, scm_cons ($3, its));
+ $$ = make_chord_elements (@$, $1, $2, scm_cons ($3, its));
}
;
}
| SCORE {
SCM nn = parser->lexer_->lookup_identifier ("pitchnames");
- parser->lexer_->push_note_state (alist_to_hashq (nn));
+ parser->lexer_->push_note_state (nn);
} '{' score_body '}' {
Score * sc = $4;
$$ = scm_list_2 (ly_lily_module_constant ("score-markup"), sc->self_scm ());
SCM
-make_chord_elements (SCM pitch, SCM dur, SCM modification_list)
+make_chord_elements (Input loc, SCM pitch, SCM dur, SCM modification_list)
{
SCM chord_ctor = ly_lily_module_constant ("construct-chord-elements");
- return scm_call_3 (chord_ctor, pitch, dur, modification_list);
+ SCM res = scm_call_3 (chord_ctor, pitch, dur, modification_list);
+ for (SCM s = res; scm_is_pair (s); s = scm_cdr (s))
+ {
+ unsmob_music (scm_car (s))->set_spot (loc);
+ }
+ return res;
}
int
projects / lilypond.git / blobdiff