X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem-engraver.cc;h=11a567dbd077ebfbb2996b9648c7f404b9fd3edb;hb=c659cb200486c2f908703696a1b2873e78c8160a;hp=083a25a483066f75324f3a8a60fe0e8dfc0d68d7;hpb=d4bd65ce87936a9b2abdbf941ad572bda4e76768;p=lilypond.git diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc index 083a25a483..11a567dbd0 100644 --- a/lily/stem-engraver.cc +++ b/lily/stem-engraver.cc @@ -3,180 +3,174 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys */ -#include "staff-symbol-referencer.hh" -#include "rhythmic-head.hh" -#include "stem.hh" -#include "musical-request.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 "item.hh" -#include "translator-group.hh" -#include "engraver.hh" - - +#include "stem.hh" /** 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_p_; - Grob *tremolo_p_; - Rhythmic_req *rhythmic_req_l_; - Tremolo_req* tremolo_req_l_; + virtual bool try_music (Music *); }; Stem_engraver::Stem_engraver () { - tremolo_req_l_ = 0; - stem_p_ = 0; - tremolo_p_ = 0; - rhythmic_req_l_ =0; + tremolo_ev_ = 0; + stem_ = 0; + tremolo_ = 0; + rhythmic_ev_ =0; } - void -Stem_engraver::acknowledge_grob (Grob_info i) +Stem_engraver::make_stem (Grob_info gi) { - Grob* h = i.grob_l_; - 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 ()); + + /* + 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)); + + if (tremolo_ev_) { - if (Rhythmic_head::stem_l (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: + + c4:8 c c: - /* - We take the duration-log of the head; this is because - auto-tieing does strange things with the rhythmics. - */ - int duration_log =gh_scm2int (h->get_grob_property ("duration-log")); - if (!stem_p_) + 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_p_ = new Item (get_property ("Stem")); - Stem::set_interface (stem_p_); - Staff_symbol_referencer::set_interface (stem_p_); - - stem_p_->set_grob_property ("duration-log", gh_int2scm (duration_log)); - - if (tremolo_req_l_) - { - /* - Stem tremolo is never applied to a note by default, - is must me requested. 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_req_l_->get_mus_property ("tremolo-type")); - - SCM f = get_property ("tremoloFlags"); - if (!requested_type && gh_number_p (f)) - requested_type = gh_scm2int (f); - else - daddy_trans_l_->set_property ("tremoloFlags", gh_int2scm (requested_type)); - - if (requested_type) - { - tremolo_p_ = new Item (get_property ("StemTremolo")); - Stem_tremolo::set_interface (tremolo_p_); - - announce_grob (tremolo_p_, tremolo_req_l_); - /* - The number of tremolo flags is the number of flags of - the tremolo-type minus the number of flags of the note - itself. - */ - int tremolo_flags = intlog2 (requested_type) - 2 - - (duration_log > 2 ? duration_log - 2 : 0); - if (tremolo_flags < 0) - tremolo_flags = 0; - tremolo_p_->set_grob_property ("tremolo-flags", - gh_int2scm (tremolo_flags)); - } - } - announce_grob (stem_p_, i.req_l_); + 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::flag_i (stem_p_) != duration_log) + int tremolo_flags = intlog2 (requested_type) - 2 + - (duration_log > 2 ? duration_log - 2 : 0); + if (tremolo_flags <= 0) { - i.req_l_->origin ()->warning (_f ("Adding note head to incompatible stem (type = %d)", 1 << Stem::flag_i (stem_p_))); + tremolo_ev_->origin ()->warning (_("tremolo duration is too long")); + tremolo_flags = 0; } - Stem::add_head (stem_p_,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_p_) + if (Rhythmic_head::has_interface (gi.grob_)) { - Stem_tremolo::set_stem (tremolo_p_, stem_p_); - typeset_grob (tremolo_p_); - tremolo_p_ = 0; + 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?")); + } + + Stem::add_head (stem_, gi.grob_); } +} - if (stem_p_) +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_p_,gh_scm2int (prop),LEFT); - daddy_trans_l_->set_property ("stemLeftBeamCount", SCM_UNDEFINED); + Stem::set_beaming (stem_,scm_to_int (prop),LEFT); + context ()->unset_property (ly_symbol2scm ("stemLeftBeamCount")); } prop = get_property ("stemRightBeamCount"); - if (gh_number_p (prop)) - { - Stem::set_beaming (stem_p_,gh_scm2int (prop), RIGHT); - daddy_trans_l_->set_property ("stemRightBeamCount", SCM_UNDEFINED); - } - - - // UGH. Should mark non-forced instead. - /* - aargh: I don't get it. direction is being set (and then set - to forced), if we have a Chord_tremolo. - */ - SCM dir = stem_p_->get_grob_property ("direction"); - if (gh_number_p (dir) && to_dir (dir)) + if (scm_is_number (prop)) { - stem_p_->set_grob_property ("dir-forced", SCM_BOOL_T); + Stem::set_beaming (stem_,scm_to_int (prop), RIGHT); + context ()->unset_property (ly_symbol2scm ("stemRightBeamCount")); } - - typeset_grob (stem_p_); - stem_p_ = 0; + stem_ = 0; } - - - tremolo_req_l_ = 0; + tremolo_ev_ = 0; } bool -Stem_engraver::try_music (Music* r) +Stem_engraver::try_music (Music *m) { - if (Tremolo_req* a = dynamic_cast (r)) + if (m->is_mus_type ("tremolo-event")) { - tremolo_req_l_ = a; + 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.", +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", -/* acks */ "rhythmic-head-interface", +/* accepts */ "tremolo-event", +/* acks */ "rhythmic-head-interface", /* reads */ "tremoloFlags stemLeftBeamCount stemRightBeamCount", /* write */ "");