X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem-engraver.cc;h=fdb61219f6b7f635b78575ebc4f24237a6e22aa2;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=3d7d879bb837670711d604d911ccc1aa4f060024;hpb=d9b43b93f2c885409bafdb157138158f65cc49aa;p=lilypond.git

diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc
index 3d7d879bb8..fdb61219f6 100644
--- a/lily/stem-engraver.cc
+++ b/lily/stem-engraver.cc
@@ -1,186 +1,186 @@
 /*
-  stem-grav.cc -- implement Stem_engraver
+  stem-engraver.cc -- implement Stem_engraver
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "staff-symbol-referencer.hh"
-#include "rhythmic-head.hh"
-#include "stem.hh"
-#include "musical-request.hh"
-#include "misc.hh"
-#include "stem-tremolo.hh"
-#include "item.hh"
-#include "translator-group.hh"
 #include "engraver.hh"
 
+#include "context.hh"
+#include "directional-element-interface.hh"
+#include "duration.hh"
+#include "international.hh"
+#include "item.hh"
+#include "misc.hh"
+#include "rhythmic-head.hh"
+#include "script-interface.hh"
+#include "staff-symbol-referencer.hh"
+#include "stem-tremolo.hh"
+#include "stem.hh"
+#include "stream-event.hh"
 
+#include "translator.icc"
 
-/**
-  Make stems upon receiving noteheads.
- */
 class Stem_engraver : public Engraver
 {
-  TRANSLATOR_DECLARATIONS(Stem_engraver);
+  Grob *stem_;
+  Grob *tremolo_;
+  Stream_event *rhythmic_ev_;
+  Stream_event *tremolo_ev_;
+
+  TRANSLATOR_DECLARATIONS (Stem_engraver);
+
 protected:
-  virtual void acknowledge_grob (Grob_info);
-  virtual void stop_translation_timestep ();
-  virtual bool try_music (Music*);
-  
-private:
-  Grob  *stem_p_;
-  Grob *tremolo_p_;
-  Rhythmic_req *rhythmic_req_l_;
-  Tremolo_req* tremolo_req_l_;
+  void make_stem (Grob_info);
+
+  DECLARE_TRANSLATOR_LISTENER (tremolo);
+  DECLARE_ACKNOWLEDGER (rhythmic_head);
+  void stop_translation_timestep ();
 };
 
 Stem_engraver::Stem_engraver ()
 {
-  tremolo_req_l_ = 0;
-  stem_p_ = 0;
-  tremolo_p_ = 0;
-  rhythmic_req_l_ =0;
+  tremolo_ev_ = 0;
+  stem_ = 0;
+  tremolo_ = 0;
+  rhythmic_ev_ = 0;
 }
 
-
 void
-Stem_engraver::acknowledge_grob (Grob_info i)
+Stem_engraver::make_stem (Grob_info gi)
 {
-  Grob* h = i.grob_l_;
-  if (Rhythmic_head::has_interface (h))
+  /* Announce the cause of the head as cause of the stem.  The
+     stem needs a rhythmic structure to fit it into a beam.  */
+  stem_ = make_item ("Stem", gi.grob ()->self_scm ());
+
+  if (tremolo_ev_)
     {
-      if (Rhythmic_head::stem_l (h))
-	return;
+      /* Stem tremolo is never applied to a note by default,
+	 is must me requested.  But there is a default for the
+	 tremolo value:
 
-      /*
-	We take the duration-log of the head; this is because
-	auto-tieing does strange things with the rhythmics.
-       */
-      int duration_log  =gh_scm2int (h->get_grob_property ("duration-log"));
-      if (!stem_p_) 
+	 c4:8 c c:
+
+	 the first and last (quarter) note bothe get one tremolo flag.  */
+      int requested_type
+	= scm_to_int (tremolo_ev_->get_property ("tremolo-type"));
+      SCM f = get_property ("tremoloFlags");
+      if (!requested_type)
 	{
-	  stem_p_ = new Item (get_property ("Stem"));
-	  Stem::set_interface (stem_p_);
-	  Staff_symbol_referencer::set_interface (stem_p_);
-	  
-	  stem_p_->set_grob_property ("duration-log", gh_int2scm (duration_log));
-
-	  if (tremolo_req_l_)
-	    {
-	      /*
-		Stem tremolo is never applied to a note by default,
-		is must me requested.  But there is a default for the
-		tremolo value:
-
-		   c4:8 c c:
-
-		the first and last (quarter) note bothe get one tremolo flag.
-	       */
-	      int requested_type = gh_scm2int (tremolo_req_l_->get_mus_property ("tremolo-type"));
-	      
-	      SCM f = get_property ("tremoloFlags");
-	      if (!requested_type && gh_number_p (f))
-		requested_type = gh_scm2int (f);
-	      else
-		daddy_trans_l_->set_property ("tremoloFlags", gh_int2scm (requested_type));
-
-	      if (requested_type)
-		{
-		  tremolo_p_ = new Item (get_property ("StemTremolo"));
-		  Stem_tremolo::set_interface (tremolo_p_);
-
-		  announce_grob (tremolo_p_, tremolo_req_l_);
-		  /*
-		    The number of tremolo flags is the number of flags of
-		    the tremolo-type minus the number of flags of the note
-		    itself.
-		   */
-		  int tremolo_flags = intlog2 (requested_type) - 2
-		    - (duration_log > 2 ? duration_log - 2 : 0);
-		  if (tremolo_flags < 0)
-		    tremolo_flags = 0;
-		  tremolo_p_->set_grob_property ("tremolo-flags",
-						gh_int2scm (tremolo_flags));
-		}
-	    }
-
-	  /*
-	    We announce the cause of the head as cause of the stem.
-	    The stem needs a rhythmic structure to fit it into a beam.  */
-	  announce_grob (stem_p_, i.music_cause ());
+	  if (scm_is_number (f))
+	    requested_type = scm_to_int (f);
+	  else
+	    requested_type = 8;
 	}
+      else
+	context ()->set_property ("tremoloFlags", scm_from_int (requested_type));
+
 
-      if (Stem::flag_i (stem_p_) != duration_log)
+      /*
+	we take the duration log from the Event, since the duration-log
+	for a note head is always <= 2.
+      */
+      Stream_event *ev = gi.event_cause ();
+      Duration *dur = unsmob_duration (ev->get_property ("duration"));
+      
+      int tremolo_flags = intlog2 (requested_type) - 2
+	- (dur->duration_log () > 2 ? dur->duration_log () - 2 : 0);
+      if (tremolo_flags <= 0)
 	{
-	  i.music_cause ()->origin ()->warning (_f ("Adding note head to incompatible stem (type = %d)", 1 <<  Stem::flag_i (stem_p_)));
+	  tremolo_ev_->origin ()->warning (_ ("tremolo duration is too long"));
+	  tremolo_flags = 0;
 	}
 
-      Stem::add_head (stem_p_,h);
+      if (tremolo_flags)
+	{
+	  tremolo_ = make_item ("StemTremolo", tremolo_ev_->self_scm ());
+
+	  /* The number of tremolo flags is the number of flags of the
+	     tremolo-type minus the number of flags of the note itself.  */
+	  tremolo_->set_property ("flag-count", scm_from_int (tremolo_flags));
+	  tremolo_->set_parent (stem_, X_AXIS);
+	  stem_->set_object ("tremolo-flag", tremolo_->self_scm ());
+	  tremolo_->set_object ("stem", stem_->self_scm ());
+	}
     }
 }
 
 void
-Stem_engraver::stop_translation_timestep ()
+Stem_engraver::acknowledge_rhythmic_head (Grob_info gi)
 {
-  if (tremolo_p_)
+  if (Rhythmic_head::get_stem (gi.grob ()))
+    return;
+
+  Stream_event *cause = gi.event_cause ();
+  if (!cause)
+    return;
+  Duration *d = unsmob_duration (cause->get_property ("duration"));
+  if (!d)
+    return;
+
+  if (!stem_)
+    make_stem (gi);
+
+  if (Stem::duration_log (stem_) != d->duration_log ())
     {
-      Stem_tremolo::set_stem (tremolo_p_, stem_p_);
-      typeset_grob (tremolo_p_);
-      tremolo_p_ = 0;
+      // FIXME: 
+      gi.event_cause ()->origin ()->warning (_f ("adding note head to incompatible stem (type = %d)",
+						 1 << Stem::duration_log (stem_)));
+      gi.event_cause ()->origin ()->warning (_ ("maybe input should specify polyphonic voices"));
     }
 
-  if (stem_p_)
+  Stem::add_head (stem_, gi.grob ());
+}
+
+void
+Stem_engraver::stop_translation_timestep ()
+{
+  tremolo_ = 0;
+  if (stem_)
     {
+      /* FIXME: junk these properties.  */
       SCM prop = get_property ("stemLeftBeamCount");
-      if (gh_number_p (prop))
+      if (scm_is_number (prop))
 	{
-	  Stem::set_beaming (stem_p_,gh_scm2int (prop),LEFT);
-	  daddy_trans_l_->set_property ("stemLeftBeamCount", SCM_UNDEFINED);
+	  Stem::set_beaming (stem_, scm_to_int (prop), LEFT);
+	  context ()->unset_property (ly_symbol2scm ("stemLeftBeamCount"));
 	}
       prop = get_property ("stemRightBeamCount");
-      if (gh_number_p (prop))
-	{
-	  Stem::set_beaming (stem_p_,gh_scm2int (prop), RIGHT);
-	  daddy_trans_l_->set_property ("stemRightBeamCount", SCM_UNDEFINED);
-	}
-
-      
-      // UGH. Should mark non-forced instead.
-      /*
-	 aargh: I don't get it.  direction is being set (and then set
-	 to forced), if we have a Chord_tremolo.
-       */
-      SCM dir = stem_p_->get_grob_property ("direction");
-      if (gh_number_p (dir) && to_dir (dir))
+      if (scm_is_number (prop))
 	{
-	  stem_p_->set_grob_property ("dir-forced", SCM_BOOL_T);	  
+	  Stem::set_beaming (stem_, scm_to_int (prop), RIGHT);
+	  context ()->unset_property (ly_symbol2scm ("stemRightBeamCount"));
 	}
-
-      typeset_grob (stem_p_);
-      stem_p_ = 0;
+      stem_ = 0;
     }
-
-
-  tremolo_req_l_ = 0;
+  tremolo_ev_ = 0;
 }
 
-bool
-Stem_engraver::try_music (Music* r)
+IMPLEMENT_TRANSLATOR_LISTENER (Stem_engraver, tremolo);
+void
+Stem_engraver::listen_tremolo (Stream_event *ev)
 {
-  if (Tremolo_req* a = dynamic_cast <Tremolo_req *> (r))
-    {
-      tremolo_req_l_ = a;
-      return true;
-    }
-  return false;
+  ASSIGN_EVENT_ONCE (tremolo_ev_, ev);
 }
 
-ENTER_DESCRIPTION(Stem_engraver,
-/* descr */       "Create stems and single-stem tremolos.  It also works together with
-the beam engraver for overriding beaming.",
-/* creats*/       "Stem StemTremolo",
-/* acks  */       "rhythmic-head-interface",
-/* reads */       "tremoloFlags stemLeftBeamCount stemRightBeamCount",
-/* write */       "");
+ADD_ACKNOWLEDGER (Stem_engraver, rhythmic_head);
+
+ADD_TRANSLATOR (Stem_engraver,
+		/* doc */
+		"Create stems and single-stem tremolos.  It also works"
+		" together with the beam engraver for overriding beaming.",
+
+		/* create */
+		"Stem "
+		"StemTremolo ",
+
+		/* read */
+		"tremoloFlags "
+		"stemLeftBeamCount "
+		"stemRightBeamCount ",
+
+		/* write */
+		""
+		);