release: 1.5.15

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

diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc
index b5ebc0156f728605754722b184c3418bb11ecb94..b9e7eb63fec08cb961c5221795ca05b9f49d9196 100644 (file)
--- a/lily/beam-engraver.cc
+++ b/lily/beam-engraver.cc
@@ -51,8 +51,7 @@ protected:
   virtual void process_music ();
 
 public:
-  Beam_engraver ();
-  VIRTUAL_COPY_CONS (Translator);
+  TRANSLATOR_DECLARATIONS(  Beam_engraver );
 };
 
 
@@ -131,7 +130,7 @@ Beam_engraver::process_music ()
     }
 
 
-  if (beam_p_ && !to_boolean (get_property ("weAreGraceContext")))
+  if (beam_p_)
     {
       Score_engraver * e = 0;
       Translator * t  =  daddy_grav_l ();
@@ -166,8 +165,8 @@ Beam_engraver::create_grobs ()
 
       beam_start_location_ = mp;
       beam_start_mom_ = now_mom ();
-      beam_info_p_ = new Beaming_info_list;
       
+      beam_info_p_ = new Beaming_info_list;
       
       /* urg, must copy to Auto_beam_engraver too */
  
@@ -182,8 +181,9 @@ Beam_engraver::typeset_beam ()
 {
   if (finished_beam_p_)
     {
-      finished_beam_info_p_->beamify ();
-      
+      finished_beam_info_p_->beamify(*unsmob_moment (get_property ("beatLength")),
+                                    (bool)gh_scm2bool(get_property("subdivideBeams")));
+
       Beam::set_beaming (finished_beam_p_, finished_beam_info_p_);
       typeset_grob (finished_beam_p_);
       delete finished_beam_info_p_;
@@ -220,14 +220,12 @@ Beam_engraver::finalize ()
   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
+
+      /*
+       we don't typeset it, (we used to, but it was commented
+       out. Reason unknown) */
       beam_p_->suicide ();
       delete beam_info_p_;
-#endif
     }
 }
 
@@ -236,22 +234,19 @@ Beam_engraver::acknowledge_grob (Grob_info info)
 {
   if (beam_p_)
     {
-      if (Rest::has_interface (info.elem_l_))
+      if (Rest::has_interface (info.grob_l_))
        {
-         info.elem_l_->add_offset_callback (Beam::rest_collision_callback_proc, Y_AXIS);
+         info.grob_l_->add_offset_callback (Beam::rest_collision_callback_proc, Y_AXIS);
        }
-      else if (Stem::has_interface (info.elem_l_))
+      else if (Stem::has_interface (info.grob_l_))
        {
-         Item *stem_l = dynamic_cast<Item*> (info.elem_l_);
-         if (Stem::beam_l (stem_l))
-           return;
-
-         bool stem_grace = stem_l->get_grob_property ("grace") == SCM_BOOL_T;
-
-         SCM wg =get_property ("weAreGraceContext");
-         bool wgb= to_boolean (wg);
+         Moment now = now_mom();
 
-         if (wgb!= stem_grace)
+         if(bool (now.grace_part_ ) != bool (beam_start_mom_.grace_part_))
+           return ;
+         
+         Item *stem_l = dynamic_cast<Item*> (info.grob_l_);
+         if (Stem::beam_l (stem_l))
            return;
 
          Rhythmic_req *rhythmic_req = dynamic_cast <Rhythmic_req *> (info.req_l_);
@@ -280,7 +275,7 @@ Beam_engraver::acknowledge_grob (Grob_info info)
 
          stem_l->set_grob_property ("duration-log",
                                    gh_int2scm (durlog));
-         Moment stem_location = now_mom () - beam_start_mom_ + beam_start_location_;
+         Moment stem_location = now - beam_start_mom_ + beam_start_location_;
          beam_info_p_->add_stem (stem_location,
  (durlog- 2) >? 1);
          Beam::add_stem (beam_p_, stem_l);
@@ -290,5 +285,12 @@ Beam_engraver::acknowledge_grob (Grob_info info)
 
 
 
-ADD_THIS_TRANSLATOR (Beam_engraver);
 
+
+ENTER_DESCRIPTION(Beam_engraver,
+/* descr */       "Handles Beam_requests by engraving Beams.    If omitted, then notes will be
+printed with flags instead of beams.",
+/* creats*/       "Beam",
+/* acks  */       "stem-interface rest-interface",
+/* reads */       "beamMelismaBusy",
+/* write */       "");