release: 1.3.30

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

diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc
index 7a770f681295baf64f8115114162a30dd41aac53..15606f34b841b639914b234c4d88040d959f5b20 100644 (file)
--- a/lily/beam-engraver.cc
+++ b/lily/beam-engraver.cc
@@ -3,10 +3,9 @@
   
   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"
 #include "engraver-group-engraver.hh"
 #include "beam-engraver.hh"
@@ -18,8 +17,6 @@
 #include "beaming.hh"
 #include "score-engraver.hh"
 
-ADD_THIS_TRANSLATOR (Beam_engraver);
-
 Beam_engraver::Beam_engraver ()
 {
   beam_p_ = 0;
@@ -161,7 +158,7 @@ Beam_engraver::acknowledge_element (Score_element_info info)
 
       bool stem_grace = stem_l->get_elt_property ("grace") == SCM_BOOL_T;
 
-      SCM wg =get_property ("weAreGraceContext",0);
+      SCM wg =get_property ("weAreGraceContext");
       bool wgb= to_boolean (wg);
 
       if (wgb!= stem_grace)
@@ -183,14 +180,23 @@ 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->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);
     }
 }
 
+
+
+ADD_THIS_TRANSLATOR(Beam_engraver);
+