X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem-engraver.cc;h=11a567dbd077ebfbb2996b9648c7f404b9fd3edb;hb=c659cb200486c2f908703696a1b2873e78c8160a;hp=08b598f1e2c215753903937d7acac5c76715b88d;hpb=a8651b61fa25aee299bbc846d180a942568d6075;p=lilypond.git diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc index 08b598f1e2..11a567dbd0 100644 --- a/lily/stem-engraver.cc +++ b/lily/stem-engraver.cc @@ -3,187 +3,174 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 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 "translator-group.hh" -#include "engraver.hh" +#include "stem.hh" /** Make stems upon receiving noteheads. */ class Stem_engraver : public Engraver { - -public: - VIRTUAL_COPY_CONS (Translator); - Stem_engraver(); + Grob *stem_; + Grob *tremolo_; + Music *rhythmic_ev_; + Music *tremolo_ev_; + TRANSLATOR_DECLARATIONS (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*); + void make_stem (Grob_info); -private: - int default_tremolo_type_i_; - Stem *stem_p_; - Score_element *tremolo_p_; - Rhythmic_req *rhythmic_req_l_; - Tremolo_req* tremolo_req_l_; + virtual void acknowledge_grob (Grob_info); + virtual void stop_translation_timestep (); + virtual bool try_music (Music *); }; -ADD_THIS_TRANSLATOR (Stem_engraver); - Stem_engraver::Stem_engraver () { - tremolo_req_l_ = 0; - stem_p_ = 0; - tremolo_p_ = 0; - default_tremolo_type_i_ = 16; - rhythmic_req_l_ =0; + tremolo_ev_ = 0; + stem_ = 0; + tremolo_ = 0; + rhythmic_ev_ =0; } void -Stem_engraver::do_creation_processing () +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 ()); + /* - huh, why only at creation time? - */ - SCM prop = get_property ("tremoloFlags"); - if (gh_number_p(prop)) + 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_) { - default_tremolo_type_i_ = gh_scm2int (prop); + /* 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 + = scm_to_int (tremolo_ev_->get_property ("tremolo-type")); + SCM f = get_property ("tremoloFlags"); + if (!requested_type) + { + if (scm_is_number (f)) + requested_type = scm_to_int (f); + else + requested_type = 8; + } + else + context ()->set_property ("tremoloFlags", scm_int2num (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", 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::acknowledge_element(Score_element_info i) +Stem_engraver::acknowledge_grob (Grob_info gi) { - if (Rhythmic_head * h = dynamic_cast (i.elem_l_)) + if (Rhythmic_head::has_interface (gi.grob_)) { - if (h->stem_l ()) + if (Rhythmic_head::get_stem (gi.grob_)) return; + + Music * cause = gi.music_cause (); + if (!cause) + return ; - Rhythmic_req * r = dynamic_cast (i.req_l_); - int duration_log = r->duration_.durlog_i_; - if (!stem_p_) + if (!stem_) + make_stem (gi); + + int duration_log = cause->duration_log (); + if (Stem::duration_log (stem_) != duration_log) { - stem_p_ = new Stem (get_property ("basicStemProperties")); - Staff_symbol_referencer_interface::set_interface(stem_p_); - + // FIXME: + gi.music_cause ()->origin ()->warning (_f ("Adding note head to incompatible stem (type = %d)", 1 << Stem::duration_log (stem_))); - stem_p_->set_elt_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 = tremolo_req_l_->type_i_; - if (!requested_type) - requested_type = default_tremolo_type_i_; - else - default_tremolo_type_i_ = requested_type; - - if (requested_type) - { - tremolo_p_ = new Item (get_property ("basicStemTremoloProperties")); - Stem_tremolo::set_interface (tremolo_p_); - - announce_element (Score_element_info (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_elt_property ("tremolo-flags", - gh_int2scm (tremolo_flags)); - } - } - announce_element (Score_element_info (stem_p_, r)); - } - - if (stem_p_->flag_i () != duration_log) - { - r->warning (_f ("Adding note head to incompatible stem (type = %d)", 1 << stem_p_->flag_i ())); + gi.music_cause ()->origin ()->warning (_f ("Don't you want polyphonic voices instead?")); } - stem_p_->add_head (h); + Stem::add_head (stem_, gi.grob_); } } void -Stem_engraver::do_pre_move_processing() +Stem_engraver::stop_translation_timestep () { - if (tremolo_p_) - { - Stem_tremolo::set_stem (tremolo_p_, stem_p_); - typeset_element (tremolo_p_); - tremolo_p_ = 0; - } - - if (stem_p_) + tremolo_ = 0; + if (stem_) { + /* FIXME: junk these properties. */ SCM prop = get_property ("stemLeftBeamCount"); - if (gh_number_p(prop)) + if (scm_is_number (prop)) { - stem_p_->set_beaming (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_p_->set_beaming (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_elt_property ("direction"); - if (gh_number_p (dir) && to_dir(dir)) + if (scm_is_number (prop)) { - stem_p_->set_elt_property ("dir-forced", SCM_BOOL_T); + Stem::set_beaming (stem_,scm_to_int (prop), RIGHT); + context ()->unset_property (ly_symbol2scm ("stemRightBeamCount")); } - - typeset_element(stem_p_); - stem_p_ = 0; + stem_ = 0; } - - - tremolo_req_l_ = 0; + tremolo_ev_ = 0; } bool -Stem_engraver::do_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.", +/* creats*/ "Stem StemTremolo", +/* accepts */ "tremolo-event", +/* acks */ "rhythmic-head-interface", +/* reads */ "tremoloFlags stemLeftBeamCount stemRightBeamCount", +/* write */ "");