2003 -> 2004

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

diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc
index c9d1ab58ec47e7844c8d748229eb053da10a3e7f..f8d19adcbe7a17e00de6223c90dbef15cb94c383 100644 (file)
--- a/lily/stem-engraver.cc
+++ b/lily/stem-engraver.cc
@@ -3,13 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "staff-symbol-referencer.hh"
 #include "rhythmic-head.hh"
 #include "stem.hh"
-#include "request.hh"
+#include "event.hh"
 #include "misc.hh"
 #include "stem-tremolo.hh"
 #include "item.hh"
@@ -32,16 +32,16 @@ protected:
 private:
   Grob  *stem_;
   Grob *tremolo_;
-  Music *rhythmic_req_;
-  Music* tremolo_req_;
+  Music *rhythmic_ev_;
+  Music* tremolo_ev_;
 };
 
 Stem_engraver::Stem_engraver ()
 {
-  tremolo_req_ = 0;
+  tremolo_ev_ = 0;
   stem_ = 0;
   tremolo_ = 0;
-  rhythmic_req_ =0;
+  rhythmic_ev_ =0;
 }
 
 
@@ -64,25 +64,28 @@ Stem_engraver::acknowledge_grob (Grob_info i)
       
       if (!stem_) 
        {
-         stem_ = new Item (get_property ("Stem"));
+         stem_ = make_item ("Stem");
 
          stem_->set_grob_property ("duration-log", gh_int2scm (duration_log));
 
-         if (tremolo_req_)
+         if (tremolo_ev_)
            {
              /*
                Stem tremolo is never applied to a note by default,
-               is must me requested.  But there is a default for the
+               is must me evuested.  But there is a default for the
                tremolo value:
 
                   c4:8 c c:
 
                the first and last (quarter) note bothe get one tremolo flag.
               */
-             int requested_type = gh_scm2int (tremolo_req_->get_mus_property ("tremolo-type"));
+             int requested_type = gh_scm2int (tremolo_ev_->get_mus_property ("tremolo-type"));
              SCM f = get_property ("tremoloFlags");
-             if (!requested_type && gh_number_p (f))
-               requested_type = gh_scm2int (f);
+             if (!requested_type)
+               if (gh_number_p (f))
+                 requested_type = gh_scm2int (f);
+               else
+                 requested_type = 8; 
              else
                daddy_trans_->set_property ("tremoloFlags", gh_int2scm (requested_type));
 
@@ -90,23 +93,24 @@ Stem_engraver::acknowledge_grob (Grob_info i)
                - (duration_log > 2 ? duration_log - 2 : 0);
              if (tremolo_flags <= 0)
                {
-                 tremolo_req_->origin()->warning (_("tremolo duration is too long"));
+                 tremolo_ev_->origin()->warning (_("tremolo duration is too long"));
                  tremolo_flags = 0;
                }
 
              if (tremolo_flags)
                {
-                 tremolo_ = new Item (get_property ("StemTremolo"));
-                 announce_grob(tremolo_, tremolo_req_->self_scm());
+                 tremolo_ = make_item ("StemTremolo");
+                 announce_grob(tremolo_, tremolo_ev_->self_scm());
 
                  /*
                    The number of tremolo flags is the number of flags of
                    the tremolo-type minus the number of flags of the note
                    itself.
                   */
-                         tremolo_->set_grob_property ("flag-count",
-                                               gh_int2scm (tremolo_flags));
+                 tremolo_->set_grob_property ("flag-count",
+                                              gh_int2scm (tremolo_flags));
                  tremolo_->set_parent (stem_, X_AXIS);
+                 stem_->set_grob_property ("tremolo-flag", tremolo_->self_scm ());
                }
            }
 
@@ -118,7 +122,9 @@ Stem_engraver::acknowledge_grob (Grob_info i)
 
       if (Stem::duration_log (stem_) != duration_log)
        {
-         i.music_cause ()->origin ()->warning (_f ("Adding note head to incompatible stem (type = %d)", 1 <<  Stem::duration_log (stem_)));
+         i.music_cause ()->origin ()->warning (_f ("Adding note head to incompatible stem (type = %d)", 1 <<  Stem::duration_log (stem_))
+                                               + _f ("Don't you want polyphonic voices instead?")
+                                               );
        }
 
       Stem::add_head (stem_,h);
@@ -155,7 +161,7 @@ Stem_engraver::stop_translation_timestep ()
     }
 
 
-  tremolo_req_ = 0;
+  tremolo_ev_ = 0;
 }
 
 bool
@@ -163,15 +169,15 @@ Stem_engraver::try_music (Music* r)
 {
   if (r->is_mus_type ("tremolo-event"))
     {
-      tremolo_req_ = r;
+      tremolo_ev_ = r;
       return true;
     }
   return false;
 }
 
 ENTER_DESCRIPTION(Stem_engraver,
-/* descr */       "Create stems and single-stem tremolos.  It also works together with
-the beam engraver for overriding beaming.",
+/* descr */       "Create stems and single-stem tremolos.  It also works together with "
+"the beam engraver for overriding beaming.",
 /* creats*/       "Stem StemTremolo",
 /* accepts */     "tremolo-event",
 /* acks  */      "rhythmic-head-interface",