* lily/include/lily-guile-macros.hh: new file.

[lilypond.git] / lily / stem-engraver.cc

diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc
index bfc7f1fbe64e1a7e5a7d704c5feb500f0a9fd46d..53a12d2fac083aea5e726da516c9721f0d8ebea5 100644 (file)
--- a/lily/stem-engraver.cc
+++ b/lily/stem-engraver.cc
@@ -9,7 +9,6 @@
 #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.
  */
 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;
        }
@@ -135,15 +139,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;
@@ -162,7 +166,7 @@ Stem_engraver::try_music (Music *m)
   return false;
 }
 
-ENTER_DESCRIPTION (Stem_engraver,
+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",