#include "protected-scm.hh"
#include "spanner.hh"
#include "staff-symbol-referencer.hh"
-#include "stream-event.hh"
#include "tie-column.hh"
#include "tie.hh"
#include "warn.hh"
struct Head_event_tuple
{
Grob *head_;
- Moment end_moment_;
SCM tie_definition_;
Music *event_;
-
Head_event_tuple ()
{
- event_ = 0;
- head_ = 0;
- tie_definition_ = SCM_EOL;
+ }
+ Head_event_tuple (Grob *h, Music *m, SCM def)
+ {
+ head_ = h;
+ event_ = m;
+ tie_definition_ = def;
}
};
for (vsize i = heads_to_tie_.size (); i--;)
{
Grob *th = heads_to_tie_[i].head_;
- Stream_event *right_ev = unsmob_stream_event (h->get_property ("cause"));
- Stream_event *left_ev = unsmob_stream_event (th->get_property ("cause"));
+ Music *right_mus = unsmob_music (h->get_property ("cause"));
+ Music *left_mus = unsmob_music (th->get_property ("cause"));
/*
maybe should check positions too.
*/
- if (right_ev && left_ev
- && ly_is_equal (right_ev->get_property ("pitch"),
- left_ev->get_property ("pitch")))
+ if (right_mus && left_mus
+ && ly_is_equal (right_mus->get_property ("pitch"),
+ left_mus->get_property ("pitch")))
{
Grob *p = new Spanner (heads_to_tie_[i].tie_definition_,
context ()->get_grob_key ("Tie"));
{
context ()->set_property ("tieMelismaBusy",
ly_bool2scm (heads_to_tie_.size ()));
-
-
- if (!to_boolean (get_property ("tieWaitForNote")))
- {
- Moment now = now_mom ();
- for (vsize i = heads_to_tie_.size (); i--; )
- {
- if (now > heads_to_tie_[i].end_moment_)
- heads_to_tie_.erase (heads_to_tie_.begin () + i);
- }
- }
}
void
for (vsize i = 0; i < now_heads_.size (); i++)
{
- Grob *head = now_heads_[i];
- Stream_event *left_ev = unsmob_stream_event (head->get_property ("cause"));
- if (left_ev)
- {
- Head_event_tuple event_tup;
-
- event_tup.head_ = head;
- event_tup.tie_definition_ = start_definition;
- event_tup.event_ = event_;
-
- Moment end = now_mom ();
- if (end.grace_part_)
- {
- end.grace_part_ += get_event_length (left_ev).main_part_;
- }
- else
- {
- end += get_event_length (left_ev);
- }
- event_tup.end_moment_ = end;
-
- heads_to_tie_.push_back (event_tup);
- }
+ heads_to_tie_.push_back (Head_event_tuple (now_heads_[i], event_,
+ start_definition));
}
}