X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem-engraver.cc;h=fdb61219f6b7f635b78575ebc4f24237a6e22aa2;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=6ca9368d8688def88f123241518690948e3222c5;hpb=68f8545bd6a0221ee1100336e4ad49399a7ffaa4;p=lilypond.git diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc index 6ca9368d86..fdb61219f6 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--2008 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) @@ -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 ()); @@ -172,14 +168,19 @@ Stem_engraver::listen_tremolo (Stream_event *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 */ + "" + );