X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeam-engraver.cc;h=cad443299c789b79f8402e937238e6a28d80c20c;hb=78f563e58de2de28fd17067fd434a42cb9f055a5;hp=9b3be1c57388580e472a07a415f7356d01dfb889;hpb=3471866d047b2e22f6d42eedb936d5eddcb5a06a;p=lilypond.git diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc index 9b3be1c573..cad443299c 100644 --- a/lily/beam-engraver.cc +++ b/lily/beam-engraver.cc @@ -1,35 +1,43 @@ -/* - beam-engraver.cc -- implement Beam_engraver - +/* + beam-engraver.cc -- implement Beam_engraver + source file of the GNU LilyPond music typesetter - - (c) 1998--2002 Han-Wen Nienhuys - - */ -#include "engraver-group-engraver.hh" -#include "engraver.hh" -#include "musical-request.hh" + + (c) 1998--2006 Han-Wen Nienhuys +*/ + #include "beam.hh" -#include "stem.hh" -#include "warn.hh" -#include "beaming.hh" -#include "score-engraver.hh" -#include "rest.hh" +#include "beaming-pattern.hh" +#include "context.hh" #include "drul-array.hh" +#include "duration.hh" +#include "engraver.hh" +#include "international.hh" #include "item.hh" +#include "rest.hh" #include "spanner.hh" +#include "stream-event.hh" +#include "stem.hh" +#include "warn.hh" + +#include "translator.icc" class Beam_engraver : public Engraver { -protected: - Drul_array reqs_drul_; - +public: + DECLARE_ACKNOWLEDGER (stem); + DECLARE_ACKNOWLEDGER (rest); +protected: + Stream_event *start_ev_; + Spanner *finished_beam_; Spanner *beam_; - Span_req * prev_start_req_; + Stream_event *prev_start_ev_; + + Stream_event *now_stop_ev_; - Beaming_info_list * beam_info_; - Beaming_info_list * finished_beam_info_; + Beaming_pattern *beam_info_; + Beaming_pattern *finished_beam_info_; /// location within measure where beam started. Moment beam_start_location_; @@ -44,31 +52,26 @@ protected: void set_melisma (bool); Moment last_stem_added_at_; - - - - virtual void stop_translation_timestep (); - virtual void start_translation_timestep (); + void stop_translation_timestep (); + void start_translation_timestep (); virtual void finalize (); - virtual void acknowledge_grob (Grob_info); - virtual bool try_music (Music*); - virtual void process_music (); + void process_music (); - virtual bool valid_start_moment(); - virtual bool valid_end_moment (); - + virtual bool valid_start_point (); + virtual bool valid_end_point (); + + DECLARE_TRANSLATOR_LISTENER (beam); public: - TRANSLATOR_DECLARATIONS( Beam_engraver ); + TRANSLATOR_DECLARATIONS (Beam_engraver); }; - /* Hmm. this isn't necessary, since grace beams and normal beams are always nested. - */ +*/ bool -Beam_engraver::valid_start_moment() +Beam_engraver::valid_start_point () { Moment n = now_mom (); @@ -76,126 +79,82 @@ 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) +IMPLEMENT_TRANSLATOR_LISTENER (Beam_engraver, beam); +void +Beam_engraver::listen_beam (Stream_event *ev) { - if (Span_req * c = dynamic_cast (m)) - { - if (scm_equal_p (c->get_mus_property ("span-type"), - scm_makfrom0str ("abort")) == SCM_BOOL_T) - { - reqs_drul_[START] = 0; - reqs_drul_[STOP] = 0; - if (beam_) - beam_->suicide (); - beam_ = 0; - } - else if (scm_equal_p (c->get_mus_property ("span-type"), - scm_makfrom0str ("beam")) == SCM_BOOL_T) - { - Direction d =c->get_span_dir (); - - - if (d == STOP && !valid_end_moment()) - return false; + Direction d = to_dir (ev->get_property ("span-direction")); - if (d == START && !valid_start_moment ()) - return false; - - if (d == STOP) - { - SCM m = get_property ("automaticMelismata"); - SCM b = get_property ("autoBeaming"); - if (to_boolean (m) && !to_boolean (b)) - { - set_melisma (false); - } - } - - reqs_drul_[d ] = c; - return true; - } - } - return false; + if (d == START && valid_start_point ()) + ASSIGN_EVENT_ONCE (start_ev_, ev); + else if (d == STOP && valid_end_point ()) + ASSIGN_EVENT_ONCE (now_stop_ev_, ev); } 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]) - { - prev_start_req_ =0; - finished_beam_ = beam_; - finished_beam_info_ = beam_info_; + if (beam_ && !to_boolean (get_property ("allowBeamBreak"))) + context ()->get_score_context ()->set_property ("forbidBreak", SCM_BOOL_T); - beam_info_ =0; - beam_ = 0; - } - - - 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 (); - - beam_info_ = new Beaming_info_list; - + + beam_info_ = new Beaming_pattern; /* urg, must copy to Auto_beam_engraver too */ - - announce_grob(beam_, reqs_drul_[START]->self_scm()); } - } - void Beam_engraver::typeset_beam () { if (finished_beam_) { - finished_beam_info_->beamify(beat_length_, subdivide_beams_); + if (!finished_beam_->get_bound (RIGHT)) + finished_beam_->set_bound (RIGHT, finished_beam_->get_bound (LEFT)); + + finished_beam_info_->beamify (context ()); 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; } } @@ -203,19 +162,11 @@ 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); } } @@ -223,6 +174,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 @@ -231,7 +193,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 @@ -242,112 +204,144 @@ Beam_engraver::finalize () } void -Beam_engraver::acknowledge_grob (Grob_info info) +Beam_engraver::acknowledge_rest (Grob_info info) { - if (beam_) + if (beam_ + && !scm_is_number (info.grob ()->get_property_data ("staff-position"))) { - 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(); - - if (!valid_start_moment ()) - return ; - - Item *stem = dynamic_cast (info.grob_); - if (Stem::get_beam (stem)) - return; - - Rhythmic_req *rhythmic_req = dynamic_cast (info.music_cause ()); - if (!rhythmic_req) - { - 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 (rhythmic_req->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")); - /* - 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); - } + chain_offset_callback (info.grob(), + Beam::rest_collision_callback_proc, Y_AXIS); } } +void +Beam_engraver::acknowledge_stem (Grob_info info) +{ + if (!beam_) + return; + + Moment now = now_mom (); + if (!valid_start_point ()) + return; + Item *stem = dynamic_cast (info.grob ()); + if (Stem::get_beam (stem)) + return; -ENTER_DESCRIPTION(Beam_engraver, -/* descr */ "Handles Beam_requests by engraving Beams. If omitted, then notes will be -printed with flags instead of beams.", -/* creats*/ "Beam", -/* acks */ "stem-interface rest-interface", -/* reads */ "beamMelismaBusy beatLength subdivideBeams", -/* write */ ""); + + + Stream_event *ev = info.ultimate_event_cause (); + if (!ev->in_event_class ("rhythmic-event")) + { + info.grob ()->warning (_ ("stem must have Rhythmic structure")); + return; + } + + last_stem_added_at_ = now; + int durlog = unsmob_duration (ev->get_property ("duration"))->duration_log (); + if (durlog <= 2) + { + ev->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_property ("duration-log", + scm_from_int (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_ACKNOWLEDGER (Beam_engraver, stem); +ADD_ACKNOWLEDGER (Beam_engraver, rest); + +ADD_TRANSLATOR (Beam_engraver, + /* doc */ + "Handles Beam events by engraving Beams. If omitted, then notes will be " + "printed with flags instead of beams.", + + /* create */ "Beam", + + /* read */ + "beamMelismaBusy " + "beatLength " + "subdivideBeams " + , + /* write */ + "forbidBreak"); class Grace_beam_engraver : public Beam_engraver { public: - TRANSLATOR_DECLARATIONS(Grace_beam_engraver); + TRANSLATOR_DECLARATIONS (Grace_beam_engraver); + DECLARE_TRANSLATOR_LISTENER (beam); + 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 (); return n.grace_part_ != Rational (0); } - bool -Grace_beam_engraver::valid_end_moment () +Grace_beam_engraver::valid_end_point () +{ + return beam_ && valid_start_point (); +} + +/* + Ugh, C&P code. + */ +IMPLEMENT_TRANSLATOR_LISTENER (Grace_beam_engraver, beam); +void +Grace_beam_engraver::listen_beam (Stream_event *ev) { - return beam_ && last_stem_added_at_.grace_part_ != Rational(0); + Direction d = to_dir (ev->get_property ("span-direction")); + + if (d == START && valid_start_point ()) + start_ev_ = ev; + else if (d == STOP && valid_end_point ()) + now_stop_ev_ = ev; } +ADD_ACKNOWLEDGER (Grace_beam_engraver, stem); +ADD_ACKNOWLEDGER (Grace_beam_engraver, rest); + +ADD_TRANSLATOR (Grace_beam_engraver, + + /* doc */ -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. -", -/* creats*/ "Beam", -/* acks */ "stem-interface rest-interface", -/* reads */ "beamMelismaBusy beatLength subdivideBeams", -/* write */ ""); + "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. ", + + /* create */ "Beam", + /* read */ + "beamMelismaBusy " + "beatLength " + "allowBeamBreak " + "subdivideBeams " + , + /* write */ "");