X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem-engraver.cc;h=71ef4b46f8ebebebcb334d85d22e6a851eccbd15;hb=0563cb618fb3c564f27ce0edffe3359fc6102da6;hp=ddd5c55154cda616d6039fe4f5ad87531ea2d222;hpb=e37010af17faa8b185de836664b6544bd29dc1d0;p=lilypond.git diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc index ddd5c55154..71ef4b46f8 100644 --- a/lily/stem-engraver.cc +++ b/lily/stem-engraver.cc @@ -1,40 +1,40 @@ /* - 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--2005 Han-Wen Nienhuys */ -#include "staff-symbol-referencer.hh" -#include "rhythmic-head.hh" -#include "stem.hh" -#include "event.hh" -#include "misc.hh" -#include "stem-tremolo.hh" -#include "item.hh" #include "context.hh" - +#include "directional-element-interface.hh" #include "engraver.hh" - - +#include "item.hh" +#include "misc.hh" +#include "rhythmic-head.hh" +#include "script-interface.hh" +#include "staff-symbol-referencer.hh" +#include "stem-tremolo.hh" +#include "stem.hh" /** - Make stems upon receiving noteheads. - */ + Make stems upon receiving noteheads. +*/ class Stem_engraver : public Engraver { - TRANSLATOR_DECLARATIONS(Stem_engraver); + Grob *stem_; + Grob *tremolo_; + Music *rhythmic_ev_; + Music *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*); - -private: - Grob *stem_; - Grob *tremolo_; - Music *rhythmic_ev_; - Music* tremolo_ev_; + virtual bool try_music (Music *); }; Stem_engraver::Stem_engraver () @@ -42,145 +42,139 @@ Stem_engraver::Stem_engraver () tremolo_ev_ = 0; stem_ = 0; tremolo_ = 0; - rhythmic_ev_ =0; + rhythmic_ev_ = 0; } - void -Stem_engraver::acknowledge_grob (Grob_info i) +Stem_engraver::make_stem (Grob_info gi) { - Grob* h = i.grob_; - if (Rhythmic_head::has_interface (h)) + /* 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 ()); + + /* + we take the duration log from the Event, since the duration-log + for a note head is always <= 2. + */ + Music *music = gi.music_cause (); + Duration *dur = unsmob_duration (music->get_property ("duration")); + + stem_->set_property ("duration-log", dur ? scm_int2num (dur->duration_log ()) : 0); + + if (tremolo_ev_) { - if (Rhythmic_head::get_stem (h)) - return; + /* Stem tremolo is never applied to a note by default, + is must me requested. But there is a default for the + tremolo value: - /* Reverted to the old method so chord tremolos work again. /MB - */ - int duration_log = 0; + c4:8 c c: - Music * m = i.music_cause (); - if (m->is_mus_type ("rhythmic-event")) - duration_log = unsmob_duration (m->get_mus_property ("duration"))-> duration_log (); - - if (!stem_) + the first and last (quarter) note bothe get one tremolo flag. */ + int requested_type + = scm_to_int (tremolo_ev_->get_property ("tremolo-type")); + SCM f = get_property ("tremoloFlags"); + if (!requested_type) { - stem_ = make_item ("Stem"); - - stem_->set_grob_property ("duration-log", gh_int2scm (duration_log)); - - if (tremolo_ev_) - { - /* - Stem tremolo is never applied to a note by default, - 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_ev_->get_mus_property ("tremolo-type")); - SCM f = get_property ("tremoloFlags"); - if (!requested_type) - if (gh_number_p (f)) - requested_type = gh_scm2int (f); - else - requested_type = 8; - else - daddy_context_->set_property ("tremoloFlags", gh_int2scm (requested_type)); - - int tremolo_flags = intlog2 (requested_type) - 2 - - (duration_log > 2 ? duration_log - 2 : 0); - if (tremolo_flags <= 0) - { - tremolo_ev_->origin()->warning (_("tremolo duration is too long")); - tremolo_flags = 0; - } - - if (tremolo_flags) - { - 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_parent (stem_, X_AXIS); - stem_->set_grob_property ("tremolo-flag", tremolo_->self_scm ()); - } - } - - /* - We announce the cause of the head as cause of the stem. - The stem needs a rhythmic structure to fit it into a beam. */ - announce_grob(stem_, i.music_cause ()->self_scm()); + if (scm_is_number (f)) + requested_type = scm_to_int (f); + else + requested_type = 8; } + else + context ()->set_property ("tremoloFlags", scm_int2num (requested_type)); - if (Stem::duration_log (stem_) != duration_log) + int tremolo_flags = intlog2 (requested_type) - 2 + - (dur->duration_log () > 2 ? dur->duration_log () - 2 : 0); + if (tremolo_flags <= 0) { - 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?") - ); + tremolo_ev_->origin ()->warning (_ ("tremolo duration is too long")); + tremolo_flags = 0; } - Stem::add_head (stem_,h); + if (tremolo_flags) + { + 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_->set_parent (stem_, X_AXIS); + stem_->set_property ("tremolo-flag", tremolo_->self_scm ()); + tremolo_->set_property ("stem", stem_->self_scm ()); + } } } void -Stem_engraver::stop_translation_timestep () +Stem_engraver::acknowledge_grob (Grob_info gi) { - if (tremolo_) + if (Rhythmic_head::has_interface (gi.grob ())) { - Stem_tremolo::set_stem (tremolo_, stem_); - typeset_grob (tremolo_); - tremolo_ = 0; + if (Rhythmic_head::get_stem (gi.grob ())) + return; + + Music *cause = gi.music_cause (); + if (!cause) + return; + Duration *d = unsmob_duration (cause->get_property ("duration")); + if (!d) + return ; + + if (!stem_) + make_stem (gi); + + if (Stem::duration_log (stem_) != d->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 ("maybe input should specify polyphonic voices")); + } + + Stem::add_head (stem_, gi.grob ()); } +} +void +Stem_engraver::stop_translation_timestep () +{ + tremolo_ = 0; if (stem_) { + /* FIXME: junk these properties. */ SCM prop = get_property ("stemLeftBeamCount"); - if (gh_number_p (prop)) + if (scm_is_number (prop)) { - Stem::set_beaming (stem_,gh_scm2int (prop),LEFT); - daddy_context_->unset_property (ly_symbol2scm ("stemLeftBeamCount")); + Stem::set_beaming (stem_, scm_to_int (prop), LEFT); + context ()->unset_property (ly_symbol2scm ("stemLeftBeamCount")); } prop = get_property ("stemRightBeamCount"); - if (gh_number_p (prop)) + if (scm_is_number (prop)) { - Stem::set_beaming (stem_,gh_scm2int (prop), RIGHT); - daddy_context_->unset_property (ly_symbol2scm ("stemRightBeamCount")); + Stem::set_beaming (stem_, scm_to_int (prop), RIGHT); + context ()->unset_property (ly_symbol2scm ("stemRightBeamCount")); } - - typeset_grob (stem_); stem_ = 0; } - - tremolo_ev_ = 0; } bool -Stem_engraver::try_music (Music* r) +Stem_engraver::try_music (Music *m) { - if (r->is_mus_type ("tremolo-event")) + if (m->is_mus_type ("tremolo-event")) { - tremolo_ev_ = r; + tremolo_ev_ = m; 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.", -/* creats*/ "Stem StemTremolo", -/* accepts */ "tremolo-event", -/* acks */ "rhythmic-head-interface", -/* reads */ "tremoloFlags stemLeftBeamCount stemRightBeamCount", -/* write */ ""); +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 */ "");