release: 1.1.51

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

diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc
index ac7a02a26b2dbc1ef504bcbd977675c8ae3b187c..cb6ec3ef3c413dc991cc802ea6bc0db3490166a1 100644 (file)
--- a/lily/beam-engraver.cc
+++ b/lily/beam-engraver.cc
@@ -3,14 +3,14 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #include "beam-engraver.hh"
 #include "musical-request.hh"
 #include "beam.hh"
-#include "grouping.hh"
+#include "rhythmic-grouping.hh"
 #include "stem.hh"
 #include "warn.hh"
 #include "time-description.hh"
@@ -22,14 +22,18 @@ Beam_engraver::Beam_engraver ()
   finished_grouping_p_ = 0;
   grouping_p_ =0;
   reqs_drul_[LEFT] = reqs_drul_[RIGHT] =0;
+  prev_start_req_ =0;
 }
 
 bool
 Beam_engraver::do_try_music (Music *m)
 {
-  if (Beam_req * c = dynamic_cast<Beam_req*>(m))
+  if (Span_req * c = dynamic_cast<Span_req*>(m))
     {
-      Direction d =c->spantype_;
+      if (c->span_type_str_ != "beam")
+       return false;
+      
+      Direction d =c->span_dir_;
 
       if (d == STOP && !beam_p_)
        {
@@ -50,6 +54,7 @@ Beam_engraver::do_process_requests ()
     {
       if (!beam_p_)
        reqs_drul_[STOP]->warning (_("No beam to end"));
+      prev_start_req_ =0;
       finished_beam_p_ = beam_p_;
       finished_grouping_p_ = grouping_p_;
 
@@ -65,27 +70,18 @@ Beam_engraver::do_process_requests ()
          return;
        }
 
+      prev_start_req_ = reqs_drul_[START];
       beam_p_ = new Beam;
       grouping_p_ = new Rhythmic_grouping;
 
       Scalar prop = get_property ("beamslopedamping", 0);
       if (prop.isnum_b ()) 
-       beam_p_->damping_i_ = prop;
-
+       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;
  
-      // must set minVerticalAlign == maxVerticalAlign to get sane results
-      // see input/test/beam-interstaff.ly
-      prop = get_property ("minVerticalAlign", 0);
-      if (prop.isnum_b ())
-       beam_p_->vertical_align_drul_[MIN] = prop;
-
-      prop = get_property ("maxVerticalAlign", 0);
-      if (prop.isnum_b ())
-       beam_p_->vertical_align_drul_[MAX] = prop;
-
       announce_element (Score_element_info (beam_p_, reqs_drul_[START]));
     }
 }
@@ -126,7 +122,7 @@ Beam_engraver::do_removal_processing ()
   typeset_beam ();
   if (beam_p_)
     {
-      warning (_ ("Unfinished beam"));
+      prev_start_req_->warning (_ ("Unfinished beam"));
       finished_beam_p_ = beam_p_;
       finished_grouping_p_ = grouping_p_;
       typeset_beam ();
@@ -136,55 +132,60 @@ Beam_engraver::do_removal_processing ()
 void
 Beam_engraver::acknowledge_element (Score_element_info info)
 {
-    if (beam_p_)
-      {
-       Stem* stem_l = dynamic_cast<Stem *> (info.elem_l_);
-       if (!stem_l)
-         return;
+  if (beam_p_)
+    {
+      Stem* stem_l = dynamic_cast<Stem *> (info.elem_l_);
+      if (!stem_l || stem_l->beam_l_)
+       return;
+
+      bool self_grace = beam_p_->get_elt_property (grace_scm_sym) != SCM_BOOL_F;
+      bool stem_grace = stem_l->get_elt_property (grace_scm_sym) != SCM_BOOL_F;
 
+      if (!self_grace && stem_grace)
+       return;
 
-       Rhythmic_req *rhythmic_req = dynamic_cast <Rhythmic_req *> (info.req_l_);
-       if (!rhythmic_req)
-         {
-           String s = _ ("Stem must have Rhythmic structure.");
-           if (info.req_l_)
-             info.req_l_->warning (s);
-           else
-             ::warning (s);
+      Rhythmic_req *rhythmic_req = dynamic_cast <Rhythmic_req *> (info.req_l_);
+      if (!rhythmic_req)
+       {
+         String s = _ ("Stem must have Rhythmic structure.");
+         if (info.req_l_)
+           info.req_l_->warning (s);
+         else
+           ::warning (s);
          
-           return;
-         }
+         return;
+       }
       
 
-       if (rhythmic_req->duration_.durlog_i_<= 2)
-         {
-           rhythmic_req->warning (_ ("stem doesn't fit in beam"));
-           reqs_drul_[LEFT]->warning (_ ("beam was started here"));
-           return;
-         }
-
-       /*
-         TODO: do something sensible if it doesn't fit in the beam.
-       */
-       Moment start = get_staff_info().time_C_->whole_in_measure_;
-
-       if (!grouping_p_->child_fit_b (start))
-         {
-           String s (_ ("please fix me") + ": " 
-                     + _f ("stem at %s doesn't fit in beam", now_moment ().str ()));
-
-           if (info.req_l_)
-             info.req_l_->warning(s);
-           else 
-             warning (s);
-         }
-       else
-         {
-           grouping_p_->add_child (start, rhythmic_req->duration ());
-           stem_l->flag_i_ = rhythmic_req->duration_.durlog_i_;
-           beam_p_->add_stem (stem_l);
-         }
-      }
+      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;
+       }
+
+      /*
+       TODO: do something sensible if it doesn't fit in the beam.
+      */
+      Moment start = get_staff_info().time_C_->whole_in_measure_;
+
+      if (!grouping_p_->child_fit_b (start))
+       {
+         String s (_ ("please fix me") + ": " 
+                   + _f ("stem at %s doesn't fit in beam", now_mom ().str ()));
+
+         if (info.req_l_)
+           info.req_l_->warning(s);
+         else 
+           warning (s);
+       }
+      else
+       {
+         grouping_p_->add_child (start, rhythmic_req->length_mom ());
+         stem_l->flag_i_ = rhythmic_req->duration_.durlog_i_;
+         beam_p_->add_stem (stem_l);
+       }
+    }
 }