X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem-engraver.cc;h=b0378a334969fdb7a8bc4ed0d469e3d885c80009;hb=015bb3813eb4ac879df0561e5c6e28e9d1146792;hp=8fa6d56761046bcda99ad5dd613f2a5c32a8d015;hpb=1cf3d59c1559fb9774c4c1c8cae155cfe54a927c;p=lilypond.git diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc index 8fa6d56761..b0378a3349 100644 --- a/lily/stem-engraver.cc +++ b/lily/stem-engraver.cc @@ -3,118 +3,174 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1998 Han-Wen Nienhuys + (c) 1997--2005 Han-Wen Nienhuys */ -#include "stem-engraver.hh" -#include "note-head.hh" -#include "stem.hh" -#include "musical-request.hh" -#include "duration-convert.hh" +#include "context.hh" +#include "directional-element-interface.hh" +#include "engraver.hh" +#include "item.hh" #include "misc.hh" -#include "abbrev.hh" +#include "rhythmic-head.hh" +#include "script-interface.hh" +#include "staff-symbol-referencer.hh" +#include "stem-tremolo.hh" +#include "stem.hh" -Stem_engraver::Stem_engraver() +/** + Make stems upon receiving noteheads. + */ +class Stem_engraver : public Engraver { - abbrev_req_l_ = 0; - stem_p_ = 0; - abbrev_p_ = 0; - default_abbrev_i_ = 16; - dir_ = CENTER; + 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 *); +}; + +Stem_engraver::Stem_engraver () +{ + tremolo_ev_ = 0; + stem_ = 0; + tremolo_ = 0; + rhythmic_ev_ = 0; } void -Stem_engraver::do_creation_processing () +Stem_engraver::make_stem (Grob_info gi) { - Scalar prop = get_property ("abbrev"); - if (prop.isnum_b ()) + /* 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_) { - default_abbrev_i_ = 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 (i.elem_l_->is_type_b (Rhythmic_head::static_name())) + if (Rhythmic_head::has_interface (gi.grob_)) { - Rhythmic_head *h = (Rhythmic_head*) i.elem_l_->access_Item (); - if (!stem_p_) - { - Rhythmic_req * r = i.req_l_->access_Musical_req ()->access_Rhythmic_req (); - stem_p_ = new Stem; - int durlog_i = r->duration_.durlog_i_; - stem_p_->flag_i_ = durlog_i; + 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_))); - if (abbrev_req_l_) - { - /* - suggests typing of: - c8:16 c: c: c: - hmm, which isn't so bad? - */ - int t = abbrev_req_l_->type_i_; - if (!t) - t = default_abbrev_i_; - else - default_abbrev_i_ = t; - - if (t) - { - abbrev_p_ = new Abbreviation; - announce_element (Score_element_info (abbrev_p_, abbrev_req_l_)); - abbrev_p_->abbrev_flags_i_ =intlog2 (t) - (durlog_i>? 2); - } - } - - // must give the request, to preserve the rhythmic info. - announce_element (Score_element_info (stem_p_, r)); + 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 (abbrev_p_) - { - abbrev_p_->set_stem (stem_p_); - typeset_element (abbrev_p_); - abbrev_p_ = 0; - } - if (stem_p_) + tremolo_ = 0; + if (stem_) { - Scalar prop = get_property ("ydirection"); - dir_ = prop.isnum_b () ? (Direction)int(prop) : CENTER; - if (dir_) + /* FIXME: junk these properties. */ + SCM prop = get_property ("stemLeftBeamCount"); + if (scm_is_number (prop)) { - stem_p_->dir_ = dir_; - stem_p_->dir_forced_b_ = true; + Stem::set_beaming (stem_, scm_to_int (prop), LEFT); + context ()->unset_property (ly_symbol2scm ("stemLeftBeamCount")); } - - typeset_element(stem_p_); - stem_p_ = 0; + prop = get_property ("stemRightBeamCount"); + if (scm_is_number (prop)) + { + Stem::set_beaming (stem_, scm_to_int (prop), RIGHT); + context ()->unset_property (ly_symbol2scm ("stemRightBeamCount")); + } + stem_ = 0; } - abbrev_req_l_ = 0; + tremolo_ev_ = 0; } bool -Stem_engraver::do_try_request (Request* r) +Stem_engraver::try_music (Music *m) { - Musical_req* mus_l = r->access_Musical_req (); - if (!mus_l) - return false; - - Abbreviation_req* a = mus_l->access_Abbreviation_req (); - if (!a) - return false; - - abbrev_req_l_ = a; - - return true; + if (m->is_mus_type ("tremolo-event")) + { + tremolo_ev_ = m; + return true; + } + return false; } -IMPLEMENT_IS_TYPE_B1(Stem_engraver, Engraver); -ADD_THIS_TRANSLATOR(Stem_engraver); +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 */ "");