release: 1.3.30

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

diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc
index e98ab845527c6682b8b1ef57824b6cf4af690c45..15606f34b841b639914b234c4d88040d959f5b20 100644 (file)
--- a/lily/beam-engraver.cc
+++ b/lily/beam-engraver.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "timing-engraver.hh"
@@ -84,7 +84,7 @@ Beam_engraver::do_process_requests ()
     {
       if (beam_p_)
        {
-         reqs_drul_[START]->warning (_ ("Already have a Beam"));
+         reqs_drul_[START]->warning (_ ("Already have a beam"));
          return;
        }
 
@@ -152,14 +152,14 @@ Beam_engraver::acknowledge_element (Score_element_info info)
   if (beam_p_)
     {
       Stem* stem_l = dynamic_cast<Stem *> (info.elem_l_);
-      if (!stem_l || stem_l->beam_l_)
+      if (!stem_l || stem_l->beam_l ())
        return;
 
 
       bool stem_grace = stem_l->get_elt_property ("grace") == SCM_BOOL_T;
 
-      SCM wg =get_property ("weAreGraceContext",0);
-      bool wgb= gh_boolean_p (wg) && gh_scm2bool (wg);
+      SCM wg =get_property ("weAreGraceContext");
+      bool wgb= to_boolean (wg);
 
       if (wgb!= stem_grace)
        return;
@@ -180,12 +180,18 @@ Beam_engraver::acknowledge_element (Score_element_info info)
        {
          rhythmic_req->warning (_ ("Stem doesn't fit in beam"));
          prev_start_req_->warning (_ ("Beam was started here"));
-         return;
+         /*
+           don't return, since
+
+           [r4 c8] can just as well be modern notation.
+          */
        }
 
-      stem_l->flag_i_ = rhythmic_req->duration_.durlog_i_;
+      stem_l->set_elt_property ("duration-log",
+                               gh_int2scm (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_info_p_->add_stem (stem_location,
+                             (rhythmic_req->duration_.durlog_i_ - 2) >? 1);
       beam_p_->add_stem (stem_l);
     }
 }