X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem-engraver.cc;h=93f2a67aed2bff2b8322f1b657afe118357e2935;hb=eb81aa0cf80559fea62e433d298e5a0d669f27e9;hp=71ef4b46f8ebebebcb334d85d22e6a851eccbd15;hpb=0563cb618fb3c564f27ce0edffe3359fc6102da6;p=lilypond.git

diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc
index 71ef4b46f8..93f2a67aed 100644
--- a/lily/stem-engraver.cc
+++ b/lily/stem-engraver.cc
@@ -3,12 +3,15 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
+#include "engraver.hh"
+
 #include "context.hh"
 #include "directional-element-interface.hh"
-#include "engraver.hh"
+#include "duration.hh"
+#include "international.hh"
 #include "item.hh"
 #include "misc.hh"
 #include "rhythmic-head.hh"
@@ -16,6 +19,9 @@
 #include "staff-symbol-referencer.hh"
 #include "stem-tremolo.hh"
 #include "stem.hh"
+#include "stream-event.hh"
+
+#include "translator.icc"
 
 /**
    Make stems upon receiving noteheads.
@@ -24,17 +30,17 @@ class Stem_engraver : public Engraver
 {
   Grob *stem_;
   Grob *tremolo_;
-  Music *rhythmic_ev_;
-  Music *tremolo_ev_;
+  Stream_event *rhythmic_ev_;
+  Stream_event *tremolo_ev_;
 
   TRANSLATOR_DECLARATIONS (Stem_engraver);
 
 protected:
   void make_stem (Grob_info);
 
-  virtual void acknowledge_grob (Grob_info);
-  virtual void stop_translation_timestep ();
-  virtual bool try_music (Music *);
+  DECLARE_TRANSLATOR_LISTENER (tremolo);
+  DECLARE_ACKNOWLEDGER (rhythmic_head);
+  void stop_translation_timestep ();
 };
 
 Stem_engraver::Stem_engraver ()
@@ -50,16 +56,7 @@ Stem_engraver::make_stem (Grob_info gi)
 {
   /* 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.music_cause ()->self_scm ());
-
-  /*
-    we take the duration log from the Event, since the duration-log
-    for a note head is always <= 2.
-  */
-  Music *music = gi.music_cause ();
-  Duration *dur = unsmob_duration (music->get_property ("duration"));
-  
-  stem_->set_property ("duration-log", dur ? scm_int2num (dur->duration_log ()) : 0);
+  stem_ = make_item ("Stem", gi.grob ()->self_scm ());
 
   if (tremolo_ev_)
     {
@@ -81,8 +78,16 @@ Stem_engraver::make_stem (Grob_info gi)
 	    requested_type = 8;
 	}
       else
-	context ()->set_property ("tremoloFlags", scm_int2num (requested_type));
+	context ()->set_property ("tremoloFlags", scm_from_int (requested_type));
+
 
+      /*
+	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)
@@ -97,42 +102,39 @@ Stem_engraver::make_stem (Grob_info gi)
 
 	  /* 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_int2num (tremolo_flags));
+	  tremolo_->set_property ("flag-count", scm_from_int (tremolo_flags));
 	  tremolo_->set_parent (stem_, X_AXIS);
-	  stem_->set_property ("tremolo-flag", tremolo_->self_scm ());
-	  tremolo_->set_property ("stem", stem_->self_scm ());
+	  stem_->set_object ("tremolo-flag", tremolo_->self_scm ());
+	  tremolo_->set_object ("stem", stem_->self_scm ());
 	}
     }
 }
 
 void
-Stem_engraver::acknowledge_grob (Grob_info gi)
+Stem_engraver::acknowledge_rhythmic_head (Grob_info gi)
 {
-  if (Rhythmic_head::has_interface (gi.grob ()))
-    {
-      if (Rhythmic_head::get_stem (gi.grob ()))
-	return;
-
-      Music *cause = gi.music_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 ())
-	{
-	  // FIXME: 
-	  gi.music_cause ()->origin ()->warning (_f ("adding note head to incompatible stem (type = %d)",
-						     1 << Stem::duration_log (stem_)));
-	  gi.music_cause ()->origin ()->warning (_f ("maybe input should specify polyphonic voices"));
-	}
+  if (Rhythmic_head::get_stem (gi.grob ()))
+    return;
 
-      Stem::add_head (stem_, gi.grob ());
+  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 ())
+    {
+      // 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 (_f ("maybe input should specify polyphonic voices"));
     }
+
+  Stem::add_head (stem_, gi.grob ());
 }
 
 void
@@ -159,22 +161,27 @@ Stem_engraver::stop_translation_timestep ()
   tremolo_ev_ = 0;
 }
 
-bool
-Stem_engraver::try_music (Music *m)
+IMPLEMENT_TRANSLATOR_LISTENER (Stem_engraver, tremolo);
+void
+Stem_engraver::listen_tremolo (Stream_event *ev)
 {
-  if (m->is_mus_type ("tremolo-event"))
-    {
-      tremolo_ev_ = m;
-      return true;
-    }
-  return false;
+  ASSIGN_EVENT_ONCE (tremolo_ev_, ev);
 }
 
+ADD_ACKNOWLEDGER (Stem_engraver, rhythmic_head);
+
 ADD_TRANSLATOR (Stem_engraver,
-		/* descr */ "Create stems and single-stem tremolos.  It also works together with "
+
+		/* doc */ "Create stems and single-stem tremolos.  It also works together with "
 		"the beam engraver for overriding beaming.",
-		/* creats*/ "Stem StemTremolo",
-		/* accepts */ "tremolo-event",
-		/* acks  */ "rhythmic-head-interface",
-		/* reads */ "tremoloFlags stemLeftBeamCount stemRightBeamCount",
+
+		/* create */
+		"Stem "
+		"StemTremolo ",
+
+		/* read */
+		"tremoloFlags "
+		"stemLeftBeamCount "
+		"stemRightBeamCount ",
+
 		/* write */ "");