/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
// Find the slur that is 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"), ""))
{
- ended = true;
- end_slurs_.push_back (slurs_[j]);
- slurs_.erase (slurs_.begin () + j);
+ // 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);
+ }
}
}
if (!ended)
ev->origin ()->warning (_ ("already have slur"));
start_events_.erase (start_events_.begin () + i);
}
- else
- {
+ }
+ for (vsize i = start_events_.size (); i--;)
+ {
+ Stream_event *ev = start_events_[i];
+ string id = robust_scm2string (ev->get_property ("spanner-id"), "");
+
Grob *slur = make_spanner ("Slur", ev->self_scm ());
Direction updown = to_dir (ev->get_property ("direction"));
slur->set_property ("spanner-id", ly_string2scm (id));
set_grob_direction (slur, UP);
slurs_.push_back (slur);
}
- }
}
set_melisma (slurs_.size ());
}