DECLARE_ACKNOWLEDGER (script);
DECLARE_ACKNOWLEDGER (dots);
DECLARE_ACKNOWLEDGER (text_script);
- DECLARE_ACKNOWLEDGER (tie);
+ DECLARE_END_ACKNOWLEDGER (tie);
DECLARE_ACKNOWLEDGER (tuplet_number);
void acknowledge_extra_object (Grob_info);
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)
}
void
-Slur_engraver::acknowledge_tie (Grob_info info)
+Slur_engraver::acknowledge_end_tie (Grob_info info)
{
acknowledge_extra_object (info);
}
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)
+ 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);
+ }
+ }
+ 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 = slurs_.size (); !(completed = (j-- == 0));)
{
- // 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);
- }
- }
- for (vsize i = start_events_.size (); i--;)
- {
- Stream_event *ev = start_events_[i];
- string id = robust_scm2string (ev->get_property ("spanner-id"), "");
+ // 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;
+ }
- 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);
- slurs_.push_back (slur);
+ // If this slur event has no direction, it will not
+ // contribute anything new to the existing slur(s), so
+ // we can ignore it.
+
+ if (!updown)
+ break;
+
+ Stream_event *c = unsmob_stream_event (slurs_[j]->get_property ("cause"));
+
+ if (!c)
+ {
+ slurs_[j]->programming_error ("slur without a cause");
+ continue;
+ }
+
+ Direction slur_dir = to_dir (c->get_property ("direction"));
+
+ // If the existing slur does not have a direction yet,
+ // we'd rather take the new one.
- if (to_boolean (get_property ("doubleSlurs")))
+ if (!slur_dir)
+ {
+ slurs_[j]->suicide ();
+ slurs_.erase (slurs_.begin () + j);
+ continue;
+ }
+
+ // If the existing slur has the same direction as ours, drop ours
+
+ if (slur_dir == updown)
+ break;
+ }
+ }
+ // If the loop completed, our slur is new
+ if (completed)
{
- set_grob_direction (slur, DOWN);
- slur = make_spanner ("Slur", ev->self_scm ());
+ Grob *slur = make_spanner ("Slur", ev->self_scm ());
slur->set_property ("spanner-id", ly_string2scm (id));
- set_grob_direction (slur, UP);
+ if (updown)
+ set_grob_direction (slur, updown);
slurs_.push_back (slur);
+
+ if (to_boolean (get_property ("doubleSlurs")))
+ {
+ set_grob_direction (slur, DOWN);
+ slur = make_spanner ("Slur", ev->self_scm ());
+ slur->set_property ("spanner-id", ly_string2scm (id));
+ set_grob_direction (slur, UP);
+ slurs_.push_back (slur);
+ }
}
}
set_melisma (slurs_.size ());
ADD_ACKNOWLEDGER (Slur_engraver, script);
ADD_ACKNOWLEDGER (Slur_engraver, text_script);
ADD_ACKNOWLEDGER (Slur_engraver, dots);
-ADD_ACKNOWLEDGER (Slur_engraver, tie);
+ADD_END_ACKNOWLEDGER (Slur_engraver, tie);
ADD_ACKNOWLEDGER (Slur_engraver, tuplet_number);
ADD_TRANSLATOR (Slur_engraver,
/* doc */
projects / lilypond.git / blobdiff