X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem-engraver.cc;h=fdb61219f6b7f635b78575ebc4f24237a6e22aa2;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=53a12d2fac083aea5e726da516c9721f0d8ebea5;hpb=14d74ac262744d16fc753ee41042d32860d58633;p=lilypond.git diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc index 53a12d2fac..fdb61219f6 100644 --- a/lily/stem-engraver.cc +++ b/lily/stem-engraver.cc @@ -1,14 +1,17 @@ /* - stem-grav.cc -- implement Stem_engraver + stem-engraver.cc -- implement Stem_engraver source file of the GNU LilyPond music typesetter - (c) 1997--2004 Han-Wen Nienhuys + (c) 1997--2008 Han-Wen Nienhuys */ +#include "engraver.hh" + #include "context.hh" #include "directional-element-interface.hh" -#include "engraver.hh" +#include "duration.hh" +#include "international.hh" #include "item.hh" #include "misc.hh" #include "rhythmic-head.hh" @@ -16,25 +19,25 @@ #include "staff-symbol-referencer.hh" #include "stem-tremolo.hh" #include "stem.hh" +#include "stream-event.hh" + +#include "translator.icc" -/** - Make stems upon receiving noteheads. - */ class Stem_engraver : public Engraver { Grob *stem_; Grob *tremolo_; - Music *rhythmic_ev_; - Music *tremolo_ev_; - + Stream_event *rhythmic_ev_; + Stream_event *tremolo_ev_; + TRANSLATOR_DECLARATIONS (Stem_engraver); protected: void make_stem (Grob_info); - - virtual void acknowledge_grob (Grob_info); - virtual void stop_translation_timestep (); - virtual bool try_music (Music *); + + DECLARE_TRANSLATOR_LISTENER (tremolo); + DECLARE_ACKNOWLEDGER (rhythmic_head); + void stop_translation_timestep (); }; Stem_engraver::Stem_engraver () @@ -50,14 +53,7 @@ Stem_engraver::make_stem (Grob_info gi) { /* Announce the cause of the head as cause of the stem. The stem needs a rhythmic structure to fit it into a beam. */ - stem_ = make_item ("Stem", gi.music_cause ()->self_scm ()); - - /* - docme: why do we take duration-log from request, not from note - head? - */ - int duration_log = gi.music_cause ()->duration_log (); - stem_->set_property ("duration-log", scm_int2num (duration_log)); + stem_ = make_item ("Stem", gi.grob ()->self_scm ()); if (tremolo_ev_) { @@ -79,13 +75,21 @@ Stem_engraver::make_stem (Grob_info gi) requested_type = 8; } else - context ()->set_property ("tremoloFlags", scm_int2num (requested_type)); + 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 - - (duration_log > 2 ? duration_log - 2 : 0); + - (dur->duration_log () > 2 ? dur->duration_log () - 2 : 0); if (tremolo_flags <= 0) { - tremolo_ev_->origin ()->warning (_("tremolo duration is too long")); + tremolo_ev_->origin ()->warning (_ ("tremolo duration is too long")); tremolo_flags = 0; } @@ -94,41 +98,40 @@ Stem_engraver::make_stem (Grob_info gi) tremolo_ = make_item ("StemTremolo", 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_property ("flag-count", scm_int2num (tremolo_flags)); + tremolo-type minus the number of flags of the note itself. */ + tremolo_->set_property ("flag-count", scm_from_int (tremolo_flags)); tremolo_->set_parent (stem_, X_AXIS); - stem_->set_property ("tremolo-flag", tremolo_->self_scm ()); - tremolo_->set_property ("stem", stem_->self_scm ()); + stem_->set_object ("tremolo-flag", tremolo_->self_scm ()); + tremolo_->set_object ("stem", stem_->self_scm ()); } } } void -Stem_engraver::acknowledge_grob (Grob_info gi) +Stem_engraver::acknowledge_rhythmic_head (Grob_info gi) { - if (Rhythmic_head::has_interface (gi.grob_)) - { - if (Rhythmic_head::get_stem (gi.grob_)) - return; + if (Rhythmic_head::get_stem (gi.grob ())) + return; - Music * cause = gi.music_cause (); - if (!cause) - return ; - - if (!stem_) - make_stem (gi); - - int duration_log = cause->duration_log (); - if (Stem::duration_log (stem_) != duration_log) - { - // FIXME: - gi.music_cause ()->origin ()->warning (_f ("Adding note head to incompatible stem (type = %d)", 1 << Stem::duration_log (stem_))); - - gi.music_cause ()->origin ()->warning (_f ("Don't you want polyphonic voices instead?")); - } + Stream_event *cause = gi.event_cause (); + if (!cause) + return; + Duration *d = unsmob_duration (cause->get_property ("duration")); + if (!d) + return; - Stem::add_head (stem_, gi.grob_); + if (!stem_) + make_stem (gi); + + if (Stem::duration_log (stem_) != d->duration_log ()) + { + // 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 (_ ("maybe input should specify polyphonic voices")); } + + Stem::add_head (stem_, gi.grob ()); } void @@ -141,13 +144,13 @@ Stem_engraver::stop_translation_timestep () SCM prop = get_property ("stemLeftBeamCount"); if (scm_is_number (prop)) { - Stem::set_beaming (stem_,scm_to_int (prop),LEFT); + Stem::set_beaming (stem_, scm_to_int (prop), LEFT); context ()->unset_property (ly_symbol2scm ("stemLeftBeamCount")); } prop = get_property ("stemRightBeamCount"); if (scm_is_number (prop)) { - Stem::set_beaming (stem_,scm_to_int (prop), RIGHT); + Stem::set_beaming (stem_, scm_to_int (prop), RIGHT); context ()->unset_property (ly_symbol2scm ("stemRightBeamCount")); } stem_ = 0; @@ -155,22 +158,29 @@ Stem_engraver::stop_translation_timestep () tremolo_ev_ = 0; } -bool -Stem_engraver::try_music (Music *m) +IMPLEMENT_TRANSLATOR_LISTENER (Stem_engraver, tremolo); +void +Stem_engraver::listen_tremolo (Stream_event *ev) { - if (m->is_mus_type ("tremolo-event")) - { - tremolo_ev_ = m; - return true; - } - return false; + ASSIGN_EVENT_ONCE (tremolo_ev_, ev); } +ADD_ACKNOWLEDGER (Stem_engraver, rhythmic_head); + ADD_TRANSLATOR (Stem_engraver, -/* 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", -/* reads */ "tremoloFlags stemLeftBeamCount stemRightBeamCount", -/* write */ ""); + /* doc */ + "Create stems and single-stem tremolos. It also works" + " together with the beam engraver for overriding beaming.", + + /* create */ + "Stem " + "StemTremolo ", + + /* read */ + "tremoloFlags " + "stemLeftBeamCount " + "stemRightBeamCount ", + + /* write */ + "" + );