X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem-engraver.cc;h=164bedff3638676fc1a4d0e8eef8c3de1ca2ab7d;hb=1cdc9680f2094525103d335d80bc3950f918ed03;hp=6a69aaa6493c605c2fd6df353742e9c0553c7424;hpb=c4c0ba811cd526f047de3f4d3c77abcc32a3e076;p=lilypond.git diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc index 6a69aaa649..164bedff36 100644 --- 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 + (c) 1997--2007 Han-Wen Nienhuys */ #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) @@ -166,20 +162,23 @@ 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.", + /* create */ "Stem " "StemTremolo ", - /* accept */ "tremolo-event", + /* read */ "tremoloFlags " "stemLeftBeamCount " "stemRightBeamCount ", + /* write */ "");