X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeam-engraver.cc;h=1e686f1c6521f3b31133def2e5d2f7e1770b357a;hb=15c43df3abc82ef71c674d7a7e4e4b6951b38187;hp=a4ad77040023d4e22510f90744f6c3ef102ee83d;hpb=1b9fc29140bd1d9345f784595afd22158876dfb7;p=lilypond.git diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc index a4ad770400..1e686f1c65 100644 --- a/lily/beam-engraver.cc +++ b/lily/beam-engraver.cc @@ -3,12 +3,11 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2002 Han-Wen Nienhuys + (c) 1998--2004 Han-Wen Nienhuys */ -#include "engraver-group-engraver.hh" + #include "engraver.hh" -#include "request.hh" #include "beam.hh" #include "stem.hh" #include "warn.hh" @@ -18,16 +17,19 @@ #include "drul-array.hh" #include "item.hh" #include "spanner.hh" +#include "context.hh" class Beam_engraver : public Engraver { protected: - Drul_array reqs_drul_; + Music * start_ev_; Spanner *finished_beam_; Spanner *beam_; - Music * prev_start_req_; + Music * prev_start_ev_; + Music * now_stop_ev_; + Beaming_info_list * beam_info_; Beaming_info_list * finished_beam_info_; @@ -44,9 +46,6 @@ protected: void set_melisma (bool); Moment last_stem_added_at_; - - - virtual void stop_translation_timestep (); virtual void start_translation_timestep (); virtual void finalize (); @@ -55,11 +54,11 @@ protected: virtual bool try_music (Music*); virtual void process_music (); - virtual bool valid_start_moment(); - virtual bool valid_end_moment (); + virtual bool valid_start_point (); + virtual bool valid_end_point (); public: - TRANSLATOR_DECLARATIONS( Beam_engraver ); + TRANSLATOR_DECLARATIONS (Beam_engraver); }; @@ -68,7 +67,7 @@ public: always nested. */ bool -Beam_engraver::valid_start_moment() +Beam_engraver::valid_start_point () { Moment n = now_mom (); @@ -76,96 +75,74 @@ Beam_engraver::valid_start_moment() } bool -Beam_engraver::valid_end_moment() +Beam_engraver::valid_end_point () { - return last_stem_added_at_.grace_part_ == Rational(0); + return valid_start_point (); } - Beam_engraver::Beam_engraver () { beam_ = 0; - finished_beam_ =0; - finished_beam_info_=0; - beam_info_ =0; - reqs_drul_[LEFT] = reqs_drul_[RIGHT] =0; - prev_start_req_ =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::try_music (Music *m) { - if (m->is_mus_type ("abort-event")) - { - reqs_drul_[START] = 0; - reqs_drul_[STOP] = 0; - if (beam_) - beam_->suicide (); - beam_ = 0; - } - else if (m->is_mus_type ("beam-event")) + if (m->is_mus_type ("beam-event")) { - Direction d = to_dir (m->get_mus_property ("span-direction")); - - if (d == STOP && !valid_end_moment()) + Direction d = to_dir (m->get_property ("span-direction")); + if (d == START && !valid_start_point ()) return false; - - if (d == START && !valid_start_moment ()) + if (d == STOP && !valid_end_point ()) return false; - - if (d == STOP) + + if (d == START) { - SCM m = get_property ("automaticMelismata"); - SCM b = get_property ("autoBeaming"); - if (to_boolean (m) && !to_boolean (b)) - { - set_melisma (false); - } + start_ev_ = m; + } + else if (d == STOP) + { + now_stop_ev_ = m; } - - reqs_drul_[d ] = m; return true; } return false; } void -Beam_engraver::set_melisma (bool m) +Beam_engraver::set_melisma (bool ml) { - daddy_trans_->set_property ("beamMelismaBusy", m ? SCM_BOOL_T :SCM_BOOL_F); + SCM b = get_property ("autoBeaming"); + if (!to_boolean (b)) + context ()->set_property ("beamMelismaBusy", ml ? SCM_BOOL_T :SCM_BOOL_F); } void Beam_engraver::process_music () { - if (reqs_drul_[STOP]) + if (beam_ && !to_boolean (get_property ("allowBeamBreak"))) { - prev_start_req_ =0; - finished_beam_ = beam_; - finished_beam_info_ = beam_info_; - - beam_info_ =0; - beam_ = 0; + get_score_engraver ()->forbid_breaks (); } - - if (beam_) - { - top_engraver ()->forbid_breaks (); - } - if (reqs_drul_[START]) + if (start_ev_) { if (beam_) { - reqs_drul_[START]->origin ()->warning (_ ("already have a beam")); + start_ev_->origin ()->warning (_ ("already have a beam")); return; } - prev_start_req_ = reqs_drul_[START]; - beam_ = new Spanner (get_property ("Beam")); - 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 (); @@ -173,8 +150,6 @@ Beam_engraver::process_music () beam_info_ = new Beaming_info_list; /* urg, must copy to Auto_beam_engraver too */ - - announce_grob(beam_, reqs_drul_[START]->self_scm()); } } @@ -185,11 +160,11 @@ Beam_engraver::typeset_beam () { if (finished_beam_) { - finished_beam_info_->beamify(beat_length_, subdivide_beams_); + 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_info_ = 0; finished_beam_ = 0; } } @@ -197,19 +172,14 @@ Beam_engraver::typeset_beam () void Beam_engraver::start_translation_timestep () { - reqs_drul_ [START] =0; - reqs_drul_[STOP] = 0; + start_ev_ = 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")); + set_melisma (true); + + subdivide_beams_ = to_boolean (get_property ("subdivideBeams")); + beat_length_ = robust_scm2moment (get_property ("beatLength"), Moment (1,4)); } } @@ -217,6 +187,17 @@ 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 (); + set_melisma (false); + } } void @@ -225,7 +206,7 @@ Beam_engraver::finalize () typeset_beam (); 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 @@ -246,16 +227,16 @@ Beam_engraver::acknowledge_grob (Grob_info info) } else if (Stem::has_interface (info.grob_)) { - Moment now = now_mom(); + Moment now = now_mom (); - if (!valid_start_moment ()) + if (!valid_start_point ()) return ; Item *stem = dynamic_cast (info.grob_); if (Stem::get_beam (stem)) return; - Music* m = info.music_cause(); + Music* m = info.music_cause (); if (!m->is_mus_type ("rhythmic-event")) { String s = _ ("stem must have Rhythmic structure"); @@ -269,11 +250,11 @@ Beam_engraver::acknowledge_grob (Grob_info info) last_stem_added_at_ = now; - int durlog = unsmob_duration (m->get_mus_property ("duration"))-> duration_log (); + int durlog = unsmob_duration (m->get_property ("duration"))-> duration_log (); if (durlog <= 2) { m->origin ()->warning (_ ("stem doesn't fit in beam")); - prev_start_req_->origin ()->warning (_ ("beam was started here")); + prev_start_ev_->origin ()->warning (_ ("beam was started here")); /* don't return, since @@ -281,7 +262,7 @@ Beam_engraver::acknowledge_grob (Grob_info info) */ } - stem->set_grob_property ("duration-log", + stem->set_property ("duration-log", scm_int2num (durlog)); Moment stem_location = now - beam_start_mom_ + beam_start_location_; beam_info_->add_stem (stem_location, @@ -295,11 +276,11 @@ 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.", +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 abort-event", +/* accepts */ "beam-event", /* acks */ "stem-interface rest-interface", /* reads */ "beamMelismaBusy beatLength subdivideBeams", /* write */ ""); @@ -308,19 +289,19 @@ printed with flags instead of beams.", class Grace_beam_engraver : public Beam_engraver { public: - TRANSLATOR_DECLARATIONS(Grace_beam_engraver); + TRANSLATOR_DECLARATIONS (Grace_beam_engraver); protected: - virtual bool valid_start_moment(); - virtual bool valid_end_moment (); + virtual bool valid_start_point (); + virtual bool valid_end_point (); }; -Grace_beam_engraver::Grace_beam_engraver() +Grace_beam_engraver::Grace_beam_engraver () { } bool -Grace_beam_engraver::valid_start_moment() +Grace_beam_engraver::valid_start_point () { Moment n = now_mom (); @@ -329,21 +310,21 @@ Grace_beam_engraver::valid_start_moment() bool -Grace_beam_engraver::valid_end_moment () +Grace_beam_engraver::valid_end_point () { - return beam_ && last_stem_added_at_.grace_part_ != Rational(0); + return beam_ && valid_start_point (); } -ENTER_DESCRIPTION(Grace_beam_engraver, -/* descr */ "Handles Beam_requests 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. -", +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 abort-event", +/* accepts */ "beam-event", /* acks */ "stem-interface rest-interface", -/* reads */ "beamMelismaBusy beatLength subdivideBeams", +/* reads */ "beamMelismaBusy beatLength allowBeamBreak subdivideBeams", /* write */ "");