Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/beam-performer.cc b/lily/beam-performer.cc
index 107eeb43574a78ca39475b8b9be04a6f5527164a..0998ef3220d9e0c43adad8d230c42e3ef6c96748 100644 (file)
--- a/lily/beam-performer.cc
+++ b/lily/beam-performer.cc
@@ -3,23 +3,27 @@
 
   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 "audio-item.hh"
 #include "audio-column.hh"
 #include "global-context.hh"
 #include "warn.hh"
+#include "music.hh"
 
-class Beam_performer : public Performer {
+#include "translator.icc"
+
+class Beam_performer : public Performer
+{
 public:
   TRANSLATOR_DECLARATIONS (Beam_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_;
@@ -34,7 +38,7 @@ Beam_performer::Beam_performer ()
   now_stop_ev_ = 0;
 }
 
-void 
+void
 Beam_performer::process_music ()
 {
   if (now_stop_ev_)
@@ -50,13 +54,12 @@ Beam_performer::process_music ()
     }
 }
 
-
 void
 Beam_performer::set_melisma (bool ml)
 {
   SCM b = get_property ("autoBeaming");
   if (!to_boolean (b))
-context ()->set_property ("beamMelismaBusy", ml ? SCM_BOOL_T :SCM_BOOL_F);
+    context ()->set_property ("beamMelismaBusy", ml ? SCM_BOOL_T : SCM_BOOL_F);
 }
 
 void
@@ -65,7 +68,7 @@ Beam_performer::start_translation_timestep ()
   start_ev_ = 0;
   now_stop_ev_ = 0;
 }
- 
+
 bool
 Beam_performer::try_music (Music *m)
 {
@@ -74,18 +77,14 @@ Beam_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 (Beam_performer,"","",
-                 "beam-event","","","");
+ADD_TRANSLATOR (Beam_performer, "", "",
+               "beam-event", "", "");