* lily/include/lily-guile.hh: is_x -> ly_c_X_p naming.

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

diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc
index 8f122d473b0e6e6eea9e5c1b66487e4cf0df5577..14de1ade5c36272a0a76184ce046e6a7de11baa6 100644 (file)
--- a/lily/stem-engraver.cc
+++ b/lily/stem-engraver.cc
@@ -24,7 +24,7 @@
  */
 class Stem_engraver : public Engraver
 {
-  TRANSLATOR_DECLARATIONS(Stem_engraver);
+  TRANSLATOR_DECLARATIONS (Stem_engraver);
 protected:
   virtual void acknowledge_grob (Grob_info);
   virtual void stop_translation_timestep ();
@@ -67,7 +67,7 @@ Stem_engraver::acknowledge_grob (Grob_info i)
        {
          stem_ = make_item ("Stem");
 
-         stem_->set_property ("duration-log", gh_int2scm (duration_log));
+         stem_->set_property ("duration-log", scm_int2num (duration_log));
 
          if (tremolo_ev_)
            {
@@ -80,28 +80,28 @@ 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));
+               get_parent_context ()->set_property ("tremoloFlags", scm_int2num (requested_type));
 
              int tremolo_flags = intlog2 (requested_type) - 2
                - (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;
                }
 
              if (tremolo_flags)
                {
                  tremolo_ = make_item ("StemTremolo");
-                 announce_grob(tremolo_, tremolo_ev_->self_scm());
+                 announce_grob (tremolo_, tremolo_ev_->self_scm ());
 
                  /*
                    The number of tremolo flags is the number of flags of
@@ -109,16 +109,18 @@ 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());
+         announce_grob (stem_, i.music_cause ()->self_scm ());
        }
 
       if (Stem::duration_log (stem_) != duration_log)
@@ -137,24 +139,26 @@ Stem_engraver::stop_translation_timestep ()
 {
   if (tremolo_)
     {
-      Stem_tremolo::set_stem (tremolo_, stem_);
       typeset_grob (tremolo_);
       tremolo_ = 0;
     }
 
   if (stem_)
     {
+      /*
+       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);
+         get_parent_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);
+         get_parent_context ()->unset_property (ly_symbol2scm ("stemRightBeamCount"));
        }
 
       typeset_grob (stem_);
@@ -176,7 +180,7 @@ Stem_engraver::try_music (Music* r)
   return false;
 }
 
-ENTER_DESCRIPTION(Stem_engraver,
+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",