X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeam-engraver.cc;h=917d2db3c1193b258892b7d42d4976f85ee153be;hb=1e631c87d1f5c1e5c448c8604e1d2f7b2ff9b5be;hp=1678dff784e836a482386ef3e6b60b5bbe13f4d9;hpb=3c2f386f1385a10dafbb811be245f5a75d6b132c;p=lilypond.git diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc index 1678dff784..917d2db3c1 100644 --- a/lily/beam-engraver.cc +++ b/lily/beam-engraver.cc @@ -1,14 +1,12 @@ -/* - beam-engraver.cc -- implement Beam_engraver - +/* + beam-engraver.cc -- implement Beam_engraver + source file of the GNU LilyPond music typesetter - - (c) 1998--2000 Han-Wen Nienhuys - - */ -#include "engraver-group-engraver.hh" + + (c) 1998--2005 Han-Wen Nienhuys +*/ + #include "engraver.hh" -#include "musical-request.hh" #include "beam.hh" #include "stem.hh" #include "warn.hh" @@ -18,208 +16,240 @@ #include "drul-array.hh" #include "item.hh" #include "spanner.hh" +#include "context.hh" class Beam_engraver : public Engraver { - Drul_array reqs_drul_; +protected: + Music *start_ev_; + + Spanner *finished_beam_; + Spanner *beam_; + Music *prev_start_ev_; - Spanner *finished_beam_p_; - Spanner *beam_p_; - Span_req * prev_start_req_; + Music *now_stop_ev_; - Beaming_info_list * beam_info_p_; - Beaming_info_list * finished_beam_info_p_; + Beaming_info_list *beam_info_; + Beaming_info_list *finished_beam_info_; /// location within measure where beam started. Moment beam_start_location_; /// moment (global time) where beam started. Moment beam_start_mom_; - + + bool subdivide_beams_; + Moment beat_length_; + void typeset_beam (); -protected: - virtual void do_pre_move_processing (); - virtual void do_post_move_processing (); - virtual void do_removal_processing (); - virtual void acknowledge_element (Score_element_info); - virtual bool do_try_music (Music*); - virtual void do_process_music (); + void set_melisma (bool); + + Moment last_stem_added_at_; + virtual void stop_translation_timestep (); + virtual void start_translation_timestep (); + virtual void finalize (); + + virtual void acknowledge_grob (Grob_info); + virtual bool try_music (Music *); + virtual void process_music (); + + virtual bool valid_start_point (); + virtual bool valid_end_point (); + public: - Beam_engraver (); - VIRTUAL_COPY_CONS (Translator); + TRANSLATOR_DECLARATIONS (Beam_engraver); }; +/* + Hmm. this isn't necessary, since grace beams and normal beams are + always nested. +*/ +bool +Beam_engraver::valid_start_point () +{ + Moment n = now_mom (); + + return n.grace_part_ == Rational (0); +} + +bool +Beam_engraver::valid_end_point () +{ + return valid_start_point (); +} Beam_engraver::Beam_engraver () { - beam_p_ = 0; - finished_beam_p_ =0; - finished_beam_info_p_=0; - beam_info_p_ =0; - reqs_drul_[LEFT] = reqs_drul_[RIGHT] =0; - prev_start_req_ =0; + beam_ = 0; + finished_beam_ = 0; + finished_beam_info_ = 0; + beam_info_ = 0; + now_stop_ev_ = 0; + start_ev_ = 0; + prev_start_ev_ = 0; } bool -Beam_engraver::do_try_music (Music *m) +Beam_engraver::try_music (Music *m) { - if (Span_req * c = dynamic_cast(m)) + if (m->is_mus_type ("beam-event")) { - if (c->span_type_str_ != "beam") + Direction d = to_dir (m->get_property ("span-direction")); + if (d == START && !valid_start_point ()) + return false; + if (d == STOP && !valid_end_point ()) return false; - - Direction d =c->span_dir_; - if (d == STOP && !beam_p_) + if (d == START) { - m->warning (_ ("can't find start of beam")); - return false; + start_ev_ = m; + } + else if (d == STOP) + { + now_stop_ev_ = m; } - reqs_drul_[d ] = c; return true; } return false; } +void +Beam_engraver::set_melisma (bool ml) +{ + SCM b = get_property ("autoBeaming"); + if (!to_boolean (b)) + context ()->set_property ("beamMelismaBusy", ml ? SCM_BOOL_T : SCM_BOOL_F); +} void -Beam_engraver::do_process_music () +Beam_engraver::process_music () { - if (reqs_drul_[STOP]) + if (beam_ && !to_boolean (get_property ("allowBeamBreak"))) { - if (!beam_p_) - reqs_drul_[STOP]->warning (_("can't find start of beam")); - prev_start_req_ =0; - finished_beam_p_ = beam_p_; - finished_beam_info_p_ = beam_info_p_; - - beam_info_p_ =0; - beam_p_ = 0; + get_score_engraver ()->forbid_breaks (); } - - if (beam_p_ && !to_boolean (get_property ("weAreGraceContext"))) - { - Score_engraver * e = 0; - Translator * t = daddy_grav_l (); - for (; !e && t; t = t->daddy_trans_l_) - { - e = dynamic_cast (t); - } - - if (!e) - programming_error ("No score engraver!"); - else - e->forbid_breaks (); - } - - if (reqs_drul_[START]) + if (start_ev_) { - if (beam_p_) + if (beam_) { - reqs_drul_[START]->warning (_ ("already have a beam")); + start_ev_->origin ()->warning (_ ("already have a beam")); return; } - prev_start_req_ = reqs_drul_[START]; - beam_p_ = new Spanner (get_property ("basicBeamProperties")); - Beam::set_interface (beam_p_); - - SCM smp = get_property ("measurePosition"); - Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0); + set_melisma (true); + prev_start_ev_ = start_ev_; + beam_ = make_spanner ("Beam", start_ev_->self_scm ()); + Moment mp (robust_scm2moment (get_property ("measurePosition"), Moment (0))); beam_start_location_ = mp; - beam_start_mom_ = now_mom(); - beam_info_p_ = new Beaming_info_list; - - + beam_start_mom_ = now_mom (); + + beam_info_ = new Beaming_info_list; + /* urg, must copy to Auto_beam_engraver too */ - - announce_element (Score_element_info (beam_p_, reqs_drul_[START])); } } void Beam_engraver::typeset_beam () { - if (finished_beam_p_) + if (finished_beam_) { - finished_beam_info_p_->beamify (); - - Beam::set_beaming (finished_beam_p_, finished_beam_info_p_); - typeset_element (finished_beam_p_); - delete finished_beam_info_p_; - finished_beam_info_p_ =0; - finished_beam_p_ = 0; - - reqs_drul_[STOP] = 0; + finished_beam_info_->beamify (beat_length_, subdivide_beams_); + Beam::set_beaming (finished_beam_, finished_beam_info_); + + delete finished_beam_info_; + finished_beam_info_ = 0; + finished_beam_ = 0; } } void -Beam_engraver::do_post_move_processing () +Beam_engraver::start_translation_timestep () { - reqs_drul_ [START] =0; + start_ev_ = 0; + + if (beam_) + { + set_melisma (true); + + subdivide_beams_ = to_boolean (get_property ("subdivideBeams")); + beat_length_ = robust_scm2moment (get_property ("beatLength"), Moment (1, 4)); + } } void -Beam_engraver::do_pre_move_processing () +Beam_engraver::stop_translation_timestep () { typeset_beam (); + if (now_stop_ev_) + { + finished_beam_ = beam_; + finished_beam_info_ = beam_info_; + + now_stop_ev_ = 0; + beam_ = 0; + beam_info_ = 0; + typeset_beam (); + set_melisma (false); + } } void -Beam_engraver::do_removal_processing () +Beam_engraver::finalize () { typeset_beam (); - if (beam_p_) + if (beam_) { - prev_start_req_->warning (_ ("unterminated beam")); - finished_beam_p_ = beam_p_; - finished_beam_info_p_ = beam_info_p_; - typeset_beam (); + prev_start_ev_->origin ()->warning (_ ("unterminated beam")); + + /* + we don't typeset it, (we used to, but it was commented + out. Reason unknown) */ + beam_->suicide (); + delete beam_info_; } } void -Beam_engraver::acknowledge_element (Score_element_info info) +Beam_engraver::acknowledge_grob (Grob_info info) { - if (beam_p_) + if (beam_) { - if (Rest::has_interface (info.elem_l_)) + if (Rest::has_interface (info.grob ())) { - info.elem_l_->add_offset_callback (Beam::rest_collision_callback, Y_AXIS); + info.grob ()->add_offset_callback (Beam::rest_collision_callback_proc, Y_AXIS); } - else if (Stem::has_interface (info.elem_l_)) + else if (Stem::has_interface (info.grob ())) { - Item *stem_l = dynamic_cast (info.elem_l_); - if (Stem::beam_l (stem_l)) - return; + Moment now = now_mom (); - bool stem_grace = stem_l->get_elt_property ("grace") == SCM_BOOL_T; - - SCM wg =get_property ("weAreGraceContext"); - bool wgb= to_boolean (wg); + if (!valid_start_point ()) + return; - if (wgb!= stem_grace) + Item *stem = dynamic_cast (info.grob ()); + if (Stem::get_beam (stem)) return; - Rhythmic_req *rhythmic_req = dynamic_cast (info.req_l_); - if (!rhythmic_req) + Music *m = info.music_cause (); + if (!m->is_mus_type ("rhythmic-event")) { String s = _ ("stem must have Rhythmic structure"); - if (info.req_l_) - info.req_l_->warning (s); + if (info.music_cause ()) + info.music_cause ()->origin ()->warning (s); else ::warning (s); - + return; } - if (rhythmic_req->duration_.durlog_i_<= 2) + last_stem_added_at_ = now; + int durlog = unsmob_duration (m->get_property ("duration"))->duration_log (); + if (durlog <= 2) { - rhythmic_req->warning (_ ("stem doesn't fit in beam")); - prev_start_req_->warning (_ ("beam was started here")); + m->origin ()->warning (_ ("stem doesn't fit in beam")); + prev_start_ev_->origin ()->warning (_ ("beam was started here")); /* don't return, since @@ -227,17 +257,60 @@ Beam_engraver::acknowledge_element (Score_element_info info) */ } - stem_l->set_elt_property ("duration-log", - gh_int2scm (rhythmic_req->duration_.durlog_i_)); - Moment stem_location = now_mom () - beam_start_mom_ + beam_start_location_; - beam_info_p_->add_stem (stem_location, - (rhythmic_req->duration_.durlog_i_ - 2) >? 1); - Beam::add_stem (beam_p_, stem_l); + stem->set_property ("duration-log", + scm_int2num (durlog)); + Moment stem_location = now - beam_start_mom_ + beam_start_location_; + beam_info_->add_stem (stem_location, + max (durlog- 2, 0)); + Beam::add_stem (beam_, stem); } } } +ADD_TRANSLATOR (Beam_engraver, + /* descr */ "Handles Beam events by engraving Beams. If omitted, then notes will be " + "printed with flags instead of beams.", + /* creats*/ "Beam", + /* accepts */ "beam-event", + /* acks */ "stem-interface rest-interface", + /* reads */ "beamMelismaBusy beatLength subdivideBeams", + /* write */ ""); + +class Grace_beam_engraver : public Beam_engraver +{ +public: + TRANSLATOR_DECLARATIONS (Grace_beam_engraver); + +protected: + virtual bool valid_start_point (); + virtual bool valid_end_point (); +}; + +Grace_beam_engraver::Grace_beam_engraver () +{ +} + +bool +Grace_beam_engraver::valid_start_point () +{ + Moment n = now_mom (); + + return n.grace_part_ != Rational (0); +} +bool +Grace_beam_engraver::valid_end_point () +{ + return beam_ && valid_start_point (); +} -ADD_THIS_TRANSLATOR(Beam_engraver); +ADD_TRANSLATOR (Grace_beam_engraver, + /* descr */ "Handles Beam events by engraving Beams. If omitted, then notes will " + "be printed with flags instead of beams. Only engraves beams when we " + " are at grace points in time. ", + /* creats*/ "Beam", + /* accepts */ "beam-event", + /* acks */ "stem-interface rest-interface", + /* reads */ "beamMelismaBusy beatLength allowBeamBreak subdivideBeams", + /* write */ "");