update for the lily-wins.py script.

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

diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc
index e5d49a40543671d7aa17d50e58ad9ac6364a4655..be02b754649dcf6a1fe67f8040baa3106f450921 100644 (file)
--- a/lily/stem-engraver.cc
+++ b/lily/stem-engraver.cc
@@ -65,7 +65,10 @@ Stem_engraver::acknowledge_grob (Grob_info i)
       
       if (!stem_) 
        {
-         stem_ = make_item ("Stem");
+         /*
+           We 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",i.music_cause ()->self_scm ());
 
          stem_->set_property ("duration-log", scm_int2num (duration_log));
 
@@ -83,12 +86,12 @@ Stem_engraver::acknowledge_grob (Grob_info i)
              int requested_type = ly_scm2int (tremolo_ev_->get_property ("tremolo-type"));
              SCM f = get_property ("tremoloFlags");
              if (!requested_type)
-               if (is_number (f))
+               if (ly_c_number_p (f))
                  requested_type = ly_scm2int (f);
                else
                  requested_type = 8; 
              else
-               daddy_context_->set_property ("tremoloFlags", scm_int2num (requested_type));
+               context ()->set_property ("tremoloFlags", scm_int2num (requested_type));
 
              int tremolo_flags = intlog2 (requested_type) - 2
                - (duration_log > 2 ? duration_log - 2 : 0);
@@ -100,8 +103,7 @@ Stem_engraver::acknowledge_grob (Grob_info i)
 
              if (tremolo_flags)
                {
-                 tremolo_ = make_item ("StemTremolo");
-                 announce_grob (tremolo_, tremolo_ev_->self_scm ());
+                 tremolo_ = make_item ("StemTremolo", tremolo_ev_->self_scm ());
 
                  /*
                    The number of tremolo flags is the number of flags of
@@ -117,10 +119,6 @@ Stem_engraver::acknowledge_grob (Grob_info i)
                }
            }
 
-         /*
-           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_, i.music_cause ()->self_scm ());
        }
 
       if (Stem::duration_log (stem_) != duration_log)
@@ -149,16 +147,16 @@ Stem_engraver::stop_translation_timestep ()
        toDO: junk these properties.
        */
       SCM prop = get_property ("stemLeftBeamCount");
-      if (is_number (prop))
+      if (ly_c_number_p (prop))
        {
          Stem::set_beaming (stem_,ly_scm2int (prop),LEFT);
-         daddy_context_->unset_property (ly_symbol2scm ("stemLeftBeamCount"));
+         context ()->unset_property (ly_symbol2scm ("stemLeftBeamCount"));
        }
       prop = get_property ("stemRightBeamCount");
-      if (is_number (prop))
+      if (ly_c_number_p (prop))
        {
          Stem::set_beaming (stem_,ly_scm2int (prop), RIGHT);
-         daddy_context_->unset_property (ly_symbol2scm ("stemRightBeamCount"));
+         context ()->unset_property (ly_symbol2scm ("stemRightBeamCount"));
        }
 
       typeset_grob (stem_);