*** empty log message ***

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

diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc
index 4a6a49305beb1a38c38d42a13e7053b10ad2b289..7c6bc4fb6a160aa325f2448657a94fafa1a55cc0 100644 (file)
--- a/lily/slur-engraver.cc
+++ b/lily/slur-engraver.cc
@@ -88,7 +88,7 @@ Slur_engraver::try_music (Music *ev)
 void
 Slur_engraver::set_melisma (bool m)
 {
-  daddy_context_->set_property ("slurMelismaBusy", m ? SCM_BOOL_T :SCM_BOOL_F);
+  context ()->set_property ("slurMelismaBusy", m ? SCM_BOOL_T :SCM_BOOL_F);
 }
 
 void
@@ -149,18 +149,17 @@ Slur_engraver::process_music ()
        {
          // push a new slur onto stack.
          // (use temp. array to wait for all slur STOPs)
-         Grob* slur = make_spanner ("Slur");
+         Grob* slur = make_spanner ("Slur", slur_ev->self_scm ());
          Slur::set_interface (slur); // cannot remove yet!
 
 
          if (Direction updown = to_dir (slur_ev->get_property ("direction")))
            {
-             slur->set_property ("direction", gh_int2scm (updown));
+             slur->set_property ("direction", scm_int2num (updown));
            }
          
          start_slurs.push (slur);
          events_.push (slur_ev);
-         announce_grob (slur, slur_ev->self_scm ());
        }
     }
 
@@ -174,10 +173,6 @@ Slur_engraver::process_music ()
 void
 Slur_engraver::stop_translation_timestep ()
 {
-  for (int i = 0; i < end_slurs_.size (); i++)
-    {
-      typeset_grob (end_slurs_[i]);
-    }
   end_slurs_.clear ();
   new_slur_evs_.clear ();
 }