X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem-engraver.cc;h=b1f3eb4b9957c5a26ba92dd7ce005b53fbb640c3;hb=d765f3af45be51f15da55cf570a4b172200e1035;hp=a23d1430a8e8fb14509dac706799b93b1f05a52c;hpb=b02bb98ffea2c376ba67eb049b8ba6b04d76e084;p=lilypond.git diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc index a23d1430a8..b1f3eb4b99 100644 --- a/lily/stem-engraver.cc +++ b/lily/stem-engraver.cc @@ -30,44 +30,44 @@ protected: virtual bool try_music (Music*); private: - Grob *stem_p_; - Grob *tremolo_p_; - Rhythmic_req *rhythmic_req_l_; - Tremolo_req* tremolo_req_l_; + Grob *stem_; + Grob *tremolo_; + Rhythmic_req *rhythmic_req_; + Tremolo_req* tremolo_req_; }; Stem_engraver::Stem_engraver () { - tremolo_req_l_ = 0; - stem_p_ = 0; - tremolo_p_ = 0; - rhythmic_req_l_ =0; + tremolo_req_ = 0; + stem_ = 0; + tremolo_ = 0; + rhythmic_req_ =0; } void Stem_engraver::acknowledge_grob (Grob_info i) { - Grob* h = i.grob_l_; + Grob* h = i.grob_; if (Rhythmic_head::has_interface (h)) { - if (Rhythmic_head::stem_l (h)) + if (Rhythmic_head::get_stem (h)) return; - /* - 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_) + /* Reverted to the old method so chord tremolos work again. /MB + */ + int duration_log = 0; + Rhythmic_req *rhythmic_req = dynamic_cast (i.music_cause ()); + if (rhythmic_req) + duration_log = unsmob_duration (rhythmic_req->get_mus_property ("duration"))-> duration_log (); + + if (!stem_) { - 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)); + stem_ = new Item (get_property ("Stem")); + + stem_->set_grob_property ("duration-log", gh_int2scm (duration_log)); - if (tremolo_req_l_) + if (tremolo_req_) { /* Stem tremolo is never applied to a note by default, @@ -78,92 +78,83 @@ Stem_engraver::acknowledge_grob (Grob_info i) the first and last (quarter) note bothe get one tremolo flag. */ - int requested_type = gh_scm2int (tremolo_req_l_->get_mus_property ("tremolo-type")); - + int requested_type = gh_scm2int (tremolo_req_->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)); + daddy_trans_->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_req_->origin()->warning (_("tremolo duration is too long")); + tremolo_flags = 0; + } - if (requested_type) + if (tremolo_flags) { - tremolo_p_ = new Item (get_property ("StemTremolo")); - Stem_tremolo::set_interface (tremolo_p_); + tremolo_ = new Item (get_property ("StemTremolo")); + announce_grob(tremolo_, tremolo_req_->self_scm()); - announce_grob(tremolo_p_, tremolo_req_l_->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. */ - 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", + tremolo_->set_grob_property ("flag-count", gh_int2scm (tremolo_flags)); + tremolo_->set_parent (stem_, X_AXIS); } } /* 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_p_, i.music_cause ()->self_scm()); + announce_grob(stem_, i.music_cause ()->self_scm()); } - if (Stem::flag_i (stem_p_) != duration_log) + if (Stem::duration_log (stem_) != duration_log) { - i.music_cause ()->origin ()->warning (_f ("Adding note head to incompatible stem (type = %d)", 1 << Stem::flag_i (stem_p_))); + i.music_cause ()->origin ()->warning (_f ("Adding note head to incompatible stem (type = %d)", 1 << Stem::duration_log (stem_))); } - Stem::add_head (stem_p_,h); + Stem::add_head (stem_,h); } } void Stem_engraver::stop_translation_timestep () { - if (tremolo_p_) + if (tremolo_) { - Stem_tremolo::set_stem (tremolo_p_, stem_p_); - typeset_grob (tremolo_p_); - tremolo_p_ = 0; + Stem_tremolo::set_stem (tremolo_, stem_); + typeset_grob (tremolo_); + tremolo_ = 0; } - if (stem_p_) + if (stem_) { SCM prop = get_property ("stemLeftBeamCount"); if (gh_number_p (prop)) { - Stem::set_beaming (stem_p_,gh_scm2int (prop),LEFT); - daddy_trans_l_->unset_property (ly_symbol2scm ("stemLeftBeamCount")); + Stem::set_beaming (stem_,gh_scm2int (prop),LEFT); + daddy_trans_->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_->unset_property (ly_symbol2scm ("stemRightBeamCount")); - } - - - // 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)) - { - stem_p_->set_grob_property ("dir-forced", SCM_BOOL_T); + Stem::set_beaming (stem_,gh_scm2int (prop), RIGHT); + daddy_trans_->unset_property (ly_symbol2scm ("stemRightBeamCount")); } - typeset_grob (stem_p_); - stem_p_ = 0; + typeset_grob (stem_); + stem_ = 0; } - tremolo_req_l_ = 0; + tremolo_req_ = 0; } bool @@ -171,7 +162,7 @@ Stem_engraver::try_music (Music* r) { if (Tremolo_req* a = dynamic_cast (r)) { - tremolo_req_l_ = a; + tremolo_req_ = a; return true; } return false;