release: 1.3.103

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

diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc
index c037c00923be70e8c641466f7b2595db769b69de..8b01712e9a71299b9a4fb1005abce061010de7f1 100644 (file)
--- a/lily/beam-engraver.cc
+++ b/lily/beam-engraver.cc
@@ -16,13 +16,15 @@
 #include "score-engraver.hh"
 #include "rest.hh"
 #include "drul-array.hh"
+#include "item.hh"
+#include "spanner.hh"
 
 class Beam_engraver : public Engraver
 {
   Drul_array<Span_req*> reqs_drul_;
 
-  Beam *finished_beam_p_;
-  Beam *beam_p_;
+  Spanner *finished_beam_p_;
+  Spanner *beam_p_;
   Span_req * prev_start_req_;
 
   Beaming_info_list * beam_info_p_;
@@ -35,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 ();
@@ -63,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->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 ()
@@ -86,7 +115,7 @@ Beam_engraver::do_process_music ()
   if (reqs_drul_[STOP])
     {
       if (!beam_p_)
-       reqs_drul_[STOP]->warning (_("can't find start of beam"));
+       reqs_drul_[STOP]->origin ()->warning (_("can't find start of beam"));
       prev_start_req_ =0;
       finished_beam_p_ = beam_p_;
       finished_beam_info_p_ = beam_info_p_;
@@ -115,13 +144,14 @@ Beam_engraver::do_process_music ()
     {
       if (beam_p_)
        {
-         reqs_drul_[START]->warning (_ ("already have a beam"));
+         reqs_drul_[START]->origin ()->warning (_ ("already have a beam"));
          return;
        }
 
       prev_start_req_ = reqs_drul_[START];
-      beam_p_ = new Beam (get_property ("basicBeamProperties"));
-
+      beam_p_ = new Spanner (get_property ("Beam"));
+      Beam::set_interface (beam_p_);
+      
       SCM smp = get_property ("measurePosition");
       Moment mp =  (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0);
 
@@ -132,7 +162,7 @@ Beam_engraver::do_process_music ()
       
       /* urg, must copy to Auto_beam_engraver too */
  
-      announce_element (Score_element_info (beam_p_, reqs_drul_[START]));
+      announce_element (beam_p_, reqs_drul_[START]);
     }
 }
 
@@ -143,7 +173,7 @@ Beam_engraver::typeset_beam ()
     {
       finished_beam_info_p_->beamify ();
       
-      finished_beam_p_->set_beaming (finished_beam_info_p_);
+      Beam::set_beaming (finished_beam_p_, finished_beam_info_p_);
       typeset_element (finished_beam_p_);
       delete finished_beam_info_p_;
       finished_beam_info_p_ =0;
@@ -157,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
@@ -171,10 +208,15 @@ Beam_engraver::do_removal_processing ()
   typeset_beam ();
   if (beam_p_)
     {
-      prev_start_req_->warning (_ ("unterminated beam"));
+      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
     }
 }
 
@@ -183,16 +225,16 @@ Beam_engraver::acknowledge_element (Score_element_info info)
 {
   if (beam_p_)
     {
-      if (Rest* r = dynamic_cast<Rest* > (info.elem_l_))
+      if (Rest::has_interface (info.elem_l_))
        {
-         r->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* stem_l = dynamic_cast<Stem *> (info.elem_l_))
+      else if (Stem::has_interface (info.elem_l_))
        {
-         if (stem_l->beam_l ())
+         Item *stem_l = dynamic_cast<Item*> (info.elem_l_);
+         if (Stem::beam_l (stem_l))
            return;
 
-
          bool stem_grace = stem_l->get_elt_property ("grace") == SCM_BOOL_T;
 
          SCM wg =get_property ("weAreGraceContext");
@@ -206,7 +248,7 @@ Beam_engraver::acknowledge_element (Score_element_info info)
            {
              String s = _ ("stem must have Rhythmic structure");
              if (info.req_l_)
-               info.req_l_->warning (s);
+               info.req_l_->origin ()->warning (s);
              else
                ::warning (s);
          
@@ -215,8 +257,8 @@ Beam_engraver::acknowledge_element (Score_element_info info)
 
          if (rhythmic_req->duration_.durlog_i_<= 2)
            {
-             rhythmic_req->warning (_ ("stem doesn't fit in beam"));
-             prev_start_req_->warning (_ ("beam was started here"));
+             rhythmic_req->origin ()->warning (_ ("stem doesn't fit in beam"));
+             prev_start_req_->origin ()->warning (_ ("beam was started here"));
              /*
                don't return, since
 
@@ -229,7 +271,7 @@ Beam_engraver::acknowledge_element (Score_element_info info)
          Moment stem_location = now_mom () - beam_start_mom_ + beam_start_location_;
          beam_info_p_->add_stem (stem_location,
                                  (rhythmic_req->duration_.durlog_i_ - 2) >? 1);
-         beam_p_->add_stem (stem_l);
+         Beam::add_stem (beam_p_, stem_l);
        }
     }
 }