Configure only pristine build tree or on user

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

diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc
index 69d47c70acb659f4ae58a05369334f9df50a8783..15bba47969191e7de7e48afdfad4c0d2a22295c9 100644 (file)
--- a/lily/stem-engraver.cc
+++ b/lily/stem-engraver.cc
@@ -65,9 +65,12 @@ 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", gh_int2scm (duration_log));
+         stem_->set_property ("duration-log", scm_int2num (duration_log));
 
          if (tremolo_ev_)
            {
@@ -80,15 +83,15 @@ Stem_engraver::acknowledge_grob (Grob_info i)
 
                the first and last (quarter) note bothe get one tremolo flag.
               */
-             int requested_type = gh_scm2int (tremolo_ev_->get_property ("tremolo-type"));
+             int requested_type = ly_scm2int (tremolo_ev_->get_property ("tremolo-type"));
              SCM f = get_property ("tremoloFlags");
              if (!requested_type)
-               if (gh_number_p (f))
-                 requested_type = gh_scm2int (f);
+               if (ly_c_number_p (f))
+                 requested_type = ly_scm2int (f);
                else
                  requested_type = 8; 
              else
-               daddy_context_->set_property ("tremoloFlags", gh_int2scm (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
@@ -109,16 +111,14 @@ Stem_engraver::acknowledge_grob (Grob_info i)
                    itself.
                   */
                  tremolo_->set_property ("flag-count",
-                                              gh_int2scm (tremolo_flags));
+                                              scm_int2num (tremolo_flags));
                  tremolo_->set_parent (stem_, X_AXIS);
                  stem_->set_property ("tremolo-flag", tremolo_->self_scm ());
+                 tremolo_->set_property ("stem",
+                                         stem_->self_scm ());
                }
            }
 
-         /*
-           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)
@@ -135,12 +135,7 @@ Stem_engraver::acknowledge_grob (Grob_info i)
 void
 Stem_engraver::stop_translation_timestep ()
 {
-  if (tremolo_)
-    {
-      Stem_tremolo::set_stem (tremolo_, stem_);
-      typeset_grob (tremolo_);
-      tremolo_ = 0;
-    }
+  tremolo_ = 0;
 
   if (stem_)
     {
@@ -148,19 +143,19 @@ Stem_engraver::stop_translation_timestep ()
        toDO: junk these properties.
        */
       SCM prop = get_property ("stemLeftBeamCount");
-      if (gh_number_p (prop))
+      if (ly_c_number_p (prop))
        {
-         Stem::set_beaming (stem_,gh_scm2int (prop),LEFT);
-         daddy_context_->unset_property (ly_symbol2scm ("stemLeftBeamCount"));
+         Stem::set_beaming (stem_,ly_scm2int (prop),LEFT);
+         context ()->unset_property (ly_symbol2scm ("stemLeftBeamCount"));
        }
       prop = get_property ("stemRightBeamCount");
-      if (gh_number_p (prop))
+      if (ly_c_number_p (prop))
        {
-         Stem::set_beaming (stem_,gh_scm2int (prop), RIGHT);
-         daddy_context_->unset_property (ly_symbol2scm ("stemRightBeamCount"));
+         Stem::set_beaming (stem_,ly_scm2int (prop), RIGHT);
+         context ()->unset_property (ly_symbol2scm ("stemRightBeamCount"));
        }
 
-      typeset_grob (stem_);
+      
       stem_ = 0;
     }