(print): broken beams last until end of staff.

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

diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc
index 7b3c77e3759001a3d303f37ad6de5b3896aec57c..bd25a47df4f2ac6c6c439322e9d4b54c55448aa2 100644 (file)
--- a/lily/beam-engraver.cc
+++ b/lily/beam-engraver.cc
@@ -3,10 +3,10 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c)  1998--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
-#include "engraver-group-engraver.hh"
+
 #include "engraver.hh"
 #include "event.hh"
 #include "beam.hh"
@@ -18,11 +18,12 @@
 #include "drul-array.hh"
 #include "item.hh"
 #include "spanner.hh"
+#include "context.hh"
 
 class Beam_engraver : public Engraver
 {
 protected:  
-  Drul_array<Music*> evs_drul_;
+  Music * start_ev_;
   
   Spanner *finished_beam_;
   Spanner *beam_;
@@ -46,7 +47,7 @@ protected:
   void set_melisma (bool);
 
   Moment last_stem_added_at_;
-    virtual void stop_translation_timestep ();
+  virtual void stop_translation_timestep ();
   virtual void start_translation_timestep ();
   virtual void finalize ();
 
@@ -58,7 +59,7 @@ protected:
   virtual bool valid_end_point ();
   
 public:
-  TRANSLATOR_DECLARATIONS(  Beam_engraver );
+  TRANSLATOR_DECLARATIONS(Beam_engraver);
 };
 
 
@@ -87,22 +88,14 @@ Beam_engraver::Beam_engraver ()
   finished_beam_info_=0;
   beam_info_ =0;
   now_stop_ev_ = 0;
-  evs_drul_[LEFT] = evs_drul_[RIGHT] =0;
+  start_ev_ = 0;
   prev_start_ev_ =0;
 }
 
 bool
 Beam_engraver::try_music (Music *m)
 {
-  if (m->is_mus_type ("abort-event"))
-    {
-      evs_drul_[START] = 0;
-      evs_drul_[STOP] = 0;
-      if (beam_)
-       beam_->suicide ();
-      beam_ = 0;
-    }
-  else if (m->is_mus_type ("beam-event"))
+  if (m->is_mus_type ("beam-event"))
     {
       Direction d = to_dir (m->get_mus_property ("span-direction"));
       if (d == START && !valid_start_point ())
@@ -112,7 +105,7 @@ Beam_engraver::try_music (Music *m)
 
       if (d == START)
        {
-         evs_drul_[d] = m;
+         start_ev_ = m;
        }
       else if (d==STOP)
        {
@@ -128,38 +121,28 @@ Beam_engraver::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);
+    daddy_context_->set_property ("beamMelismaBusy", ml ? SCM_BOOL_T :SCM_BOOL_F);
 }
 
 void
 Beam_engraver::process_music ()
 {
-  if (evs_drul_[STOP])
-    {
-      prev_start_ev_ =0;
-      finished_beam_ = beam_;
-      finished_beam_info_ = beam_info_;
-
-      beam_info_ =0;
-      beam_ = 0;
-    }
-
   if (beam_ && !to_boolean (get_property ("allowBeamBreak")))
     {
-      top_engraver ()->forbid_breaks ();
+      get_score_engraver ()->forbid_breaks ();
     }
 
-  if (evs_drul_[START])
+  if (start_ev_)
     {
       if (beam_)
        {
-         evs_drul_[START]->origin ()->warning (_ ("already have a beam"));
+         start_ev_->origin ()->warning (_ ("already have a beam"));
          return;
        }
 
       set_melisma (true);
-      prev_start_ev_ = evs_drul_[START];
-      beam_ = new Spanner (get_property ("Beam"));
+      prev_start_ev_ = start_ev_;
+      beam_ = make_spanner ("Beam");
       SCM smp = get_property ("measurePosition");
       Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0);
 
@@ -169,8 +152,7 @@ Beam_engraver::process_music ()
       beam_info_ = new Beaming_info_list;
       
       /* urg, must copy to Auto_beam_engraver too */
- 
-      announce_grob(beam_, evs_drul_[START]->self_scm());
+      announce_grob (beam_, start_ev_->self_scm());
     }
 
 }
@@ -193,8 +175,7 @@ Beam_engraver::typeset_beam ()
 void
 Beam_engraver::start_translation_timestep ()
 {
-  evs_drul_ [START] =0;
-  evs_drul_[STOP] = 0;
+  start_ev_ = 0;
   
   if (beam_)
     {
@@ -218,7 +199,7 @@ Beam_engraver::stop_translation_timestep ()
       beam_ = 0;
       beam_info_ = 0;
       typeset_beam();
-         set_melisma (false);
+      set_melisma (false);
     }
 }
 
@@ -302,7 +283,7 @@ ENTER_DESCRIPTION(Beam_engraver,
 /* descr */       "Handles Beam events by engraving Beams.    If omitted, then notes will be "
 "printed with flags instead of beams.",
 /* creats*/       "Beam",
-/* accepts */     "beam-event abort-event",
+/* accepts */     "beam-event",
 /* acks  */      "stem-interface rest-interface",
 /* reads */       "beamMelismaBusy beatLength subdivideBeams",
 /* write */       "");
@@ -345,7 +326,7 @@ ENTER_DESCRIPTION(Grace_beam_engraver,
 " are at grace points in time. "
 ,
 /* creats*/       "Beam",
-/* accepts */     "beam-event abort-event",
+/* accepts */     "beam-event",
 /* acks  */      "stem-interface rest-interface",
 /* reads */       "beamMelismaBusy beatLength allowBeamBreak subdivideBeams",
 /* write */       "");