* scm/titling.scm (default-score-title): remove caps for piece.

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

diff --git a/lily/beam-performer.cc b/lily/beam-performer.cc
index 4010502032be1f32711b07ae8a2c2c43641498ea..8748d7320d0ebe3987bb9f523e8b40c11f8dd21e 100644 (file)
--- a/lily/beam-performer.cc
+++ b/lily/beam-performer.cc
@@ -10,12 +10,12 @@
 #include "event.hh"
 #include "audio-item.hh"
 #include "audio-column.hh"
-#include "global-translator.hh"
+#include "global-context.hh"
 #include "warn.hh"
 
 class Beam_performer : public Performer {
 public:
-  TRANSLATOR_DECLARATIONS(Beam_performer);
+  TRANSLATOR_DECLARATIONS (Beam_performer);
   
 protected:
   virtual bool try_music (Music *ev) ;
@@ -28,12 +28,20 @@ private:
   bool beam_;
 };
 
+Beam_performer::Beam_performer ()
+{
+  beam_ = false;
+  start_ev_ = 0;
+  now_stop_ev_ = 0;
+}
+
 void 
 Beam_performer::process_music ()
 {
   if (now_stop_ev_)
     {
       beam_ = false;
+      set_melisma (false);
     }
 
   if (start_ev_)
@@ -49,17 +57,12 @@ Beam_performer::set_melisma (bool ml)
 {
   SCM b = get_property ("autoBeaming");
   if (!to_boolean (b))
-    daddy_trans_->set_property ("beamMelismaBusy", ml ? SCM_BOOL_T :SCM_BOOL_F);
+context ()->set_property ("beamMelismaBusy", ml ? SCM_BOOL_T :SCM_BOOL_F);
 }
 
 void
 Beam_performer::start_translation_timestep ()
 {
-  if (beam_)
-    {
-      set_melisma (true);
-    }
-  
   start_ev_ = 0;
   now_stop_ev_ = 0;
 }
@@ -69,7 +72,7 @@ Beam_performer::try_music (Music *m)
 {
   if (m->is_mus_type ("beam-event"))
     {
-      Direction d = to_dir (m->get_mus_property ("span-direction"));
+      Direction d = to_dir (m->get_property ("span-direction"));
 
       if (d == START)
        {
@@ -84,10 +87,6 @@ Beam_performer::try_music (Music *m)
   return false;
 }
 
-ENTER_DESCRIPTION(Beam_performer,"","",
+ENTER_DESCRIPTION (Beam_performer,"","",
                  "beam-event","","","");
 
-Beam_performer::Beam_performer()
-{
-  beam_ = false;
-}