X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeam-engraver.cc;h=c1b9d54c30142029de847038957799090c62894b;hb=8ddde8ef4b15f34e72a6817a231a0fa47841e42b;hp=a4ffe9a51930cd6d3934516bdf019f5beff39ed6;hpb=eae90c59e6fc5a916c6736d2ca56486b045768a5;p=lilypond.git

diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc
index a4ffe9a519..c1b9d54c30 100644
--- a/lily/beam-engraver.cc
+++ b/lily/beam-engraver.cc
@@ -1,273 +1,356 @@
-/*   
-  beam-engraver.cc --  implement Beam_engraver
-  
+/*
+  beam-engraver.cc -- implement Beam_engraver
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
-#include "engraver-group-engraver.hh"
-#include "engraver.hh"
-#include "musical-request.hh"
+
+  (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
+
 #include "beam.hh"
-#include "stem.hh"
-#include "warn.hh"
-#include "beaming.hh"
-#include "score-engraver.hh"
-#include "rest.hh"
+#include "beaming-pattern.hh"
+#include "context.hh"
 #include "drul-array.hh"
+#include "duration.hh"
+#include "engraver.hh"
+#include "international.hh"
 #include "item.hh"
+#include "rest.hh"
 #include "spanner.hh"
+#include "stream-event.hh"
+#include "stem.hh"
+#include "warn.hh"
+
+#include "translator.icc"
 
 class Beam_engraver : public Engraver
 {
-  Drul_array<Span_req*> reqs_drul_;
+public:
+  DECLARE_ACKNOWLEDGER (stem);
+  DECLARE_ACKNOWLEDGER (rest);
+
+protected:
+  Stream_event *start_ev_;
+
+  Spanner *finished_beam_;
+  Spanner *beam_;
+  Stream_event *prev_start_ev_;
 
-  Spanner *finished_beam_p_;
-  Spanner *beam_p_;
-  Span_req * prev_start_req_;
+  Stream_event *stop_ev_;
 
-  Beaming_info_list * beam_info_p_;
-  Beaming_info_list * finished_beam_info_p_;  
+  Beaming_pattern *beam_info_;
+  Beaming_pattern *finished_beam_info_;
 
   /// location  within measure where beam started.
   Moment beam_start_location_;
 
   /// moment (global time) where beam started.
   Moment beam_start_mom_;
+
+  Beaming_options beaming_options_;
+  Beaming_options finished_beaming_options_;
   
   void typeset_beam ();
   void set_melisma (bool);
-protected:
-  virtual void do_pre_move_processing ();
-  virtual void do_post_move_processing ();
-  virtual void do_removal_processing ();
-  virtual void acknowledge_element (Score_element_info);
-  virtual bool do_try_music (Music*);
-  virtual void do_process_music ();
+
+  Moment last_stem_added_at_;
+  void stop_translation_timestep ();
+  void start_translation_timestep ();
+  virtual void finalize ();
+
+  void process_music ();
+
+  virtual bool valid_start_point ();
+  virtual bool valid_end_point ();
+
+  DECLARE_TRANSLATOR_LISTENER (beam);
 public:
-  Beam_engraver ();
-  VIRTUAL_COPY_CONS (Translator);
+  TRANSLATOR_DECLARATIONS (Beam_engraver);
 };
 
-
-Beam_engraver::Beam_engraver ()
+/*
+  Hmm. this isn't necessary, since grace beams and normal beams are
+  always nested.
+*/
+bool
+Beam_engraver::valid_start_point ()
 {
-  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;
+  Moment n = now_mom ();
+
+  return n.grace_part_ == Rational (0);
 }
 
 bool
-Beam_engraver::do_try_music (Music *m)
+Beam_engraver::valid_end_point ()
 {
-  if (Span_req * c = dynamic_cast<Span_req*>(m))
-    {
-      if (c->span_type_str_ != "beam")
-	return false;
-      
-      Direction d =c->span_dir_;
+  return valid_start_point ();
+}
 
-      if (d == STOP && !beam_p_)
-	{
-	  m->origin ()->warning  (_ ("can't find start of beam"));
-	  return false;
-	}
+Beam_engraver::Beam_engraver ()
+{
+  beam_ = 0;
+  finished_beam_ = 0;
+  finished_beam_info_ = 0;
+  beam_info_ = 0;
+  stop_ev_ = 0;
+  start_ev_ = 0;
+  prev_start_ev_ = 0;
+}
 
-      if(d == STOP)
-	{
-	  SCM m = get_property ("automaticMelismata");
-	  SCM b = get_property("noAutoBeaming");
-	  if (to_boolean (m) && to_boolean(b))
-	    {
-	      set_melisma (false);
-	    }
-	}
+IMPLEMENT_TRANSLATOR_LISTENER (Beam_engraver, beam);
+void
+Beam_engraver::listen_beam (Stream_event *ev)
+{
+  Direction d = to_dir (ev->get_property ("span-direction"));
 
-      reqs_drul_[d ] = c;
-      return true;
-    }
-  return false;
+  if (d == START && valid_start_point ())
+    ASSIGN_EVENT_ONCE (start_ev_, ev);
+  else if (d == STOP && valid_end_point ())
+    ASSIGN_EVENT_ONCE (stop_ev_, ev);
 }
 
 void
-Beam_engraver::set_melisma (bool m)
+Beam_engraver::set_melisma (bool ml)
 {
-  daddy_trans_l_->set_property ("beamMelismaBusy", m ? SCM_BOOL_T :SCM_BOOL_F);
+  SCM b = get_property ("autoBeaming");
+  if (!to_boolean (b))
+    context ()->set_property ("beamMelismaBusy", ml ? SCM_BOOL_T : SCM_BOOL_F);
 }
 
-
 void
-Beam_engraver::do_process_music ()
+Beam_engraver::process_music ()
 {
-  if (reqs_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;
-    }
-
-
-  if (beam_p_  &&  !to_boolean (get_property ("weAreGraceContext")))
+  if (start_ev_)
     {
-      Score_engraver * e = 0;
-      Translator * t  =  daddy_grav_l ();
-      for (; !e && t;  t = t->daddy_trans_l_)
+      if (beam_)
 	{
-	  e = dynamic_cast<Score_engraver*> (t);
-	}
-      
-      if (!e)
-	programming_error ("No score engraver!");
-      else
-	e->forbid_breaks ();
-    }
-  
-  if (reqs_drul_[START])
-    {
-      if (beam_p_)
-	{
-	  reqs_drul_[START]->origin ()->warning (_ ("already have a beam"));
+	  start_ev_->origin ()->warning (_ ("already have a beam"));
 	  return;
 	}
 
-      prev_start_req_ = reqs_drul_[START];
-      beam_p_ = new Spanner (get_property ("basicBeamProperties"));
-      Beam::set_interface (beam_p_);
-      
-      SCM smp = get_property ("measurePosition");
-      Moment mp =  (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0);
+      set_melisma (true);
+      prev_start_ev_ = start_ev_;
+      beam_ = make_spanner ("Beam", start_ev_->self_scm ());
+      Moment mp (robust_scm2moment (get_property ("measurePosition"), Moment (0)));
 
       beam_start_location_ = mp;
-      beam_start_mom_ = now_mom();
-      beam_info_p_ = new Beaming_info_list;
-      
-      
+      beam_start_mom_ = now_mom ();
+
+      beaming_options_.from_context (context ());
+      beam_info_ = new Beaming_pattern;
       /* urg, must copy to Auto_beam_engraver too */
- 
-      announce_element (beam_p_, reqs_drul_[START]);
+    }
+
+  typeset_beam ();
+  if (stop_ev_ && beam_)
+    {
+      announce_end_grob (beam_, stop_ev_->self_scm ());
+      
     }
 }
 
 void
 Beam_engraver::typeset_beam ()
 {
-  if (finished_beam_p_)
+  if (finished_beam_)
     {
-      finished_beam_info_p_->beamify ();
+      if (!finished_beam_->get_bound (RIGHT))
+	finished_beam_->set_bound (RIGHT, finished_beam_->get_bound (LEFT));
       
-      Beam::set_beaming (finished_beam_p_, finished_beam_info_p_);
-      typeset_element (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 (finished_beaming_options_);
+      Beam::set_beaming (finished_beam_, finished_beam_info_);
+
+      delete finished_beam_info_;
+      finished_beam_info_ = 0;
+      finished_beam_ = 0;
     }
 }
 
 void
-Beam_engraver::do_post_move_processing ()
+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)) {
+  start_ev_ = 0;
+
+  if (beam_)
+    {
       set_melisma (true);
     }
-  }
 }
 
 void
-Beam_engraver::do_pre_move_processing ()
+Beam_engraver::stop_translation_timestep ()
 {
-  typeset_beam ();
+  if (stop_ev_)
+    {
+      finished_beam_ = beam_;
+      finished_beam_info_ = beam_info_;
+      finished_beaming_options_ = beaming_options_;
+      
+      stop_ev_ = 0;
+      beam_ = 0;
+      beam_info_ = 0;
+      typeset_beam ();
+      set_melisma (false);
+    }
 }
 
 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_element (Score_element_info info)
+Beam_engraver::acknowledge_rest (Grob_info info)
 {
-  if (beam_p_)
+  if (beam_
+      && !scm_is_number (info.grob ()->get_property_data ("staff-position")))
     {
-      if (Rest::has_interface (info.elem_l_))
-	{
-	  info.elem_l_->add_offset_callback (Beam::rest_collision_callback, Y_AXIS);
-	}
-      else if (Stem::has_interface (info.elem_l_))
-	{
-	  Item *stem_l = dynamic_cast<Item*> (info.elem_l_);
-	  if (Stem::beam_l (stem_l))
-	    return;
-
-	  bool stem_grace = stem_l->get_elt_property ("grace") == SCM_BOOL_T;
-
-	  SCM wg =get_property ("weAreGraceContext");
-	  bool wgb= to_boolean (wg);
-
-	  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");
-	      if (info.req_l_)
-		info.req_l_->origin ()->warning (s);
-	      else
-		::warning (s);
-	  
-	      return;
-	    }
-
-	  if (rhythmic_req->duration_.durlog_i_<= 2)
-	    {
-	      rhythmic_req->origin ()->warning (_ ("stem doesn't fit in beam"));
-	      prev_start_req_->origin ()->warning (_ ("beam was started here"));
-	      /*
-		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) >? 1);
-	  Beam::add_stem (beam_p_, stem_l);
-	}
+      chain_offset_callback (info.grob (),
+			     Beam::rest_collision_callback_proc, Y_AXIS);
+    }
+}
+
+
+
+void
+Beam_engraver::acknowledge_stem (Grob_info info)
+{
+  if (!beam_)
+    return;
+  
+  Moment now = now_mom ();
+  if (!valid_start_point ())
+    return;
+
+  Item *stem = dynamic_cast<Item *> (info.grob ());
+  if (Stem::get_beam (stem))
+    return;
+
+  
+  
+  Stream_event *ev = info.ultimate_event_cause ();
+  if (!ev->in_event_class ("rhythmic-event"))
+    {
+      info.grob ()->warning (_ ("stem must have Rhythmic structure"));
+      return;
+    }
+
+  last_stem_added_at_ = now;
+  int durlog = unsmob_duration (ev->get_property ("duration"))->duration_log ();
+  if (durlog <= 2)
+    {
+      ev->origin ()->warning (_ ("stem does not fit in beam"));
+      prev_start_ev_->origin ()->warning (_ ("beam was started here"));
+      /*
+	don't return, since
+
+	[r4 c8] can just as well be modern notation.
+      */
     }
+
+  stem->set_property ("duration-log",
+		      scm_from_int (durlog));
+  Moment stem_location = now - beam_start_mom_ + beam_start_location_;
+  beam_info_->add_stem (stem_location,
+			max (durlog- 2, 0),
+			Stem::is_invisible (stem));
+  Beam::add_stem (beam_, stem);
 }
 
+ADD_ACKNOWLEDGER (Beam_engraver, stem);
+ADD_ACKNOWLEDGER (Beam_engraver, rest);
+
+ADD_TRANSLATOR (Beam_engraver,
+		/* doc */
+		"Handle @code{Beam} events by engraving beams.  If omitted,"
+		" then notes are printed with flags instead of beams.",
+		
+		/* create */
+		"Beam ",
+
+		/* read */
+		"beamMelismaBusy "
+		"beatLength "
+		"subdivideBeams ",
+
+		/* write */
+		"forbidBreak"
+		);
+
+class Grace_beam_engraver : public Beam_engraver
+{
+public:
+  TRANSLATOR_DECLARATIONS (Grace_beam_engraver);
+
+  DECLARE_TRANSLATOR_LISTENER (beam);
+  
+protected:
+  virtual bool valid_start_point ();
+  virtual bool valid_end_point ();
+};
+
+Grace_beam_engraver::Grace_beam_engraver ()
+{
+}
+
+bool
+Grace_beam_engraver::valid_start_point ()
+{
+  Moment n = now_mom ();
+
+  return n.grace_part_ != Rational (0);
+}
+
+bool
+Grace_beam_engraver::valid_end_point ()
+{
+  return beam_ && valid_start_point ();
+}
+
+/*
+  Ugh, C&P code.
+ */
+IMPLEMENT_TRANSLATOR_LISTENER (Grace_beam_engraver, beam);
+void
+Grace_beam_engraver::listen_beam (Stream_event *ev)
+{
+  Direction d = to_dir (ev->get_property ("span-direction"));
+
+  if (d == START && valid_start_point ())
+    start_ev_ = ev;
+  else if (d == STOP && valid_end_point ())
+    stop_ev_ = ev;
+}
+
+
+ADD_ACKNOWLEDGER (Grace_beam_engraver, stem);
+ADD_ACKNOWLEDGER (Grace_beam_engraver, rest);
+
+ADD_TRANSLATOR (Grace_beam_engraver,
+		/* doc */
+		"Handle @code{Beam} events by engraving beams.  If omitted,"
+		" then notes are printed with flags instead of beams.  Only"
+		" engraves beams when we are at grace points in time.",
+		
+		/* create */
+		"Beam ",
 
+		/* read */
+		"beamMelismaBusy "
+		"beatLength "
+		"subdivideBeams ",
 
-ADD_THIS_TRANSLATOR(Beam_engraver);
+		/* write */
+		""
+		);