From b986b38f14195f31e26b0a929c8ac23a8ecfc204 Mon Sep 17 00:00:00 2001
From: David Kastrup <dak@gnu.org>
Date: Wed, 15 Feb 2012 16:58:54 +0100
Subject: [PATCH] Allow multiple identical slurs (issue 1967)
---
lily/slur-engraver.cc | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc
index 40b3b6bd63..79f04d6203 100644
--- a/lily/slur-engraver.cc
+++ b/lily/slur-engraver.cc
@@ -178,13 +178,21 @@ Slur_engraver::process_music ()
// 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)
@@ -208,8 +216,12 @@ Slur_engraver::process_music ()
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));
@@ -225,7 +237,6 @@ Slur_engraver::process_music ()
set_grob_direction (slur, UP);
slurs_.push_back (slur);
}
- }
}
set_melisma (slurs_.size ());
}
--
2.39.5