- if (Pitch *pitp = unsmob_pitch (pit))
- {
- SCM articulations = n->get_property ("articulations");
- Stream_event *tie_event = 0;
- for (SCM s = articulations;
- !tie_event && scm_is_pair (s);
- s = scm_cdr (s))
- {
- Stream_event *ev = unsmob_stream_event (scm_car (s));
- if (!ev)
- continue;
-
- if (ev->in_event_class ("tie-event"))
- tie_event = ev;
- }
-
- Moment len = get_event_length (n, now_mom ());
-
- Audio_note *p = new Audio_note (*pitp, len,
- tie_event, transposing.negated ());
- Audio_element_info info (p, n);
- announce_element (info);
- notes_.push_back (p);
-
- /*
- shorten previous note.
- */
- if (now_mom ().grace_part_)
- {
- if (last_start_.grace_part_ == Rational (0))
- {
- for (vsize i = 0; i < last_notes_.size (); i++)
- last_notes_[i]->length_mom_ += Moment (0,
- now_mom().grace_part_);
- }
- }
- }
+ if (Pitch *pitp = unsmob<Pitch> (pit))
+ {
+ SCM articulations = n->get_property ("articulations");
+ Stream_event *tie_event = 0;
+ Moment len = get_event_length (n, now_mom ());
+ int velocity = 0;
+
+ for (vsize j = script_evs_.size (); j--;)
+ articulations = scm_cons (script_evs_[j]->self_scm (), articulations);
+
+ for (SCM s = articulations; scm_is_pair (s); s = scm_cdr (s))
+ {
+ Stream_event *ev = unsmob<Stream_event> (scm_car (s));
+ if (!ev)
+ continue;
+
+ if (ev->in_event_class ("tie-event"))
+ tie_event = ev;
+ SCM f = ev->get_property ("midi-length");
+ if (ly_is_procedure (f))
+ len = robust_scm2moment (scm_call_2 (f, len.smobbed_copy (),
+ context ()->self_scm ()),
+ len);
+ velocity += robust_scm2int (ev->get_property ("midi-extra-velocity"), 0);
+ }
+
+ Audio_note *p = new Audio_note (*pitp, len,
+ tie_event, transposing, velocity);
+ Audio_element_info info (p, n);
+ announce_element (info);
+ notes_.push_back (p);
+
+ /*
+ Grace notes shorten the previous non-grace note. If it was
+ part of a tie, shorten the first note in the tie.
+ */
+ if (now_mom ().grace_part_)
+ {
+ if (last_start_.grace_part_ == Rational (0))
+ {
+ for (vsize i = 0; i < last_notes_.size (); i++)
+ {
+ Audio_note *tie_head = last_notes_[i]->tie_head ();
+ Moment start = tie_head->audio_column_->when ();
+ //Shorten the note if it would overlap. It might
+ //not if there's a rest in between.
+ if (start + tie_head->length_mom_ > now_mom ())
+ tie_head->length_mom_ = now_mom () - start;
+ }
+ }
+ }
+ }