Run `make grand-replace'.

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

diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc
index 6a69aaa6493c605c2fd6df353742e9c0553c7424..fdb61219f6b7f635b78575ebc4f24237a6e22aa2 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--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
@@ -23,9 +23,6 @@
 
 #include "translator.icc"
 
-/**
-   Make stems upon receiving noteheads.
-*/
 class Stem_engraver : public Engraver
 {
   Grob *stem_;
@@ -58,15 +55,6 @@ Stem_engraver::make_stem (Grob_info gi)
      stem needs a rhythmic structure to fit it into a beam.  */
   stem_ = make_item ("Stem", gi.grob ()->self_scm ());
 
-  /*
-    we take the duration log from the Event, since the duration-log
-    for a note head is always <= 2.
-  */
-  Stream_event *ev = gi.event_cause ();
-  Duration *dur = unsmob_duration (ev->get_property ("duration"));
-
-  stem_->set_property ("duration-log", dur ? scm_from_int (dur->duration_log ()) : 0);
-
   if (tremolo_ev_)
     {
       /* Stem tremolo is never applied to a note by default,
@@ -89,6 +77,14 @@ Stem_engraver::make_stem (Grob_info gi)
       else
        context ()->set_property ("tremoloFlags", scm_from_int (requested_type));
 
+
+      /*
+       we take the duration log from the Event, since the duration-log
+       for a note head is always <= 2.
+      */
+      Stream_event *ev = gi.event_cause ();
+      Duration *dur = unsmob_duration (ev->get_property ("duration"));
+      
       int tremolo_flags = intlog2 (requested_type) - 2
        - (dur->duration_log () > 2 ? dur->duration_log () - 2 : 0);
       if (tremolo_flags <= 0)
@@ -132,7 +128,7 @@ Stem_engraver::acknowledge_rhythmic_head (Grob_info gi)
       // FIXME: 
       gi.event_cause ()->origin ()->warning (_f ("adding note head to incompatible stem (type = %d)",
                                                 1 << Stem::duration_log (stem_)));
-      gi.event_cause ()->origin ()->warning (_f ("maybe input should specify polyphonic voices"));
+      gi.event_cause ()->origin ()->warning (_ ("maybe input should specify polyphonic voices"));
     }
 
   Stem::add_head (stem_, gi.grob ());
@@ -166,20 +162,25 @@ IMPLEMENT_TRANSLATOR_LISTENER (Stem_engraver, tremolo);
 void
 Stem_engraver::listen_tremolo (Stream_event *ev)
 {
-  tremolo_ev_ = ev;
+  ASSIGN_EVENT_ONCE (tremolo_ev_, ev);
 }
 
 ADD_ACKNOWLEDGER (Stem_engraver, rhythmic_head);
 
 ADD_TRANSLATOR (Stem_engraver,
-               /* doc */ "Create stems and single-stem tremolos.  It also works together with "
-               "the beam engraver for overriding beaming.",
+               /* doc */
+               "Create stems and single-stem tremolos.  It also works"
+               " together with the beam engraver for overriding beaming.",
+
                /* create */
                "Stem "
                "StemTremolo ",
-               /* accept */ "tremolo-event",
+
                /* read */
                "tremoloFlags "
                "stemLeftBeamCount "
                "stemRightBeamCount ",
-               /* write */ "");
+
+               /* write */
+               ""
+               );