release: 1.3.30

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

diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc
index 608167f01bfddc6ea6d2ab12d8b120fa450a7ea6..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"
@@ -13,8 +13,8 @@
 #include "beam.hh"
 #include "stem.hh"
 #include "warn.hh"
-#include "time-description.hh"
-#include "new-beaming.hh"
+#include "timing-translator.hh"
+#include "beaming.hh"
 #include "score-engraver.hh"
 
 Beam_engraver::Beam_engraver ()
@@ -39,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;
@@ -55,7 +55,7 @@ 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_beam_info_p_ = beam_info_p_;
@@ -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;
        }
 
@@ -93,19 +93,12 @@ Beam_engraver::do_process_requests ()
 
       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_location_ = (t) ?  timer->measure_position () : Moment (0);
       beam_start_mom_ = now_mom();
       beam_info_p_ = new Beaming_info_list;
       
       
-
-      Scalar prop = get_property ("beamslopedamping", 0);
-      if (prop.isnum_b ()) 
-       beam_p_->set_elt_property (damping_scm_sym, gh_int2scm( prop));
-      
-      prop = get_property ("beamquantisation", 0);
-      if (prop.isnum_b ()) 
-       beam_p_->quantisation_ = (Beam::Quantisation)(int)prop;
+      /* urg, must copy to Auto_beam_engraver too */
  
       announce_element (Score_element_info (beam_p_, reqs_drul_[START]));
     }
@@ -146,7 +139,7 @@ Beam_engraver::do_removal_processing ()
   typeset_beam ();
   if (beam_p_)
     {
-      prev_start_req_->warning (_ ("Unfinished beam"));
+      prev_start_req_->warning (_ ("unfinished beam"));
       finished_beam_p_ = beam_p_;
       finished_beam_info_p_ = beam_info_p_;
       typeset_beam ();
@@ -159,19 +152,22 @@ 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_sym) != SCM_BOOL_F;
+      bool stem_grace = stem_l->get_elt_property ("grace") == SCM_BOOL_T;
+
+      SCM wg =get_property ("weAreGraceContext");
+      bool wgb= to_boolean (wg);
 
-      if (get_property ("weAreGraceContext",0).to_bool () != stem_grace)
+      if (wgb!= stem_grace)
        return;
 
       Rhythmic_req *rhythmic_req = dynamic_cast <Rhythmic_req *> (info.req_l_);
       if (!rhythmic_req)
        {
-         String s = _ ("Stem must have Rhythmic structure.");
+         String s = _ ("Stem must have Rhythmic structure");
          if (info.req_l_)
            info.req_l_->warning (s);
          else
@@ -182,14 +178,20 @@ Beam_engraver::acknowledge_element (Score_element_info info)
       
       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;
+         rhythmic_req->warning (_ ("Stem doesn't fit in beam"));
+         prev_start_req_->warning (_ ("Beam was started here"));
+         /*
+           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);
     }
 }
@@ -197,3 +199,4 @@ Beam_engraver::acknowledge_element (Score_element_info info)
 
 
 ADD_THIS_TRANSLATOR(Beam_engraver);
+