Merge branch 'master' into lilypond/translation

[lilypond.git] / lily / slur-engraver.cc

diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc
index 40b3b6bd6343201ae0db673753b09cd826b298d8..b0ef9f90ad21d23142b7b25f5cc4c22594f16be9 100644 (file)
--- 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,23 +216,26 @@ 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));
+      if (updown)
+        set_grob_direction (slur, updown);
+      slurs_.push_back (slur);
+
+      if (to_boolean (get_property ("doubleSlurs")))
         {
-          Grob *slur = make_spanner ("Slur", ev->self_scm ());
-          Direction updown = to_dir (ev->get_property ("direction"));
+          set_grob_direction (slur, DOWN);
+          slur = make_spanner ("Slur", ev->self_scm ());
           slur->set_property ("spanner-id", ly_string2scm (id));
-          if (updown)
-            set_grob_direction (slur, updown);
+          set_grob_direction (slur, UP);
           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 ());