X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem-engraver.cc;h=f5f9546c4c9f5c06b53dae80c5d15cb1568c98ff;hb=a478e5ad057eaf795f915e2b31293e947364d41d;hp=18c6669187ceb3255a62da854e1f2c19dd8be49c;hpb=fdfd147f1233eef6ea8b176290221b5a4ec38868;p=lilypond.git diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc index 18c6669187..f5f9546c4c 100644 --- a/lily/stem-engraver.cc +++ b/lily/stem-engraver.cc @@ -7,12 +7,12 @@ */ #include "staff-symbol-referencer.hh" -#include "note-head.hh" +#include "rhythmic-head.hh" #include "stem.hh" #include "musical-request.hh" #include "misc.hh" #include "stem-tremolo.hh" - +#include "item.hh" #include "translator-group.hh" #include "engraver.hh" @@ -27,15 +27,13 @@ public: Stem_engraver(); protected: - virtual void do_creation_processing (); - virtual void acknowledge_element (Score_element_info); - virtual void do_pre_move_processing (); - virtual bool do_try_music (Music*); + virtual void acknowledge_grob (Grob_info); + virtual void stop_translation_timestep (); + virtual bool try_music (Music*); private: - int default_tremolo_type_i_; - Stem *stem_p_; - Stem_tremolo *tremolo_p_; + Grob *stem_p_; + Grob *tremolo_p_; Rhythmic_req *rhythmic_req_l_; Tremolo_req* tremolo_req_l_; }; @@ -47,40 +45,29 @@ Stem_engraver::Stem_engraver () tremolo_req_l_ = 0; stem_p_ = 0; tremolo_p_ = 0; - default_tremolo_type_i_ = 16; rhythmic_req_l_ =0; } -void -Stem_engraver::do_creation_processing () -{ - /* - huh, why only at creation time? - */ - SCM prop = get_property ("tremoloFlags"); - if (gh_number_p(prop)) - { - default_tremolo_type_i_ = gh_scm2int (prop); - } -} void -Stem_engraver::acknowledge_element(Score_element_info i) +Stem_engraver::acknowledge_grob(Grob_info i) { - if (Rhythmic_head * h = dynamic_cast (i.elem_l_)) + Grob* h = i.elem_l_; + if (Rhythmic_head::has_interface (h)) { - if (h->stem_l ()) + if (Rhythmic_head::stem_l (h)) return; - Rhythmic_req * r = dynamic_cast (i.req_l_); - int duration_log = r->duration_.durlog_i_; + int duration_log = unsmob_duration (i.req_l_->get_mus_property ("duration"))-> duration_log (); + if (!stem_p_) { - stem_p_ = new Stem (get_property ("basicStemProperties")); - Staff_symbol_referencer_interface st(stem_p_); - st.set_interface (); + stem_p_ = new Item (get_property ("Stem")); + Stem::set_interface (stem_p_); + Staff_symbol_referencer::set_interface(stem_p_); + - stem_p_->set_elt_property ("duration-log", gh_int2scm (duration_log)); + stem_p_->set_grob_property ("duration-log", gh_int2scm (duration_log)); if (tremolo_req_l_) { @@ -93,16 +80,20 @@ Stem_engraver::acknowledge_element(Score_element_info i) the first and last (quarter) note bothe get one tremolo flag. */ - int requested_type = tremolo_req_l_->type_i_; - if (!requested_type) - requested_type = default_tremolo_type_i_; + 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 - default_tremolo_type_i_ = requested_type; + daddy_trans_l_->set_property ("tremoloFlags", gh_int2scm (requested_type)); if (requested_type) { - tremolo_p_ = new Stem_tremolo (get_property ("basicStemTremoloProperties")); - announce_element (Score_element_info (tremolo_p_, tremolo_req_l_)); + 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 @@ -112,29 +103,29 @@ Stem_engraver::acknowledge_element(Score_element_info i) - (duration_log > 2 ? duration_log - 2 : 0); if (tremolo_flags < 0) tremolo_flags = 0; - tremolo_p_->set_elt_property ("tremolo-flags", + tremolo_p_->set_grob_property ("tremolo-flags", gh_int2scm (tremolo_flags)); } } - announce_element (Score_element_info (stem_p_, r)); + announce_grob (stem_p_, i.req_l_); } - if (stem_p_->flag_i () != duration_log) + if (Stem::flag_i (stem_p_) != duration_log) { - r->warning (_f ("Adding note head to incompatible stem (type = %d)", 1 << stem_p_->flag_i ())); + i.req_l_->origin ()->warning (_f ("Adding note head to incompatible stem (type = %d)", 1 << Stem::flag_i (stem_p_))); } - stem_p_->add_head (h); + Stem::add_head (stem_p_,h); } } void -Stem_engraver::do_pre_move_processing() +Stem_engraver::stop_translation_timestep() { if (tremolo_p_) { - tremolo_p_->set_stem (stem_p_); - typeset_element (tremolo_p_); + Stem_tremolo::set_stem (tremolo_p_, stem_p_); + typeset_grob (tremolo_p_); tremolo_p_ = 0; } @@ -143,13 +134,13 @@ Stem_engraver::do_pre_move_processing() SCM prop = get_property ("stemLeftBeamCount"); if (gh_number_p(prop)) { - stem_p_->set_beaming (gh_scm2int (prop),LEFT); + Stem::set_beaming (stem_p_,gh_scm2int (prop),LEFT); daddy_trans_l_->set_property ("stemLeftBeamCount", SCM_UNDEFINED); } prop = get_property ("stemRightBeamCount"); if (gh_number_p(prop)) { - stem_p_->set_beaming (gh_scm2int (prop), RIGHT); + Stem::set_beaming (stem_p_,gh_scm2int (prop), RIGHT); daddy_trans_l_->set_property ("stemRightBeamCount", SCM_UNDEFINED); } @@ -160,13 +151,13 @@ Stem_engraver::do_pre_move_processing() 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_elt_property ("direction"); + SCM dir = stem_p_->get_grob_property ("direction"); if (gh_number_p (dir) && to_dir(dir)) { - stem_p_->set_elt_property ("dir-forced", SCM_BOOL_T); + stem_p_->set_grob_property ("dir-forced", SCM_BOOL_T); } - typeset_element(stem_p_); + typeset_grob(stem_p_); stem_p_ = 0; } @@ -175,7 +166,7 @@ Stem_engraver::do_pre_move_processing() } bool -Stem_engraver::do_try_music (Music* r) +Stem_engraver::try_music (Music* r) { if (Tremolo_req* a = dynamic_cast (r)) {