From: David Kastrup <dak@gnu.org>
Date: Wed, 6 Jun 2012 11:12:38 +0000 (+0200)
Subject: Revert "Allow multiple identical slurs (issue 1967)"
X-Git-Tag: release/2.15.41-1~60
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=0ed173a51dfd3101e7ef19dc1162bb7f40bbda36;p=lilypond.git

Revert "Allow multiple identical slurs (issue 1967)"

This reverts commit b986b38f14195f31e26b0a929c8ac23a8ecfc204.

Conflicts:

	lily/slur-engraver.cc
---

diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc
index b0ef9f90ad..40b3b6bd63 100644
--- a/lily/slur-engraver.cc
+++ b/lily/slur-engraver.cc
@@ -178,21 +178,13 @@ 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"), ""))
             {
-              // 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)
@@ -216,26 +208,23 @@ Slur_engraver::process_music ()
           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"), "");
-
-      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")))
+      else
         {
-          set_grob_direction (slur, DOWN);
-          slur = make_spanner ("Slur", ev->self_scm ());
+          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);
+          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 ());