X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem-engraver.cc;h=164bedff3638676fc1a4d0e8eef8c3de1ca2ab7d;hb=af7063a9e816ce5e616e0b35922fdb923c9d6095;hp=1c3de7e27aace35e5cfc371fd850920af8ad78cb;hpb=9661ba1fb275f3e14f8a69f2cee2f02a2f893e48;p=lilypond.git diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc index 1c3de7e27a..164bedff36 100644 --- a/lily/stem-engraver.cc +++ b/lily/stem-engraver.cc @@ -1,191 +1,184 @@ /* - stem-grav.cc -- implement Stem_engraver + stem-engraver.cc -- implement Stem_engraver source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2007 Han-Wen Nienhuys */ -#include "staff-symbol-referencer.hh" -#include "rhythmic-head.hh" -#include "stem.hh" -#include "musical-request.hh" +#include "engraver.hh" + +#include "context.hh" +#include "directional-element-interface.hh" +#include "duration.hh" +#include "international.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" +#include "stream-event.hh" + +#include "translator.icc" -/** - Make stems upon receiving noteheads. - */ class Stem_engraver : public Engraver { + Grob *stem_; + Grob *tremolo_; + Stream_event *rhythmic_ev_; + Stream_event *tremolo_ev_; + + TRANSLATOR_DECLARATIONS (Stem_engraver); -public: - VIRTUAL_COPY_CONS (Translator); - 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*); - -private: - int default_tremolo_type_i_; - Score_element *stem_p_; - Score_element *tremolo_p_; - Rhythmic_req *rhythmic_req_l_; - Tremolo_req* tremolo_req_l_; -}; + void make_stem (Grob_info); -ADD_THIS_TRANSLATOR (Stem_engraver); + DECLARE_TRANSLATOR_LISTENER (tremolo); + DECLARE_ACKNOWLEDGER (rhythmic_head); + void stop_translation_timestep (); +}; 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) { - /* - huh, why only at creation time? - */ - SCM prop = get_property ("tremoloFlags"); - if (gh_number_p(prop)) - { - default_tremolo_type_i_ = gh_scm2int (prop); - } -} + /* 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.grob ()->self_scm ()); -void -Stem_engraver::acknowledge_element(Score_element_info i) -{ - Score_element* h = i.elem_l_; - if (Rhythmic_head::has_interface (h)) + if (tremolo_ev_) { - if (Rhythmic_head::stem_l (h)) - return; - - Rhythmic_req * r = dynamic_cast (i.req_l_); - int duration_log = r->duration_.durlog_i_; - if (!stem_p_) + /* 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) { - stem_p_ = new Item (get_property ("basicStemProperties")); - Stem::set_interface (stem_p_); - Staff_symbol_referencer::set_interface(stem_p_); - - - 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 (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 (stem_p_, r); + if (scm_is_number (f)) + requested_type = scm_to_int (f); + else + requested_type = 8; } + else + context ()->set_property ("tremoloFlags", scm_from_int (requested_type)); + - if (Stem::flag_i (stem_p_) != duration_log) + /* + we take the duration log from the Event, since the duration-log + for a note head is always <= 2. + */ + Stream_event *ev = gi.event_cause (); + Duration *dur = unsmob_duration (ev->get_property ("duration")); + + int tremolo_flags = intlog2 (requested_type) - 2 + - (dur->duration_log () > 2 ? dur->duration_log () - 2 : 0); + if (tremolo_flags <= 0) { - r->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_from_int (tremolo_flags)); + tremolo_->set_parent (stem_, X_AXIS); + stem_->set_object ("tremolo-flag", tremolo_->self_scm ()); + tremolo_->set_object ("stem", stem_->self_scm ()); + } } } void -Stem_engraver::do_pre_move_processing() +Stem_engraver::acknowledge_rhythmic_head (Grob_info gi) { - if (tremolo_p_) + if (Rhythmic_head::get_stem (gi.grob ())) + return; + + Stream_event *cause = gi.event_cause (); + if (!cause) + return; + Duration *d = unsmob_duration (cause->get_property ("duration")); + if (!d) + return; + + if (!stem_) + make_stem (gi); + + if (Stem::duration_log (stem_) != d->duration_log ()) { - Stem_tremolo::set_stem (tremolo_p_, stem_p_); - typeset_element (tremolo_p_); - tremolo_p_ = 0; + // FIXME: + gi.event_cause ()->origin ()->warning (_f ("adding note head to incompatible stem (type = %d)", + 1 << Stem::duration_log (stem_))); + gi.event_cause ()->origin ()->warning (_f ("maybe input should specify polyphonic voices")); } - if (stem_p_) + Stem::add_head (stem_, gi.grob ()); +} + +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)) + if (scm_is_number (prop)) { - Stem::set_beaming (stem_p_,gh_scm2int (prop), RIGHT); - daddy_trans_l_->set_property ("stemRightBeamCount", SCM_UNDEFINED); + Stem::set_beaming (stem_, scm_to_int (prop), RIGHT); + context ()->unset_property (ly_symbol2scm ("stemRightBeamCount")); } + stem_ = 0; + } + tremolo_ev_ = 0; +} - - // UGH. Should mark non-forced instead. +IMPLEMENT_TRANSLATOR_LISTENER (Stem_engraver, tremolo); +void +Stem_engraver::listen_tremolo (Stream_event *ev) +{ + ASSIGN_EVENT_ONCE (tremolo_ev_, ev); +} - /* - 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)) - { - stem_p_->set_elt_property ("dir-forced", SCM_BOOL_T); - } +ADD_ACKNOWLEDGER (Stem_engraver, rhythmic_head); - typeset_element(stem_p_); - stem_p_ = 0; - } +ADD_TRANSLATOR (Stem_engraver, + /* doc */ "Create stems and single-stem tremolos. It also works together with " + "the beam engraver for overriding beaming.", - tremolo_req_l_ = 0; -} + /* create */ + "Stem " + "StemTremolo ", -bool -Stem_engraver::do_try_music (Music* r) -{ - if (Tremolo_req* a = dynamic_cast (r)) - { - tremolo_req_l_ = a; - return true; - } - return false; -} + /* read */ + "tremoloFlags " + "stemLeftBeamCount " + "stemRightBeamCount ", + /* write */ "");