%lex-param {Lily_parser *parser}
/* 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 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> complex_music
%type <scm> complex_music_prefix
%type <scm> mode_changed_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
| context_def_spec_block {
$$ = $1;
}
- | music {
+ | music_assign {
$$ = $1;
}
| post_event_nofinger {
}
;
-music: simple_music
+music: music_arg
| lyric_element_music
- | composite_music %prec COMPOSITE
;
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
{
event_chord:
simple_element post_events {
// Let the rhythmic music iterator sort this mess out.
- if (scm_is_pair ($2))
- unsmob_music ($1)->set_property ("articulations",
+ 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;
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
;
{
Music *m = unsmob_music ($1);
- while (m && m->is_mus_type ("music-wrapper-music"))
- m = unsmob_music (m->get_property ("element"));
+ 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"));
}
;
-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:
;
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", @$);
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));
}
;
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