Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/slur-performer.cc b/lily/slur-performer.cc
index 4c8b23b69a1fdcf3a415b12c0081ff88b430ac87..b699058f21312d6bb6a08457330ad0e03024dc6f 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--2006 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);
-  
+  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);
+  void start_translation_timestep ();
+  void process_music ();
   void set_melisma (bool);
 private:
   Music *start_ev_;
@@ -32,12 +33,20 @@ private:
   bool slur_;
 };
 
-void 
+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_)
@@ -47,25 +56,19 @@ 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;
 }
- 
+
 bool
 Slur_performer::try_music (Music *m)
 {
@@ -74,22 +77,18 @@ Slur_performer::try_music (Music *m)
       Direction d = to_dir (m->get_property ("span-direction"));
 
       if (d == START)
-       {
-         start_ev_ = m;
-       }
-      else if (d==STOP)
-       {
-         now_stop_ev_ = m;
-       }
+       start_ev_ = m;
+      else if (d == STOP)
+       now_stop_ev_ = m;
       return true;
     }
   return false;
 }
 
-ENTER_DESCRIPTION(Slur_performer,"","",
-                 "slur-event","","","");
+#include "translator.icc"
+
+ADD_TRANSLATOR (Slur_performer,
+               "", "",
+               "slur-event",
+               "", "");
 
-Slur_performer::Slur_performer()
-{
-  slur_ = false;
-}