* lily/include/translator.icc: new file.

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

diff --git a/lily/slur-performer.cc b/lily/slur-performer.cc
index 1836016161cc7c551bb056dd09a52bb19ddbf303..9742d753d99d0dcede78c22a06a55b3b40b3156a 100644 (file)
--- a/lily/slur-performer.cc
+++ b/lily/slur-performer.cc
@@ -3,28 +3,29 @@
 
   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"
 #include "warn.hh"
+#include "music.hh"
 
 /*
   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 void start_translation_timestep ();
-  virtual void process_music ();
+  virtual bool try_music (Music *ev);
+  PRECOMPUTED_VIRTUAL void start_translation_timestep ();
+  PRECOMPUTED_VIRTUAL void process_music ();
   void set_melisma (bool);
 private:
   Music *start_ev_;
@@ -39,8 +40,7 @@ Slur_performer::Slur_performer ()
   now_stop_ev_ = 0;
 }
 
-
-void 
+void
 Slur_performer::process_music ()
 {
   if (now_stop_ev_)
@@ -56,11 +56,10 @@ Slur_performer::process_music ()
     }
 }
 
-
 void
 Slur_performer::set_melisma (bool ml)
 {
-  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 +68,7 @@ Slur_performer::start_translation_timestep ()
   start_ev_ = 0;
   now_stop_ev_ = 0;
 }
- 
+
 bool
 Slur_performer::try_music (Music *m)
 {
@@ -81,7 +80,7 @@ Slur_performer::try_music (Music *m)
        {
          start_ev_ = m;
        }
-      else if (d==STOP)
+      else if (d == STOP)
        {
          now_stop_ev_ = m;
        }
@@ -90,6 +89,8 @@ Slur_performer::try_music (Music *m)
   return false;
 }
 
-ENTER_DESCRIPTION (Slur_performer,"","",
-                 "slur-event","","","");
+#include "translator.icc"
+
+ADD_TRANSLATOR (Slur_performer, "", "",
+               "slur-event", "", "", "");