void process_music ();
virtual void finalize ();
+ virtual void derived_mark () const;
public:
TRANSLATOR_DECLARATIONS (Slur_engraver);
{
}
+void
+Slur_engraver::derived_mark () const
+{
+ for (vsize i=start_events_.size(); i--;)
+ scm_gc_mark (start_events_[i]->self_scm ());
+ for (vsize i=stop_events_.size(); i--;)
+ scm_gc_mark (stop_events_[i]->self_scm ());
+}
+
IMPLEMENT_TRANSLATOR_LISTENER (Slur_engraver, slur);
void
Slur_engraver::listen_slur (Stream_event *ev)
slurs_[i]->warning (_ ("unterminated slur"));
slurs_[i]->suicide ();
}
+ slurs_.clear ();
}
void
Stream_event *ev = stop_events_[i];
string id = robust_scm2string (ev->get_property ("spanner-id"), "");
- // Find the slur that is ended with this event (by checking the spanner-id)
+ // Find the slurs that are ended with this event (by checking the spanner-id)
bool ended = false;
- SCM starter = SCM_BOOL_F;
for (vsize j = slurs_.size (); j--;)
{
if (id == robust_scm2string (slurs_[j]->get_property ("spanner-id"), ""))
{
- // We end only one slur unless several ones have been
- // caused by the same event, like with double slurs.
- if (!ended || scm_is_eq (starter,
- slurs_[j]->get_property ("cause")))
- {
- ended = true;
- starter = slurs_[j]->get_property ("cause");
- end_slurs_.push_back (slurs_[j]);
- slurs_.erase (slurs_.begin () + j);
- }
+ ended = true;
+ end_slurs_.push_back (slurs_[j]);
+ slurs_.erase (slurs_.begin () + j);
+ }
+ }
+ if (ended)
+ {
+ // Ignore redundant stop events for this id
+ for (vsize j = stop_events_.size (); --j > i;)
+ {
+ if (id == robust_scm2string (stop_events_[j]->get_property ("spanner-id"), ""))
+ stop_events_.erase (stop_events_.begin() + j);
}
}
- if (!ended)
+ else
ev->origin ()->warning (_ ("cannot end slur"));
}
+ vsize old_slurs = slurs_.size ();
for (vsize i = start_events_.size (); i--;)
{
Stream_event *ev = start_events_[i];
string id = robust_scm2string (ev->get_property ("spanner-id"), "");
- bool have_slur = false;
- // Check if we already have a slur with the same spanner-id.
- // In that case, don't create a new slur, but print a warning
- for (vsize j = 0; j < slurs_.size (); j++)
- have_slur = have_slur || (id == robust_scm2string (slurs_[j]->get_property ("spanner-id"), ""));
+ Direction updown = to_dir (ev->get_property ("direction"));
- if (have_slur)
+ bool completed;
+ for (vsize j = 0; !(completed = (j == slurs_.size ())); j++)
{
- // We already have a slur, so give a warning and completely ignore
- // the new slur.
- ev->origin ()->warning (_ ("already have slur"));
- start_events_.erase (start_events_.begin () + i);
+ // Check if we already have a slur with the same spanner-id.
+ if (id == robust_scm2string (slurs_[j]->get_property ("spanner-id"), ""))
+ {
+ if (j < old_slurs)
+ {
+ // We already have an old slur, so give a warning
+ // and completely ignore the new slur.
+ ev->origin ()->warning (_ ("already have slur"));
+ start_events_.erase (start_events_.begin () + i);
+ break;
+ }
+
+ // If this slur event has no direction, it will not
+ // contribute anything new to the existing slur(s), so
+ // we can ignore it. This is not entirely accurate:
+ // tweaks or context properties like those set with
+ // \slurUp can still override a neutral direction, so
+ // when encountering a slur event with "opposite"
+ // direction first, then one with neutral direction, we
+ // only let the "opposite" direction remain, while if
+ // the order is the other way round, a double slur
+ // results since the direction of the first slur is no
+ // longer attributable to a "neutral" slur event. A
+ // mixture of neutral and directed events is nothing
+ // that the partcombiner should crank out, and it would
+ // be decidedly strange for manual input.
+
+ if (!updown)
+ break;
+
+ // If the existing slur does not have a direction yet,
+ // give it ours
+
+ Direction slur_dir = to_dir (slurs_[j]->get_property ("direction"));
+
+ if (!slur_dir)
+ {
+ set_grob_direction (slurs_[j], updown);
+ break;
+ }
+
+ // If the existing slur has the same direction as ours, drop ours
+
+ if (slur_dir == updown)
+ break;
+ }
}
- }
- for (vsize i = start_events_.size (); i--;)
- {
- Stream_event *ev = start_events_[i];
- string id = robust_scm2string (ev->get_property ("spanner-id"), "");
-
+ // If the loop completed, our slur is new
+ if (completed)
+ {
Grob *slur = make_spanner ("Slur", ev->self_scm ());
- Direction updown = to_dir (ev->get_property ("direction"));
slur->set_property ("spanner-id", ly_string2scm (id));
if (updown)
set_grob_direction (slur, updown);
set_grob_direction (slur, UP);
slurs_.push_back (slur);
}
+ }
}
set_melisma (slurs_.size ());
}