Avoid python 2.5 due to GUB using 2.4.5.

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

diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc
index 9303df4f22b078a9609382eb146a8eef758d8514..123878b644b7e753e876af2f3ee18013e6f0547b 100644 (file)
--- a/lily/phrasing-slur-engraver.cc
+++ b/lily/phrasing-slur-engraver.cc
@@ -83,9 +83,9 @@ Phrasing_slur_engraver::Phrasing_slur_engraver ()
 void
 Phrasing_slur_engraver::derived_mark () const
 {
-  for (vsize i=start_events_.size(); i--;)
+  for (vsize i = start_events_.size (); i--;)
     scm_gc_mark (start_events_[i]->self_scm ());
-  for (vsize i=stop_events_.size(); i--;)
+  for (vsize i = stop_events_.size (); i--;)
     scm_gc_mark (stop_events_[i]->self_scm ());
 }
 
@@ -203,7 +203,7 @@ Phrasing_slur_engraver::process_music ()
           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);
+                stop_events_.erase (stop_events_.begin () + j);
             }
         }
       else
@@ -218,7 +218,7 @@ Phrasing_slur_engraver::process_music ()
       Direction updown = to_dir (ev->get_property ("direction"));
 
       bool completed;
-      for (vsize j = 0; !(completed = (j == slurs_.size ())); j++)
+      for (vsize j = slurs_.size (); !(completed = (j-- == 0));)
         {
           // Check if we already have a slur with the same spanner-id.
           if (id == robust_scm2string (slurs_[j]->get_property ("spanner-id"), ""))
@@ -234,31 +234,29 @@ Phrasing_slur_engraver::process_music ()
 
               // If this slur event has no direction, it will not
               // contribute anything new to the existing slur(s), so
-              // we can ignore it.  This is not entirely accurate:
-              // tweaks or context properties like those set with
-              // \slurUp can still override a neutral direction, so
-              // when encountering a slur event with "opposite"
-              // direction first, then one with neutral direction, we
-              // only let the "opposite" direction remain, while if
-              // the order is the other way round, a double slur
-              // results since the direction of the first slur is no
-              // longer attributable to a "neutral" slur event.  A
-              // mixture of neutral and directed events is nothing
-              // that the partcombiner should crank out, and it would
-              // be decidedly strange for manual input.
+              // we can ignore it.
 
               if (!updown)
                 break;
 
-              // If the existing slur does not have a direction yet,
-              // give it ours
+              Stream_event *c = unsmob_stream_event (slurs_[j]->get_property ("cause"));
+
+              if (!c)
+                {
+                  slurs_[j]->programming_error ("phrasing slur without a cause");
+                  continue;
+                }
 
-              Direction slur_dir = to_dir (slurs_[j]->get_property ("direction"));
+              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 (!slur_dir)
                 {
-                  set_grob_direction (slurs_[j], updown);
-                  break;
+                  slurs_[j]->suicide ();
+                  slurs_.erase (slurs_.begin () + j);
+                  continue;
                 }
 
               // If the existing slur has the same direction as ours, drop ours
@@ -282,13 +280,31 @@ Phrasing_slur_engraver::process_music ()
 void
 Phrasing_slur_engraver::stop_translation_timestep ()
 {
+  if (Grob *g = unsmob_grob (get_property ("currentCommandColumn")))
+    {
+      for (vsize i = 0; i < end_slurs_.size (); i++)
+        Slur::add_extra_encompass (end_slurs_[i], g);
+
+      if (!start_events_.size ())
+        for (vsize i = 0; i < slurs_.size (); i++)
+          Slur::add_extra_encompass (slurs_[i], g);
+    }
+
+  for (vsize i = 0; i < end_slurs_.size (); i++)
+    {
+      Spanner *s = dynamic_cast<Spanner *> (end_slurs_[i]);
+      if (!s->get_bound (RIGHT))
+        s->set_bound (RIGHT, unsmob_grob (get_property ("currentMusicalColumn")));
+      announce_end_grob (s, SCM_EOL);
+    }
+
   for (vsize i = 0; i < objects_to_acknowledge_.size (); i++)
     Slur::auxiliary_acknowledge_extra_object (objects_to_acknowledge_[i], slurs_, end_slurs_);
 
+  objects_to_acknowledge_.clear ();
   end_slurs_.clear ();
   start_events_.clear ();
   stop_events_.clear ();
-  objects_to_acknowledge_.clear ();
 }
 
 ADD_ACKNOWLEDGER (Phrasing_slur_engraver, inline_accidental);