release: 1.3.103

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

diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc
index 5574830c37faeed33ca6735e8b6768f55d2900c3..8b01712e9a71299b9a4fb1005abce061010de7f1 100644 (file)
--- a/lily/beam-engraver.cc
+++ b/lily/beam-engraver.cc
@@ -37,6 +37,7 @@ class Beam_engraver : public Engraver
   Moment beam_start_mom_;
   
   void typeset_beam ();
+  void set_melisma (bool);
 protected:
   virtual void do_pre_move_processing ();
   virtual void do_post_move_processing ();
@@ -65,22 +66,48 @@ Beam_engraver::do_try_music (Music *m)
 {
   if (Span_req * c = dynamic_cast<Span_req*>(m))
     {
-      if (c->span_type_str_ != "beam")
-       return false;
+      if (c->span_type_str_ == "abort")
+       {
+         reqs_drul_[START] = 0;
+         reqs_drul_[STOP] = 0;
+         if (beam_p_)
+           beam_p_->suicide ();
+         beam_p_ = 0;
+       }
+      else if (c->span_type_str_ == "beam")
+       {
       
-      Direction d =c->span_dir_;
+         Direction d =c->get_span_dir ();
 
-      if (d == STOP && !beam_p_)
-       {
-         m->origin ()->warning  (_ ("can't find start of beam"));
-         return false;
+         if (d == STOP && !beam_p_)
+           {
+             m->origin ()->warning  (_ ("can't find start of beam"));
+             return false;
+           }
+
+         if(d == STOP)
+           {
+             SCM m = get_property ("automaticMelismata");
+             SCM b = get_property("noAutoBeaming");
+             if (to_boolean (m) && to_boolean(b))
+               {
+                 set_melisma (false);
+               }
+           }
+
+         reqs_drul_[d ] = c;
+         return true;
        }
-      reqs_drul_[d ] = c;
-      return true;
     }
   return false;
 }
 
+void
+Beam_engraver::set_melisma (bool m)
+{
+  daddy_trans_l_->set_property ("beamMelismaBusy", m ? SCM_BOOL_T :SCM_BOOL_F);
+}
+
 
 void
 Beam_engraver::do_process_music ()
@@ -122,7 +149,7 @@ Beam_engraver::do_process_music ()
        }
 
       prev_start_req_ = reqs_drul_[START];
-      beam_p_ = new Spanner (get_property ("basicBeamProperties"));
+      beam_p_ = new Spanner (get_property ("Beam"));
       Beam::set_interface (beam_p_);
       
       SCM smp = get_property ("measurePosition");
@@ -160,6 +187,13 @@ void
 Beam_engraver::do_post_move_processing ()
 {
   reqs_drul_ [START] =0;
+  if(beam_p_) {
+    SCM m = get_property ("automaticMelismata");
+    SCM b = get_property("noAutoBeaming");
+    if (to_boolean (m) && to_boolean(b)) {
+      set_melisma (true);
+    }
+  }
 }
 
 void
@@ -175,9 +209,14 @@ Beam_engraver::do_removal_processing ()
   if (beam_p_)
     {
       prev_start_req_->origin ()->warning (_ ("unterminated beam"));
+#if 0
       finished_beam_p_ = beam_p_;
       finished_beam_info_p_ = beam_info_p_;
       typeset_beam ();
+#else
+      beam_p_->suicide ();
+      delete beam_info_p_;
+#endif
     }
 }
 
@@ -188,7 +227,7 @@ Beam_engraver::acknowledge_element (Score_element_info info)
     {
       if (Rest::has_interface (info.elem_l_))
        {
-         info.elem_l_->add_offset_callback (Beam::rest_collision_callback, Y_AXIS);
+         info.elem_l_->add_offset_callback (Beam::rest_collision_callback_proc, Y_AXIS);
        }
       else if (Stem::has_interface (info.elem_l_))
        {