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 a7cd2547b1ca64053f0dda0f1405b685206c1eae..0998ef3220d9e0c43adad8d230c42e3ef6c96748 100644 (file)
--- a/lily/beam-performer.cc
+++ b/lily/beam-performer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1996--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "performer.hh"
@@ -11,6 +11,9 @@
 #include "audio-column.hh"
 #include "global-context.hh"
 #include "warn.hh"
+#include "music.hh"
+
+#include "translator.icc"
 
 class Beam_performer : public Performer
 {
@@ -19,8 +22,8 @@ public:
 
 protected:
   virtual bool try_music (Music *ev);
-  virtual void start_translation_timestep ();
-  virtual void process_music ();
+  void start_translation_timestep ();
+  void process_music ();
   void set_melisma (bool);
 private:
   Music *start_ev_;
@@ -56,7 +59,7 @@ 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
@@ -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;
-       }
+       start_ev_ = m;
       else if (d == STOP)
-       {
-         now_stop_ev_ = m;
-       }
+       now_stop_ev_ = m;
       return true;
     }
   return false;
 }
 
 ADD_TRANSLATOR (Beam_performer, "", "",
-               "beam-event", "", "", "");
+               "beam-event", "", "");