input/test fixes

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

diff --git a/lily/slur-performer.cc b/lily/slur-performer.cc
index 4a154d567397e758dee11b315ad58b3b5e0a8fba..1836016161cc7c551bb056dd09a52bb19ddbf303 100644 (file)
--- a/lily/slur-performer.cc
+++ b/lily/slur-performer.cc
@@ -32,12 +32,21 @@ private:
   bool slur_;
 };
 
+Slur_performer::Slur_performer ()
+{
+  slur_ = false;
+  start_ev_ = 0;
+  now_stop_ev_ = 0;
+}
+
+
 void 
 Slur_performer::process_music ()
 {
   if (now_stop_ev_)
     {
       slur_ = false;
+      set_melisma (false);
     }
 
   if (start_ev_)
@@ -51,17 +60,12 @@ Slur_performer::process_music ()
 void
 Slur_performer::set_melisma (bool ml)
 {
-  daddy_context_->set_property ("slurMelismaBusy", ml ? SCM_BOOL_T :SCM_BOOL_F);
+  context ()->set_property ("slurMelismaBusy", ml ? SCM_BOOL_T :SCM_BOOL_F);
 }
 
 void
 Slur_performer::start_translation_timestep ()
 {
-  if (slur_)
-    {
-      set_melisma (true);
-    }
-  
   start_ev_ = 0;
   now_stop_ev_ = 0;
 }
@@ -89,7 +93,3 @@ Slur_performer::try_music (Music *m)
 ENTER_DESCRIPTION (Slur_performer,"","",
                  "slur-event","","","");
 
-Slur_performer::Slur_performer ()
-{
-  slur_ = false;
-}