]> git.donarmstrong.com Git - lilypond.git/blobdiff - lily/beam-engraver.cc
* Another grand 2003 update.
[lilypond.git] / lily / beam-engraver.cc
index 6724ac8b4b29af33a307b121d7b67584f92085bc..d9c3ff9ad38d6c8009913d1dddd1390ee315ff30 100644 (file)
@@ -3,12 +3,12 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1998--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "engraver-group-engraver.hh"
 #include "engraver.hh"
-#include "musical-request.hh"
+#include "event.hh"
 #include "beam.hh"
 #include "stem.hh"
 #include "warn.hh"
 
 class Beam_engraver : public Engraver
 {
-  Drul_array<Span_req*> reqs_drul_;
-
-  Link_array<Stem> stems_;
-  
+protected:  
+  Drul_array<Music*> evs_drul_;
   
-  Spanner *finished_beam_p_;
-  Spanner *beam_p_;
-  Span_req * prev_start_req_;
+  Spanner *finished_beam_;
+  Spanner *beam_;
+  Music * prev_start_ev_;
 
-  Beaming_info_list * beam_info_p_;
-  Beaming_info_list * finished_beam_info_p_;  
+  Music * now_stop_ev_;
+  
+  Beaming_info_list * beam_info_;
+  Beaming_info_list * finished_beam_info_;  
 
   /// location  within measure where beam started.
   Moment beam_start_location_;
 
   /// moment (global time) where beam started.
   Moment beam_start_mom_;
-  
+
+  bool subdivide_beams_;
+  Moment beat_length_;
+
   void typeset_beam ();
   void set_melisma (bool);
-protected:
-  virtual void stop_translation_timestep ();
+
+  Moment last_stem_added_at_;
+    virtual void stop_translation_timestep ();
   virtual void start_translation_timestep ();
-  virtual void do_removal_processing ();
-  virtual void create_grobs ();
+  virtual void finalize ();
+
   virtual void acknowledge_grob (Grob_info);
   virtual bool try_music (Music*);
+  virtual void process_music ();
 
+  virtual bool valid_start_moment();
+  virtual bool valid_end_moment ();
+  
 public:
-  Beam_engraver ();
-  VIRTUAL_COPY_CONS (Translator);
+  TRANSLATOR_DECLARATIONS(  Beam_engraver );
 };
 
 
+/*
+  Hmm. this isn't necessary, since grace beams and normal beams are
+  always nested.
+ */
+bool
+Beam_engraver::valid_start_moment()
+{
+  Moment n = now_mom ();
+
+  return n.grace_part_ == Rational (0);
+}
+
+bool
+Beam_engraver::valid_end_moment()
+{
+  return last_stem_added_at_.grace_part_ == Rational(0);
+}
+
+
 Beam_engraver::Beam_engraver ()
 {
-  beam_p_ = 0;
-  finished_beam_p_ =0;
-  finished_beam_info_p_=0;
-  beam_info_p_ =0;
-  reqs_drul_[LEFT] = reqs_drul_[RIGHT] =0;
-  prev_start_req_ =0;
+  beam_ = 0;
+  finished_beam_ =0;
+  finished_beam_info_=0;
+  beam_info_ =0;
+  now_stop_ev_ = 0;
+  evs_drul_[LEFT] = evs_drul_[RIGHT] =0;
+  prev_start_ev_ =0;
 }
 
 bool
 Beam_engraver::try_music (Music *m)
 {
-  if (Span_req * c = dynamic_cast<Span_req*>(m))
+  if (m->is_mus_type ("abort-event"))
     {
-      if (scm_equal_p (c->get_mus_property ("span-type"),
-                      ly_str02scm ("abort")) == SCM_BOOL_T)
-       {
-         reqs_drul_[START] = 0;
-         reqs_drul_[STOP] = 0;
-         if (beam_p_)
-           beam_p_->suicide ();
-         beam_p_ = 0;
-       }
-      else if (scm_equal_p (c->get_mus_property ("span-type"),
-                      ly_str02scm ("beam")) == SCM_BOOL_T)
-       {
-      
-         Direction d =c->get_span_dir ();
+      evs_drul_[START] = 0;
+      evs_drul_[STOP] = 0;
+      if (beam_)
+       beam_->suicide ();
+      beam_ = 0;
+    }
+  else if (m->is_mus_type ("beam-event"))
+    {
+      Direction d = to_dir (m->get_mus_property ("span-direction"));
 
-         if (d == STOP && !beam_p_)
-           {
-             m->origin ()->warning  (_ ("can't find start of beam"));
-             return false;
-           }
+      if (d == STOP && !valid_end_moment())
+       return false;
 
-         if(d == STOP)
+      if (d == START && !valid_start_moment ())
+       return false;
+         
+      if (d == STOP)
+       {
+         SCM m = get_property ("automaticMelismata");
+         SCM b = get_property ("autoBeaming");
+         if (to_boolean (m) && !to_boolean (b))
            {
-             SCM m = get_property ("automaticMelismata");
-             SCM b = get_property("noAutoBeaming");
-             if (to_boolean (m) && to_boolean(b))
-               {
-                 set_melisma (false);
-               }
+             set_melisma (false);
            }
-
-         reqs_drul_[d ] = c;
-         return true;
        }
+
+      evs_drul_[d ] = m;
+      return true;
+    }
+  else if (m->is_mus_type ("new-beam-event"))
+    {
+      Direction d = to_dir (m->get_mus_property ("span-direction"));
+      if (d == START && !valid_start_moment ())
+       return false;
+      if (d == STOP && !valid_end_moment ())
+       return false;
+
+      if (d == START)
+       evs_drul_[d] = m;
+      else if (d==STOP)
+       now_stop_ev_ = m;
+
+      return true;
     }
   return false;
 }
@@ -111,163 +147,156 @@ Beam_engraver::try_music (Music *m)
 void
 Beam_engraver::set_melisma (bool m)
 {
-  daddy_trans_l_->set_property ("beamMelismaBusy", m ? SCM_BOOL_T :SCM_BOOL_F);
+  daddy_trans_->set_property ("beamMelismaBusy", m ? SCM_BOOL_T :SCM_BOOL_F);
 }
 
-
 void
-Beam_engraver::create_grobs ()
+Beam_engraver::process_music ()
 {
-  if (reqs_drul_[STOP])
+  if (evs_drul_[STOP])
     {
-      if (!beam_p_)
-       reqs_drul_[STOP]->origin ()->warning (_("can't find start of beam"));
-      prev_start_req_ =0;
-      finished_beam_p_ = beam_p_;
-      finished_beam_info_p_ = beam_info_p_;
-
-      beam_info_p_ =0;
-      beam_p_ = 0;
-    }
+      prev_start_ev_ =0;
+      finished_beam_ = beam_;
+      finished_beam_info_ = beam_info_;
 
+      beam_info_ =0;
+      beam_ = 0;
+    }
 
-  if (beam_p_ && !to_boolean (get_property ("weAreGraceContext")))
+  if (beam_)
     {
-      Score_engraver * e = 0;
-      Translator * t  =  daddy_grav_l ();
-      for (; !e && t;  t = t->daddy_trans_l_)
-       {
-         e = dynamic_cast<Score_engraver*> (t);
-       }
-      
-      if (!e)
-       programming_error ("No score engraver!");
-      else
-       e->forbid_breaks ();
+      top_engraver ()->forbid_breaks ();
     }
-  
-  if (reqs_drul_[START])
+  if (evs_drul_[START])
     {
-      if (beam_p_)
+      if (beam_)
        {
-         reqs_drul_[START]->origin ()->warning (_ ("already have a beam"));
+         evs_drul_[START]->origin ()->warning (_ ("already have a beam"));
          return;
        }
 
-      prev_start_req_ = reqs_drul_[START];
-      beam_p_ = new Spanner (get_property ("Beam"));
-      Beam::set_interface (beam_p_);
-      
+      prev_start_ev_ = evs_drul_[START];
+      beam_ = new Spanner (get_property ("Beam"));
       SCM smp = get_property ("measurePosition");
-      Moment mp =  (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0);
+      Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0);
 
       beam_start_location_ = mp;
-      beam_start_mom_ = now_mom();
-      beam_info_p_ = new Beaming_info_list;
+      beam_start_mom_ = now_mom ();
       
+      beam_info_ = new Beaming_info_list;
       
       /* urg, must copy to Auto_beam_engraver too */
  
-      announce_grob (beam_p_, reqs_drul_[START]);
+      announce_grob(beam_, evs_drul_[START]->self_scm());
     }
-  reqs_drul_[STOP] = 0;
-  reqs_drul_[START] = 0;
+
 }
 
+
 void
 Beam_engraver::typeset_beam ()
 {
-  if (finished_beam_p_)
+  if (finished_beam_)
     {
-      finished_beam_info_p_->beamify ();
-      
-      Beam::set_beaming (finished_beam_p_, finished_beam_info_p_);
-      typeset_grob (finished_beam_p_);
-      delete finished_beam_info_p_;
-      finished_beam_info_p_ =0;
-      finished_beam_p_ = 0;
-    
-      reqs_drul_[STOP] = 0;
+      finished_beam_info_->beamify(beat_length_, subdivide_beams_);
+      Beam::set_beaming (finished_beam_, finished_beam_info_);
+      typeset_grob (finished_beam_);
+      delete finished_beam_info_;
+      finished_beam_info_ =0;
+      finished_beam_ = 0;
     }
 }
 
 void
 Beam_engraver::start_translation_timestep ()
 {
-  reqs_drul_ [START] =0;
-  if(beam_p_) {
-    SCM m = get_property ("automaticMelismata");
-    SCM b = get_property("noAutoBeaming");
-    if (to_boolean (m) && to_boolean(b)) {
-      set_melisma (true);
+  evs_drul_ [START] =0;
+  evs_drul_[STOP] = 0;
+  
+  if (beam_)
+    {
+      SCM m = get_property ("automaticMelismata");
+      SCM b = get_property ("autoBeaming");
+      if (to_boolean (m) && !to_boolean (b))
+       {
+         set_melisma (true);
+       }
+      subdivide_beams_ = to_boolean(get_property("subdivideBeams"));
+      beat_length_ = *unsmob_moment (get_property ("beatLength"));
     }
-  }
 }
 
 void
 Beam_engraver::stop_translation_timestep ()
 {
   typeset_beam ();
+  if (now_stop_ev_ )
+    {
+      finished_beam_ = beam_;
+      finished_beam_info_ = beam_info_;
+
+      now_stop_ev_ = 0;
+      beam_ = 0;
+      beam_info_ = 0;
+      typeset_beam();
+    }
 }
 
 void
-Beam_engraver::do_removal_processing ()
+Beam_engraver::finalize ()
 {
   typeset_beam ();
-  if (beam_p_)
+  if (beam_)
     {
-      prev_start_req_->origin ()->warning (_ ("unterminated beam"));
-#if 0
-      finished_beam_p_ = beam_p_;
-      finished_beam_info_p_ = beam_info_p_;
-      typeset_beam ();
-#else
-      beam_p_->suicide ();
-      delete beam_info_p_;
-#endif
+      prev_start_ev_->origin ()->warning (_ ("unterminated beam"));
+
+      /*
+       we don't typeset it, (we used to, but it was commented
+       out. Reason unknown) */
+      beam_->suicide ();
+      delete beam_info_;
     }
 }
 
 void
 Beam_engraver::acknowledge_grob (Grob_info info)
 {
-  if (beam_p_)
+  if (beam_)
     {
-      if (Rest::has_interface (info.elem_l_))
+      if (Rest::has_interface (info.grob_))
        {
-         info.elem_l_->add_offset_callback (Beam::rest_collision_callback_proc, Y_AXIS);
+         info.grob_->add_offset_callback (Beam::rest_collision_callback_proc, Y_AXIS);
        }
-      else if (Stem::has_interface (info.elem_l_))
+      else if (Stem::has_interface (info.grob_))
        {
-         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;
+         Moment now = now_mom();
 
-         SCM wg =get_property ("weAreGraceContext");
-         bool wgb= to_boolean (wg);
-
-         if (wgb!= stem_grace)
+         if (!valid_start_moment ())
+           return ;
+         
+         Item *stem = dynamic_cast<Item*> (info.grob_);
+         if (Stem::get_beam (stem))
            return;
 
-         Rhythmic_req *rhythmic_req = dynamic_cast <Rhythmic_req *> (info.req_l_);
-         if (!rhythmic_req)
+         Music* m = info.music_cause();
+         if (!m->is_mus_type ("rhythmic-event"))
            {
              String s = _ ("stem must have Rhythmic structure");
-             if (info.req_l_)
-               info.req_l_->origin ()->warning (s);
+             if (info.music_cause ())
+               info.music_cause ()->origin ()->warning (s);
              else
                ::warning (s);
          
              return;
            }
 
-      int durlog  = unsmob_duration (rhythmic_req->get_mus_property ("duration"))-> duration_log ();
+
+         last_stem_added_at_ = now;
+         int durlog  = unsmob_duration (m->get_mus_property ("duration"))-> duration_log ();
          if (durlog <= 2)
            {
-             rhythmic_req->origin ()->warning (_ ("stem doesn't fit in beam"));
-             prev_start_req_->origin ()->warning (_ ("beam was started here"));
+             m->origin ()->warning (_ ("stem doesn't fit in beam"));
+             prev_start_ev_->origin ()->warning (_ ("beam was started here"));
              /*
                don't return, since
 
@@ -275,17 +304,69 @@ 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_;
-         beam_info_p_->add_stem (stem_location,
                                (durlog- 2) >? 1);
-         Beam::add_stem (beam_p_, stem_l);
+         stem->set_grob_property ("duration-log",
+                                   scm_int2num (durlog));
+         Moment stem_location = now - beam_start_mom_ + beam_start_location_;
+         beam_info_->add_stem (stem_location,
(durlog- 2) >? 0);
+         Beam::add_stem (beam_, stem);
        }
     }
 }
 
 
 
-ADD_THIS_TRANSLATOR(Beam_engraver);
+
+
+ENTER_DESCRIPTION(Beam_engraver,
+/* descr */       "Handles Beam events by engraving Beams.    If omitted, then notes will be "
+"printed with flags instead of beams.",
+/* creats*/       "Beam",
+/* accepts */     "beam-event new-beam-event abort-event",
+/* acks  */      "stem-interface rest-interface",
+/* reads */       "beamMelismaBusy beatLength subdivideBeams",
+/* write */       "");
+
+
+class Grace_beam_engraver : public Beam_engraver
+{
+public:
+  TRANSLATOR_DECLARATIONS(Grace_beam_engraver);  
+
+protected:
+  virtual bool valid_start_moment();
+  virtual bool valid_end_moment ();
+};
+
+Grace_beam_engraver::Grace_beam_engraver()
+{
+}
+
+bool
+Grace_beam_engraver::valid_start_moment()
+{
+  Moment n = now_mom ();
+
+  return n.grace_part_ != Rational (0);
+}
+
+
+bool
+Grace_beam_engraver::valid_end_moment ()
+{
+  return beam_ && last_stem_added_at_.grace_part_ != Rational(0);
+}
+
+
+
+ENTER_DESCRIPTION(Grace_beam_engraver,
+/* descr */       "Handles Beam events by engraving Beams.  If omitted, then notes will "
+"be printed with flags instead of beams. Only engraves beams when we "
+" are at grace points in time. "
+,
+/* creats*/       "Beam",
+/* accepts */     "beam-event abort-event new-beam-event",
+/* acks  */      "stem-interface rest-interface",
+/* reads */       "beamMelismaBusy beatLength subdivideBeams",
+/* write */       "");