X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeam-engraver.cc;h=6bd0be9e6303900a769f705a8d91ce9b5fc8ebe1;hb=917a5ab05640a6f1b387d0c7260be875f12f9d9e;hp=71c74fbec6a58cc8b9f6299be57caf661574993e;hpb=785129d2fc91bb9f6ea70abb0c4814a97f18236c;p=lilypond.git diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc index 71c74fbec6..6bd0be9e63 100644 --- a/lily/beam-engraver.cc +++ b/lily/beam-engraver.cc @@ -3,12 +3,12 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2002 Han-Wen Nienhuys + (c) 1998--2003 Han-Wen Nienhuys */ #include "engraver-group-engraver.hh" #include "engraver.hh" -#include "musical-request.hh" +#include "event.hh" #include "beam.hh" #include "stem.hh" #include "warn.hh" @@ -21,14 +21,17 @@ class Beam_engraver : public Engraver { - Drul_array reqs_drul_; +protected: + Drul_array evs_drul_; - Spanner *finished_beam_p_; - Spanner *beam_p_; - Span_req * prev_start_req_; + Spanner *finished_beam_; + Spanner *beam_; + Music * prev_start_ev_; - Beaming_info_list * beam_info_p_; - Beaming_info_list * finished_beam_info_p_; + 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_; @@ -37,11 +40,13 @@ class Beam_engraver : public Engraver Moment beam_start_mom_; bool subdivide_beams_; + Moment beat_length_; void typeset_beam (); void set_melisma (bool); -protected: - virtual void stop_translation_timestep (); + + Moment last_stem_added_at_; + virtual void stop_translation_timestep (); virtual void start_translation_timestep (); virtual void finalize (); @@ -49,55 +54,70 @@ protected: 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_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; + evs_drul_[LEFT] = evs_drul_[RIGHT] =0; + prev_start_ev_ =0; } bool Beam_engraver::try_music (Music *m) { - if (Span_req * c = dynamic_cast (m)) + if (m->is_mus_type ("abort-event")) { - if (scm_equal_p (c->get_mus_property ("span-type"), - ly_str02scm ("abort")) == SCM_BOOL_T) + evs_drul_[START] = 0; + evs_drul_[STOP] = 0; + if (beam_) + beam_->suicide (); + beam_ = 0; + } + else if (m->is_mus_type ("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) { - reqs_drul_[START] = 0; - reqs_drul_[STOP] = 0; - if (beam_p_) - beam_p_->suicide (); - beam_p_ = 0; - } - else if (scm_equal_p (c->get_mus_property ("span-type"), - ly_str02scm ("beam")) == SCM_BOOL_T) - { - - Direction d =c->get_span_dir (); - - if (d == STOP) - { - SCM m = get_property ("automaticMelismata"); - SCM b = get_property ("noAutoBeaming"); - if (to_boolean (m) && to_boolean (b)) - { - set_melisma (false); - } - } - - reqs_drul_[d ] = c; - return true; + now_stop_ev_ = m; } + return true; } return false; } @@ -105,50 +125,48 @@ Beam_engraver::try_music (Music *m) void Beam_engraver::set_melisma (bool m) { - daddy_trans_l_->set_property ("beamMelismaBusy", m ? SCM_BOOL_T :SCM_BOOL_F); + daddy_trans_->set_property ("beamMelismaBusy", m ? SCM_BOOL_T :SCM_BOOL_F); } void Beam_engraver::process_music () { - if (reqs_drul_[STOP]) + if (evs_drul_[STOP]) { - if (!beam_p_) - reqs_drul_[STOP]->origin ()->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; - } + prev_start_ev_ =0; + finished_beam_ = beam_; + finished_beam_info_ = beam_info_; + beam_info_ =0; + beam_ = 0; + } - if (beam_p_) + if (beam_ && !to_boolean (get_property ("allowBeamBreak"))) { top_engraver ()->forbid_breaks (); } - if (reqs_drul_[START]) + + if (evs_drul_[START]) { - if (beam_p_) + if (beam_) { - reqs_drul_[START]->origin ()->warning (_ ("already have a beam")); + evs_drul_[START]->origin ()->warning (_ ("already have a beam")); return; } - prev_start_req_ = reqs_drul_[START]; - beam_p_ = new Spanner (get_property ("Beam")); + 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); beam_start_location_ = mp; beam_start_mom_ = now_mom (); - beam_info_p_ = new Beaming_info_list; + beam_info_ = new Beaming_info_list; /* urg, must copy to Auto_beam_engraver too */ - announce_grob(beam_p_, reqs_drul_[START]->self_scm()); + announce_grob(beam_, evs_drul_[START]->self_scm()); } } @@ -157,34 +175,33 @@ Beam_engraver::process_music () void Beam_engraver::typeset_beam () { - if (finished_beam_p_) + if (finished_beam_) { - finished_beam_info_p_->beamify(*unsmob_moment (get_property ("beatLength")), - subdivide_beams_); - - Beam::set_beaming (finished_beam_p_, finished_beam_info_p_); - typeset_grob (finished_beam_p_); - delete finished_beam_info_p_; - finished_beam_info_p_ =0; - finished_beam_p_ = 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::start_translation_timestep () { - reqs_drul_ [START] =0; - reqs_drul_[STOP] = 0; + evs_drul_ [START] =0; + evs_drul_[STOP] = 0; - if (beam_p_) + if (beam_) { SCM m = get_property ("automaticMelismata"); - SCM b = get_property ("noAutoBeaming"); - if (to_boolean (m) && to_boolean (b)) + SCM b = get_property ("autoBeaming"); + if (to_boolean (m) && !to_boolean (b)) { set_melisma (true); } - subdivide_beams_ = to_boolean(get_property("subdivideBeams")); + subdivide_beams_ = to_boolean(get_property("subdivideBeams")); + beat_length_ = *unsmob_moment (get_property ("beatLength")); } } @@ -192,46 +209,62 @@ void 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(); + + if (to_boolean (get_property ("automaticMelismata")) + && !to_boolean (get_property ("autoBeaming"))) + { + set_melisma (false); + } + } } void Beam_engraver::finalize () { typeset_beam (); - if (beam_p_) + if (beam_) { - prev_start_req_->origin ()->warning (_ ("unterminated beam")); + prev_start_ev_->origin ()->warning (_ ("unterminated beam")); /* we don't typeset it, (we used to, but it was commented out. Reason unknown) */ - beam_p_->suicide (); - delete beam_info_p_; + beam_->suicide (); + delete beam_info_; } } void Beam_engraver::acknowledge_grob (Grob_info info) { - if (beam_p_) + if (beam_) { - if (Rest::has_interface (info.grob_l_)) + if (Rest::has_interface (info.grob_)) { - info.grob_l_->add_offset_callback (Beam::rest_collision_callback_proc, Y_AXIS); + info.grob_->add_offset_callback (Beam::rest_collision_callback_proc, Y_AXIS); } - else if (Stem::has_interface (info.grob_l_)) + else if (Stem::has_interface (info.grob_)) { Moment now = now_mom(); - if(bool (now.grace_part_ ) != bool (beam_start_mom_.grace_part_)) + if (!valid_start_moment ()) return ; - Item *stem_l = dynamic_cast (info.grob_l_); - if (Stem::beam_l (stem_l)) + Item *stem = dynamic_cast (info.grob_); + if (Stem::get_beam (stem)) return; - Rhythmic_req *rhythmic_req = dynamic_cast (info.music_cause ()); - if (!rhythmic_req) + Music* m = info.music_cause(); + if (!m->is_mus_type ("rhythmic-event")) { String s = _ ("stem must have Rhythmic structure"); if (info.music_cause ()) @@ -242,11 +275,13 @@ Beam_engraver::acknowledge_grob (Grob_info info) return; } - int durlog = unsmob_duration (rhythmic_req->get_mus_property ("duration"))-> duration_log (); + + last_stem_added_at_ = now; + int durlog = unsmob_duration (m->get_mus_property ("duration"))-> duration_log (); if (durlog <= 2) { - rhythmic_req->origin ()->warning (_ ("stem doesn't fit in beam")); - prev_start_req_->origin ()->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 @@ -254,12 +289,12 @@ Beam_engraver::acknowledge_grob (Grob_info info) */ } - stem_l->set_grob_property ("duration-log", - gh_int2scm (durlog)); + stem->set_grob_property ("duration-log", + scm_int2num (durlog)); Moment stem_location = now - beam_start_mom_ + beam_start_location_; - beam_info_p_->add_stem (stem_location, + beam_info_->add_stem (stem_location, (durlog- 2) >? 0); - Beam::add_stem (beam_p_, stem_l); + Beam::add_stem (beam_, stem); } } } @@ -269,9 +304,54 @@ Beam_engraver::acknowledge_grob (Grob_info info) ENTER_DESCRIPTION(Beam_engraver, -/* descr */ "Handles Beam_requests by engraving Beams. If omitted, then notes will be -printed with flags instead of beams.", +/* descr */ "Handles Beam events by engraving Beams. If omitted, then notes will be " +"printed with flags instead of beams.", +/* creats*/ "Beam", +/* accepts */ "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", -/* acks */ "stem-interface rest-interface", -/* reads */ "beamMelismaBusy subdivideBeams", +/* accepts */ "beam-event abort-event", +/* acks */ "stem-interface rest-interface", +/* reads */ "beamMelismaBusy beatLength allowBeamBreak subdivideBeams", /* write */ ""); +