* lily/lookup.cc (slur): Invoke bezier-bow.

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

diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc
index 083a25a483066f75324f3a8a60fe0e8dfc0d68d7..f58edbfaaa236a5ae3002d1163fa78ed33af3a5a 100644 (file)
--- a/lily/stem-engraver.cc
+++ b/lily/stem-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "staff-symbol-referencer.hh"
@@ -54,17 +54,17 @@ Stem_engraver::acknowledge_grob (Grob_info i)
       if (Rhythmic_head::stem_l (h))
        return;
 
-      /*
-       We take the duration-log of the head; this is because
-       auto-tieing does strange things with the rhythmics.
-       */
-      int duration_log  =gh_scm2int (h->get_grob_property ("duration-log"));
+      /* Reverted to the old method so chord tremolos work again. /MB 
+      */
+      int duration_log = 0;
+      Rhythmic_req *rhythmic_req = dynamic_cast <Rhythmic_req *> (i.music_cause ()); 
+      if (rhythmic_req)
+       duration_log = unsmob_duration (rhythmic_req->get_mus_property ("duration"))-> duration_log (); 
+      
       if (!stem_p_) 
        {
          stem_p_ = new Item (get_property ("Stem"));
-         Stem::set_interface (stem_p_);
-         Staff_symbol_referencer::set_interface (stem_p_);
-         
+
          stem_p_->set_grob_property ("duration-log", gh_int2scm (duration_log));
 
          if (tremolo_req_l_)
@@ -89,9 +89,8 @@ Stem_engraver::acknowledge_grob (Grob_info i)
              if (requested_type)
                {
                  tremolo_p_ = new Item (get_property ("StemTremolo"));
-                 Stem_tremolo::set_interface (tremolo_p_);
+                 announce_grob(tremolo_p_, tremolo_req_l_->self_scm());
 
-                 announce_grob (tremolo_p_, tremolo_req_l_);
                  /*
                    The number of tremolo flags is the number of flags of
                    the tremolo-type minus the number of flags of the note
@@ -101,16 +100,21 @@ Stem_engraver::acknowledge_grob (Grob_info i)
                    - (duration_log > 2 ? duration_log - 2 : 0);
                  if (tremolo_flags < 0)
                    tremolo_flags = 0;
-                 tremolo_p_->set_grob_property ("tremolo-flags",
+                 tremolo_p_->set_grob_property ("flag-count",
                                                gh_int2scm (tremolo_flags));
+                 tremolo_p_->set_parent (stem_p_, X_AXIS);
                }
            }
-         announce_grob (stem_p_, i.req_l_);
+
+         /*
+           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_p_, i.music_cause ()->self_scm());
        }
 
-      if (Stem::flag_i (stem_p_) != duration_log)
+      if (Stem::duration_log (stem_p_) != duration_log)
        {
-         i.req_l_->origin ()->warning (_f ("Adding note head to incompatible stem (type = %d)", 1 <<  Stem::flag_i (stem_p_)));
+         i.music_cause ()->origin ()->warning (_f ("Adding note head to incompatible stem (type = %d)", 1 <<  Stem::duration_log (stem_p_)));
        }
 
       Stem::add_head (stem_p_,h);
@@ -133,13 +137,13 @@ Stem_engraver::stop_translation_timestep ()
       if (gh_number_p (prop))
        {
          Stem::set_beaming (stem_p_,gh_scm2int (prop),LEFT);
-         daddy_trans_l_->set_property ("stemLeftBeamCount", SCM_UNDEFINED);
+         daddy_trans_l_->unset_property (ly_symbol2scm ("stemLeftBeamCount"));
        }
       prop = get_property ("stemRightBeamCount");
       if (gh_number_p (prop))
        {
          Stem::set_beaming (stem_p_,gh_scm2int (prop), RIGHT);
-         daddy_trans_l_->set_property ("stemRightBeamCount", SCM_UNDEFINED);
+         daddy_trans_l_->unset_property (ly_symbol2scm ("stemRightBeamCount"));
        }
 
       
@@ -148,6 +152,12 @@ Stem_engraver::stop_translation_timestep ()
         aargh: I don't get it.  direction is being set (and then set
         to forced), if we have a Chord_tremolo.
        */
+
+      /*
+       Why the separate check for forced directions? --hwn.
+
+       (docme)
+       */
       SCM dir = stem_p_->get_grob_property ("direction");
       if (gh_number_p (dir) && to_dir (dir))
        {