* flower

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

diff --git a/lily/slur-performer.cc b/lily/slur-performer.cc
index 17c0a2dc2e49404cd81624f3e8581cf5b535dff4..aa3d4cdc6b8b4264a7baff8f6a3610cb2a206be5 100644 (file)
--- a/lily/slur-performer.cc
+++ b/lily/slur-performer.cc
@@ -3,11 +3,10 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2004 Jan Nieuwenhuizen <janneke@gnu.org>
- */
+  (c) 1996--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
 #include "performer.hh"
-#include "event.hh"
 #include "audio-item.hh"
 #include "audio-column.hh"
 #include "global-context.hh"
@@ -15,14 +14,15 @@
 
 /*
   this is C&P from beam_performer.
- */
+*/
 
-class Slur_performer : public Performer {
+class Slur_performer : public Performer
+{
 public:
   TRANSLATOR_DECLARATIONS (Slur_performer);
-  
+
 protected:
-  virtual bool try_music (Music *ev) ;
+  virtual bool try_music (Music *ev);
   virtual void start_translation_timestep ();
   virtual void process_music ();
   void set_melisma (bool);
@@ -39,8 +39,7 @@ Slur_performer::Slur_performer ()
   now_stop_ev_ = 0;
 }
 
-
-void 
+void
 Slur_performer::process_music ()
 {
   if (now_stop_ev_)
@@ -56,11 +55,10 @@ 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
@@ -69,7 +67,7 @@ Slur_performer::start_translation_timestep ()
   start_ev_ = 0;
   now_stop_ev_ = 0;
 }
- 
+
 bool
 Slur_performer::try_music (Music *m)
 {
@@ -81,7 +79,7 @@ Slur_performer::try_music (Music *m)
        {
          start_ev_ = m;
        }
-      else if (d==STOP)
+      else if (d == STOP)
        {
          now_stop_ev_ = m;
        }
@@ -90,6 +88,6 @@ Slur_performer::try_music (Music *m)
   return false;
 }
 
-ENTER_DESCRIPTION (Slur_performer,"","",
-                 "slur-event","","","");
+ADD_TRANSLATOR (Slur_performer, "", "",
+               "slur-event", "", "", "");