web: news - RC 2.15.41 cancelled

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

diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc
index ea2439534c2b210e42250269471c7c26c684d3c6..ff1bd4e51d5d0581b4dc5a7cad08c9d6aac70262 100644 (file)
--- a/lily/phrasing-slur-engraver.cc
+++ b/lily/phrasing-slur-engraver.cc
@@ -70,6 +70,7 @@ protected:
   void process_music ();
 
   virtual void finalize ();
+  virtual void derived_mark () const;
 
 public:
   TRANSLATOR_DECLARATIONS (Phrasing_slur_engraver);
@@ -79,6 +80,15 @@ Phrasing_slur_engraver::Phrasing_slur_engraver ()
 {
 }
 
+void
+Phrasing_slur_engraver::derived_mark () const
+{
+  for (vsize i=start_events_.size(); i--;)
+    scm_gc_mark (start_events_[i]->self_scm ());
+  for (vsize i=stop_events_.size(); i--;)
+    scm_gc_mark (stop_events_[i]->self_scm ());
+}
+
 IMPLEMENT_TRANSLATOR_LISTENER (Phrasing_slur_engraver, phrasing_slur);
 void
 Phrasing_slur_engraver::listen_phrasing_slur (Stream_event *ev)
@@ -165,6 +175,7 @@ Phrasing_slur_engraver::finalize ()
       slurs_[i]->warning (_ ("unterminated phrasing slur"));
       slurs_[i]->suicide ();
     }
+  slurs_.clear ();
 }
 
 void
@@ -271,13 +282,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);