X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem-engraver.cc;h=a8a7f6681589a55ad6301e1bef439c1c4bc6f9b0;hb=1e63e1c8345be830cf76cda3d0c0d91b65a1f3c6;hp=3483bab450b3bacfbeb3c6e02f6e313b0149c4f3;hpb=b8a07e5e54ebac3f08cee75683ed2cc6d1db3d64;p=lilypond.git

diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc
index 3483bab450..a8a7f66815 100644
--- a/lily/stem-engraver.cc
+++ b/lily/stem-engraver.cc
@@ -1,15 +1,14 @@
 /*
-  stem-grav.cc -- implement Stem_engraver
+  stem-engraver.cc -- implement Stem_engraver
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "context.hh"
 #include "directional-element-interface.hh"
 #include "engraver.hh"
-#include "event.hh"
 #include "item.hh"
 #include "misc.hh"
 #include "rhythmic-head.hh"
@@ -18,20 +17,21 @@
 #include "stem-tremolo.hh"
 #include "stem.hh"
 
-
 /**
-  Make stems upon receiving noteheads.
- */
+   Make stems upon receiving noteheads.
+*/
 class Stem_engraver : public Engraver
 {
-  Grob  *stem_;
+  Grob *stem_;
   Grob *tremolo_;
   Music *rhythmic_ev_;
-  Music* tremolo_ev_;
+  Music *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 *);
@@ -42,7 +42,7 @@ Stem_engraver::Stem_engraver ()
   tremolo_ev_ = 0;
   stem_ = 0;
   tremolo_ = 0;
-  rhythmic_ev_ =0;
+  rhythmic_ev_ = 0;
 }
 
 void
@@ -52,6 +52,10 @@ Stem_engraver::make_stem (Grob_info gi)
      stem needs a rhythmic structure to fit it into a beam.  */
   stem_ = make_item ("Stem", gi.music_cause ()->self_scm ());
 
+  /*
+    docme: why do we take duration-log from request, not from note
+    head?
+  */
   int duration_log = gi.music_cause ()->duration_log ();
   stem_->set_property ("duration-log", scm_int2num (duration_log));
 
@@ -65,12 +69,12 @@ Stem_engraver::make_stem (Grob_info gi)
 
 	 the first and last (quarter) note bothe get one tremolo flag.  */
       int requested_type
-	= ly_scm2int (tremolo_ev_->get_property ("tremolo-type"));
+	= scm_to_int (tremolo_ev_->get_property ("tremolo-type"));
       SCM f = get_property ("tremoloFlags");
       if (!requested_type)
 	{
-	  if (ly_c_number_p (f))
-	    requested_type = ly_scm2int (f);
+	  if (scm_is_number (f))
+	    requested_type = scm_to_int (f);
 	  else
 	    requested_type = 8;
 	}
@@ -81,7 +85,7 @@ Stem_engraver::make_stem (Grob_info gi)
 	- (duration_log > 2 ? duration_log - 2 : 0);
       if (tremolo_flags <= 0)
 	{
-	  tremolo_ev_->origin ()->warning (_("tremolo duration is too long"));
+	  tremolo_ev_->origin ()->warning (_ ("tremolo duration is too long"));
 	  tremolo_flags = 0;
 	}
 
@@ -90,7 +94,7 @@ Stem_engraver::make_stem (Grob_info gi)
 	  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-type minus the number of flags of the note itself.  */
 	  tremolo_->set_property ("flag-count", scm_int2num (tremolo_flags));
 	  tremolo_->set_parent (stem_, X_AXIS);
 	  stem_->set_property ("tremolo-flag", tremolo_->self_scm ());
@@ -102,24 +106,27 @@ Stem_engraver::make_stem (Grob_info gi)
 void
 Stem_engraver::acknowledge_grob (Grob_info gi)
 {
-  if (Rhythmic_head::has_interface (gi.grob_))
+  if (Rhythmic_head::has_interface (gi.grob ()))
     {
-      if (Rhythmic_head::get_stem (gi.grob_))
+      if (Rhythmic_head::get_stem (gi.grob ()))
 	return;
-      
+
+      Music *cause = gi.music_cause ();
+      if (!cause)
+	return;
+
       if (!stem_)
 	make_stem (gi);
-      
-      int duration_log = gi.music_cause ()->duration_log ();
+
+      int duration_log = cause->duration_log ();
       if (Stem::duration_log (stem_) != 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 ("Don't you want polyphonic voices instead?"));
+	  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"));
 	}
 
-      Stem::add_head (stem_, gi.grob_);
+      Stem::add_head (stem_, gi.grob ());
     }
 }
 
@@ -131,15 +138,15 @@ Stem_engraver::stop_translation_timestep ()
     {
       /* FIXME: junk these properties.  */
       SCM prop = get_property ("stemLeftBeamCount");
-      if (ly_c_number_p (prop))
+      if (scm_is_number (prop))
 	{
-	  Stem::set_beaming (stem_,ly_scm2int (prop),LEFT);
+	  Stem::set_beaming (stem_, scm_to_int (prop), LEFT);
 	  context ()->unset_property (ly_symbol2scm ("stemLeftBeamCount"));
 	}
       prop = get_property ("stemRightBeamCount");
-      if (ly_c_number_p (prop))
+      if (scm_is_number (prop))
 	{
-	  Stem::set_beaming (stem_,ly_scm2int (prop), RIGHT);
+	  Stem::set_beaming (stem_, scm_to_int (prop), RIGHT);
 	  context ()->unset_property (ly_symbol2scm ("stemRightBeamCount"));
 	}
       stem_ = 0;
@@ -158,11 +165,11 @@ Stem_engraver::try_music (Music *m)
   return false;
 }
 
-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",
-/* accepts */     "tremolo-event",
-/* acks  */      "rhythmic-head-interface",
-/* reads */       "tremoloFlags stemLeftBeamCount stemRightBeamCount",
-/* write */       "");
+ADD_TRANSLATOR (Stem_engraver,
+		/* descr */ "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",
+		/* write */ "");