release: 1.5.3

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

diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc
index b5ebc0156f728605754722b184c3418bb11ecb94..7b506953c8eb1904381b761bbffae8119f0462a5 100644 (file)
--- a/lily/beam-engraver.cc
+++ b/lily/beam-engraver.cc
@@ -131,7 +131,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 +166,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 */
  
@@ -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
     }
 }
 
@@ -242,18 +240,15 @@ Beam_engraver::acknowledge_grob (Grob_info info)
        }
       else if (Stem::has_interface (info.elem_l_))
        {
+         Moment now = now_mom();
+
+         if(bool (now.grace_mom_ ) != bool (beam_start_mom_.grace_mom_))
+           return ;
+         
          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);
-
-         if (wgb!= stem_grace)
-           return;
-
          Rhythmic_req *rhythmic_req = dynamic_cast <Rhythmic_req *> (info.req_l_);
          if (!rhythmic_req)
            {
@@ -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);