release: 1.3.103

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

diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc
index a4ffe9a51930cd6d3934516bdf019f5beff39ed6..8b01712e9a71299b9a4fb1005abce061010de7f1 100644 (file)
--- a/lily/beam-engraver.cc
+++ b/lily/beam-engraver.cc
@@ -66,29 +66,38 @@ Beam_engraver::do_try_music (Music *m)
 {
   if (Span_req * c = dynamic_cast<Span_req*>(m))
     {
-      if (c->span_type_str_ != "beam")
-       return false;
-      
-      Direction d =c->span_dir_;
-
-      if (d == STOP && !beam_p_)
+      if (c->span_type_str_ == "abort")
        {
-         m->origin ()->warning  (_ ("can't find start of beam"));
-         return false;
+         reqs_drul_[START] = 0;
+         reqs_drul_[STOP] = 0;
+         if (beam_p_)
+           beam_p_->suicide ();
+         beam_p_ = 0;
        }
-
-      if(d == STOP)
+      else if (c->span_type_str_ == "beam")
        {
-         SCM m = get_property ("automaticMelismata");
-         SCM b = get_property("noAutoBeaming");
-         if (to_boolean (m) && to_boolean(b))
+      
+         Direction d =c->get_span_dir ();
+
+         if (d == STOP && !beam_p_)
            {
-             set_melisma (false);
+             m->origin ()->warning  (_ ("can't find start of beam"));
+             return false;
            }
-       }
 
-      reqs_drul_[d ] = c;
-      return true;
+         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;
+       }
     }
   return false;
 }
@@ -140,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");
@@ -218,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_))
        {