release: 1.2.8

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

diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc
index d59d72c920adc1a1ff1aebbf8ef6ba4545d802f7..d76252ae27be139e23084cfed4902936ed6e89d8 100644 (file)
--- a/lily/beam-engraver.cc
+++ b/lily/beam-engraver.cc
@@ -6,21 +6,23 @@
   (c) 1998--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
-
+#include "timing-engraver.hh"
+#include "engraver-group-engraver.hh"
 #include "beam-engraver.hh"
 #include "musical-request.hh"
 #include "beam.hh"
-#include "rhythmic-grouping.hh"
 #include "stem.hh"
 #include "warn.hh"
 #include "time-description.hh"
+#include "beaming.hh"
+#include "score-engraver.hh"
 
 Beam_engraver::Beam_engraver ()
 {
   beam_p_ = 0;
   finished_beam_p_ =0;
-  finished_grouping_p_ = 0;
-  grouping_p_ =0;
+  finished_beam_info_p_=0;
+  beam_info_p_ =0;
   reqs_drul_[LEFT] = reqs_drul_[RIGHT] =0;
   prev_start_req_ =0;
 }
@@ -37,7 +39,7 @@ Beam_engraver::do_try_music (Music *m)
 
       if (d == STOP && !beam_p_)
        {
-         m->warning (_ ("No Beam to end"));
+         m->warning (_ ("no beam to end"));
          return false;
        }
       reqs_drul_[d ] = c;
@@ -53,13 +55,29 @@ Beam_engraver::do_process_requests ()
   if (reqs_drul_[STOP])
     {
       if (!beam_p_)
-       reqs_drul_[STOP]->warning (_("No beam to end"));
+       reqs_drul_[STOP]->warning (_("no beam to end"));
       prev_start_req_ =0;
       finished_beam_p_ = beam_p_;
-      finished_grouping_p_ = grouping_p_;
+      finished_beam_info_p_ = beam_info_p_;
 
+      beam_info_p_ =0;
       beam_p_ = 0;
-      grouping_p_ = 0;
+    }
+
+
+  if (beam_p_)
+    {
+      Score_engraver * e = 0;
+      Translator * t  =  daddy_grav_l ();
+      for (; !e && t;  t = t->daddy_trans_l_)
+       {
+         e = dynamic_cast<Score_engraver*> (t);
+       }
+      
+      if (!e)
+       programming_error ("No score engraver!");
+      else
+       e->forbid_breaks ();
     }
   
   if (reqs_drul_[START])
@@ -72,7 +90,14 @@ Beam_engraver::do_process_requests ()
 
       prev_start_req_ = reqs_drul_[START];
       beam_p_ = new Beam;
-      grouping_p_ = new Rhythmic_grouping;
+
+      Translator * t  = daddy_grav_l  ()->get_simple_translator ("Timing_engraver");
+      Timing_engraver *timer = dynamic_cast<Timing_engraver*> (t);
+      beam_start_location_ = (t) ?  timer->time_.whole_in_measure_ : Moment (0);
+      beam_start_mom_ = now_mom();
+      beam_info_p_ = new Beaming_info_list;
+      
+      
 
       Scalar prop = get_property ("beamslopedamping", 0);
       if (prop.isnum_b ()) 
@@ -91,15 +116,14 @@ Beam_engraver::typeset_beam ()
 {
   if (finished_beam_p_)
     {
-      Rhythmic_grouping const * rg_C = get_staff_info().rhythmic_C_;
-      rg_C->extend (finished_grouping_p_->interval());
-      finished_beam_p_->set_grouping (*rg_C, *finished_grouping_p_);
+      finished_beam_info_p_->beamify ();
+      
+      finished_beam_p_->set_beaming (finished_beam_info_p_);
       typeset_element (finished_beam_p_);
+      delete finished_beam_info_p_;
+      finished_beam_info_p_ =0;
       finished_beam_p_ = 0;
     
-      delete finished_grouping_p_;
-      finished_grouping_p_= 0;
-    
       reqs_drul_[STOP] = 0;
     }
 }
@@ -124,7 +148,7 @@ Beam_engraver::do_removal_processing ()
     {
       prev_start_req_->warning (_ ("Unfinished beam"));
       finished_beam_p_ = beam_p_;
-      finished_grouping_p_ = grouping_p_;
+      finished_beam_info_p_ = beam_info_p_;
       typeset_beam ();
     }
 }
@@ -132,55 +156,42 @@ Beam_engraver::do_removal_processing ()
 void
 Beam_engraver::acknowledge_element (Score_element_info info)
 {
-    if (beam_p_)
-      {
-       Stem* stem_l = dynamic_cast<Stem *> (info.elem_l_);
-       if (!stem_l)
-         return;
+  if (beam_p_)
+    {
+      Stem* stem_l = dynamic_cast<Stem *> (info.elem_l_);
+      if (!stem_l || stem_l->beam_l_)
+       return;
 
 
-       Rhythmic_req *rhythmic_req = dynamic_cast <Rhythmic_req *> (info.req_l_);
-       if (!rhythmic_req)
-         {
-           String s = _ ("Stem must have Rhythmic structure.");
-           if (info.req_l_)
-             info.req_l_->warning (s);
-           else
-             ::warning (s);
+      bool stem_grace = stem_l->get_elt_property (grace_scm_sym) != SCM_BOOL_F;
+
+      if (get_property ("weAreGraceContext",0).to_bool () != stem_grace)
+       return;
+
+      Rhythmic_req *rhythmic_req = dynamic_cast <Rhythmic_req *> (info.req_l_);
+      if (!rhythmic_req)
+       {
+         String s = _ ("Stem must have Rhythmic structure.");
+         if (info.req_l_)
+           info.req_l_->warning (s);
+         else
+           ::warning (s);
          
-           return;
-         }
+         return;
+       }
       
+      if (rhythmic_req->duration_.durlog_i_<= 2)
+       {
+         rhythmic_req->warning (_ ("stem doesn't fit in beam"));
+         prev_start_req_->warning (_ ("beam was started here"));
+         return;
+       }
 
-       if (rhythmic_req->duration_.durlog_i_<= 2)
-         {
-           rhythmic_req->warning (_ ("stem doesn't fit in beam"));
-           prev_start_req_->warning (_ ("beam was started here"));
-           return;
-         }
-
-       /*
-         TODO: do something sensible if it doesn't fit in the beam.
-       */
-       Moment start = get_staff_info().time_C_->whole_in_measure_;
-
-       if (!grouping_p_->child_fit_b (start))
-         {
-           String s (_ ("please fix me") + ": " 
-                     + _f ("stem at %s doesn't fit in beam", now_mom ().str ()));
-
-           if (info.req_l_)
-             info.req_l_->warning(s);
-           else 
-             warning (s);
-         }
-       else
-         {
-           grouping_p_->add_child (start, rhythmic_req->length_mom ());
-           stem_l->flag_i_ = rhythmic_req->duration_.durlog_i_;
-           beam_p_->add_stem (stem_l);
-         }
-      }
+      stem_l->flag_i_ = rhythmic_req->duration_.durlog_i_;
+      Moment stem_location = now_mom () - beam_start_mom_ + beam_start_location_;
+      beam_info_p_->add_stem (stem_location, rhythmic_req->duration_.durlog_i_ - 2);
+      beam_p_->add_stem (stem_l);
+    }
 }