X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeam-engraver.cc;h=d9c3ff9ad38d6c8009913d1dddd1390ee315ff30;hb=2745cbd907f8216a4cc1fc5f488ae19efdfdbd10;hp=ac7a02a26b2dbc1ef504bcbd977675c8ae3b187c;hpb=75be12aa75a535af753d6125bfc03da3ee303b36;p=lilypond.git diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc index ac7a02a26b..d9c3ff9ad3 100644 --- a/lily/beam-engraver.cc +++ b/lily/beam-engraver.cc @@ -3,190 +3,370 @@ source file of the GNU LilyPond music typesetter - (c) 1998 Han-Wen Nienhuys + (c) 1998--2003 Han-Wen Nienhuys */ - -#include "beam-engraver.hh" -#include "musical-request.hh" +#include "engraver-group-engraver.hh" +#include "engraver.hh" +#include "event.hh" #include "beam.hh" -#include "grouping.hh" #include "stem.hh" #include "warn.hh" -#include "time-description.hh" +#include "beaming.hh" +#include "score-engraver.hh" +#include "rest.hh" +#include "drul-array.hh" +#include "item.hh" +#include "spanner.hh" + +class Beam_engraver : public Engraver +{ +protected: + Drul_array evs_drul_; + + Spanner *finished_beam_; + Spanner *beam_; + Music * prev_start_ev_; + + Music * now_stop_ev_; + + 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 (); + 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_moment(); + virtual bool valid_end_moment (); + +public: + TRANSLATOR_DECLARATIONS( Beam_engraver ); +}; + + +/* + Hmm. this isn't necessary, since grace beams and normal beams are + always nested. + */ +bool +Beam_engraver::valid_start_moment() +{ + Moment n = now_mom (); + + return n.grace_part_ == Rational (0); +} + +bool +Beam_engraver::valid_end_moment() +{ + return last_stem_added_at_.grace_part_ == Rational(0); +} + Beam_engraver::Beam_engraver () { - beam_p_ = 0; - finished_beam_p_ =0; - finished_grouping_p_ = 0; - grouping_p_ =0; - reqs_drul_[LEFT] = reqs_drul_[RIGHT] =0; + beam_ = 0; + finished_beam_ =0; + finished_beam_info_=0; + beam_info_ =0; + now_stop_ev_ = 0; + evs_drul_[LEFT] = evs_drul_[RIGHT] =0; + prev_start_ev_ =0; } bool -Beam_engraver::do_try_music (Music *m) +Beam_engraver::try_music (Music *m) { - if (Beam_req * c = dynamic_cast(m)) + if (m->is_mus_type ("abort-event")) + { + evs_drul_[START] = 0; + evs_drul_[STOP] = 0; + if (beam_) + beam_->suicide (); + beam_ = 0; + } + else if (m->is_mus_type ("beam-event")) { - Direction d =c->spantype_; + Direction d = to_dir (m->get_mus_property ("span-direction")); - if (d == STOP && !beam_p_) + if (d == STOP && !valid_end_moment()) + return false; + + if (d == START && !valid_start_moment ()) + return false; + + if (d == STOP) { - m->warning (_ ("No Beam to end")); - return false; + SCM m = get_property ("automaticMelismata"); + SCM b = get_property ("autoBeaming"); + if (to_boolean (m) && !to_boolean (b)) + { + set_melisma (false); + } } - reqs_drul_[d ] = c; + + evs_drul_[d ] = m; + return true; + } + else if (m->is_mus_type ("new-beam-event")) + { + Direction d = to_dir (m->get_mus_property ("span-direction")); + if (d == START && !valid_start_moment ()) + return false; + if (d == STOP && !valid_end_moment ()) + return false; + + if (d == START) + evs_drul_[d] = m; + else if (d==STOP) + now_stop_ev_ = m; + return true; } return false; } +void +Beam_engraver::set_melisma (bool m) +{ + daddy_trans_->set_property ("beamMelismaBusy", m ? SCM_BOOL_T :SCM_BOOL_F); +} void -Beam_engraver::do_process_requests () +Beam_engraver::process_music () { - if (reqs_drul_[STOP]) + if (evs_drul_[STOP]) { - if (!beam_p_) - reqs_drul_[STOP]->warning (_("No beam to end")); - finished_beam_p_ = beam_p_; - finished_grouping_p_ = grouping_p_; + prev_start_ev_ =0; + finished_beam_ = beam_; + finished_beam_info_ = beam_info_; - beam_p_ = 0; - grouping_p_ = 0; + beam_info_ =0; + beam_ = 0; } - - if (reqs_drul_[START]) + + if (beam_) + { + top_engraver ()->forbid_breaks (); + } + if (evs_drul_[START]) { - if (beam_p_) + if (beam_) { - reqs_drul_[START]->warning (_ ("Already have a Beam")); + evs_drul_[START]->origin ()->warning (_ ("already have a beam")); return; } - beam_p_ = new Beam; - grouping_p_ = new Rhythmic_grouping; + prev_start_ev_ = evs_drul_[START]; + beam_ = new Spanner (get_property ("Beam")); + SCM smp = get_property ("measurePosition"); + Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0); - Scalar prop = get_property ("beamslopedamping", 0); - if (prop.isnum_b ()) - beam_p_->damping_i_ = prop; - - prop = get_property ("beamquantisation", 0); - if (prop.isnum_b ()) - beam_p_->quantisation_ = (Beam::Quantisation)(int)prop; + beam_start_location_ = mp; + beam_start_mom_ = now_mom (); + + beam_info_ = new Beaming_info_list; + + /* urg, must copy to Auto_beam_engraver too */ - // must set minVerticalAlign == maxVerticalAlign to get sane results - // see input/test/beam-interstaff.ly - prop = get_property ("minVerticalAlign", 0); - if (prop.isnum_b ()) - beam_p_->vertical_align_drul_[MIN] = prop; - - prop = get_property ("maxVerticalAlign", 0); - if (prop.isnum_b ()) - beam_p_->vertical_align_drul_[MAX] = prop; - - announce_element (Score_element_info (beam_p_, reqs_drul_[START])); + announce_grob(beam_, evs_drul_[START]->self_scm()); } + } + void Beam_engraver::typeset_beam () { - if (finished_beam_p_) + if (finished_beam_) { - Rhythmic_grouping const * rg_C = get_staff_info().rhythmic_C_; - rg_C->extend (finished_grouping_p_->interval()); - finished_beam_p_->set_grouping (*rg_C, *finished_grouping_p_); - typeset_element (finished_beam_p_); - finished_beam_p_ = 0; - - delete finished_grouping_p_; - finished_grouping_p_= 0; - - reqs_drul_[STOP] = 0; + finished_beam_info_->beamify(beat_length_, subdivide_beams_); + Beam::set_beaming (finished_beam_, finished_beam_info_); + typeset_grob (finished_beam_); + 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; + evs_drul_ [START] =0; + evs_drul_[STOP] = 0; + + if (beam_) + { + SCM m = get_property ("automaticMelismata"); + SCM b = get_property ("autoBeaming"); + if (to_boolean (m) && !to_boolean (b)) + { + set_melisma (true); + } + subdivide_beams_ = to_boolean(get_property("subdivideBeams")); + beat_length_ = *unsmob_moment (get_property ("beatLength")); + } } 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(); + } } void -Beam_engraver::do_removal_processing () +Beam_engraver::finalize () { typeset_beam (); - if (beam_p_) + if (beam_) { - warning (_ ("Unfinished beam")); - finished_beam_p_ = beam_p_; - finished_grouping_p_ = grouping_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_) - { - Stem* stem_l = dynamic_cast (info.elem_l_); - if (!stem_l) - return; - + if (beam_) + { + if (Rest::has_interface (info.grob_)) + { + info.grob_->add_offset_callback (Beam::rest_collision_callback_proc, Y_AXIS); + } + else if (Stem::has_interface (info.grob_)) + { + Moment now = now_mom(); - Rhythmic_req *rhythmic_req = dynamic_cast (info.req_l_); - if (!rhythmic_req) - { - String s = _ ("Stem must have Rhythmic structure."); - if (info.req_l_) - info.req_l_->warning (s); - else - ::warning (s); + if (!valid_start_moment ()) + return ; + Item *stem = dynamic_cast (info.grob_); + if (Stem::get_beam (stem)) return; - } - - if (rhythmic_req->duration_.durlog_i_<= 2) - { - rhythmic_req->warning (_ ("stem doesn't fit in beam")); - reqs_drul_[LEFT]->warning (_ ("beam was started here")); - return; - } - - /* - TODO: do something sensible if it doesn't fit in the beam. - */ - Moment start = get_staff_info().time_C_->whole_in_measure_; - - if (!grouping_p_->child_fit_b (start)) - { - String s (_ ("please fix me") + ": " - + _f ("stem at %s doesn't fit in beam", now_moment ().str ())); - - if (info.req_l_) - info.req_l_->warning(s); - else - warning (s); - } - else - { - grouping_p_->add_child (start, rhythmic_req->duration ()); - stem_l->flag_i_ = rhythmic_req->duration_.durlog_i_; - beam_p_->add_stem (stem_l); - } - } + Music* m = info.music_cause(); + if (!m->is_mus_type ("rhythmic-event")) + { + String s = _ ("stem must have Rhythmic structure"); + if (info.music_cause ()) + info.music_cause ()->origin ()->warning (s); + else + ::warning (s); + + return; + } + + + last_stem_added_at_ = now; + int durlog = unsmob_duration (m->get_mus_property ("duration"))-> duration_log (); + if (durlog <= 2) + { + m->origin ()->warning (_ ("stem doesn't fit in beam")); + prev_start_ev_->origin ()->warning (_ ("beam was started here")); + /* + don't return, since + + [r4 c8] can just as well be modern notation. + */ + } + + stem->set_grob_property ("duration-log", + scm_int2num (durlog)); + Moment stem_location = now - beam_start_mom_ + beam_start_location_; + beam_info_->add_stem (stem_location, + (durlog- 2) >? 0); + Beam::add_stem (beam_, stem); + } + } +} + + + + + +ENTER_DESCRIPTION(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 new-beam-event abort-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_moment(); + virtual bool valid_end_moment (); +}; + +Grace_beam_engraver::Grace_beam_engraver() +{ +} + +bool +Grace_beam_engraver::valid_start_moment() +{ + Moment n = now_mom (); + + return n.grace_part_ != Rational (0); } +bool +Grace_beam_engraver::valid_end_moment () +{ + return beam_ && last_stem_added_at_.grace_part_ != Rational(0); +} + + + +ENTER_DESCRIPTION(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 abort-event new-beam-event", +/* acks */ "stem-interface rest-interface", +/* reads */ "beamMelismaBusy beatLength subdivideBeams", +/* write */ ""); -ADD_THIS_TRANSLATOR(Beam_engraver);