X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeam-engraver.cc;h=e810b7052d1086d67a54085e64007713d8b42405;hb=947454c5cc430a9627262de4f25274a64789d3c2;hp=d76252ae27be139e23084cfed4902936ed6e89d8;hpb=998986bbd15afaafb24904a777e8be9ba1233799;p=lilypond.git diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc index d76252ae27..e810b7052d 100644 --- a/lily/beam-engraver.cc +++ b/lily/beam-engraver.cc @@ -3,197 +3,331 @@ source file of the GNU LilyPond music typesetter - (c) 1998--1999 Han-Wen Nienhuys + (c) 1998--2004 Han-Wen Nienhuys */ -#include "timing-engraver.hh" -#include "engraver-group-engraver.hh" -#include "beam-engraver.hh" -#include "musical-request.hh" + +#include "engraver.hh" +#include "event.hh" #include "beam.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" +#include "context.hh" + +class Beam_engraver : public Engraver +{ +protected: + Music * start_ev_; + + 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_point (); + virtual bool valid_end_point (); + +public: + 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) + { + start_ev_ = m; + } + else if (d==STOP) { - m->warning (_ ("no beam to end")); - return false; + 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)) + daddy_context_->set_property ("beamMelismaBusy", ml ? SCM_BOOL_T :SCM_BOOL_F); +} void -Beam_engraver::do_process_requests () +Beam_engraver::process_music () { - if (reqs_drul_[STOP]) + if (beam_ && !to_boolean (get_property ("allowBeamBreak"))) { - if (!beam_p_) - reqs_drul_[STOP]->warning (_("no beam to end")); - 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_) + if (start_ev_) { - Score_engraver * e = 0; - Translator * t = daddy_grav_l (); - for (; !e && t; t = t->daddy_trans_l_) + if (beam_) { - e = dynamic_cast (t); - } - - if (!e) - programming_error ("No score engraver!"); - else - e->forbid_breaks (); - } - - if (reqs_drul_[START]) - { - if (beam_p_) - { - 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 Beam; + set_melisma (true); + prev_start_ev_ = start_ev_; + beam_ = make_spanner ("Beam"); + SCM smp = get_property ("measurePosition"); + Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0); - Translator * t = daddy_grav_l ()->get_simple_translator ("Timing_engraver"); - Timing_engraver *timer = dynamic_cast (t); - beam_start_location_ = (t) ? timer->time_.whole_in_measure_ : Moment (0); - beam_start_mom_ = now_mom(); - beam_info_p_ = new Beaming_info_list; - + beam_start_location_ = mp; + beam_start_mom_ = now_mom (); - - Scalar prop = get_property ("beamslopedamping", 0); - if (prop.isnum_b ()) - beam_p_->set_elt_property (damping_scm_sym, gh_int2scm( prop)); + beam_info_ = new Beaming_info_list; - prop = get_property ("beamquantisation", 0); - if (prop.isnum_b ()) - beam_p_->quantisation_ = (Beam::Quantisation)(int)prop; - - announce_element (Score_element_info (beam_p_, reqs_drul_[START])); + /* urg, must copy to Auto_beam_engraver too */ + announce_grob (beam_, start_ev_->self_scm ()); } + } + void Beam_engraver::typeset_beam () { - if (finished_beam_p_) + if (finished_beam_) { - finished_beam_info_p_->beamify (); - - finished_beam_p_->set_beaming (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_); + 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; + start_ev_ = 0; + + if (beam_) + { + 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 (); + set_melisma (false); + } } void -Beam_engraver::do_removal_processing () +Beam_engraver::finalize () { typeset_beam (); - if (beam_p_) + if (beam_) { - prev_start_req_->warning (_ ("Unfinished 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_) { - Stem* stem_l = dynamic_cast (info.elem_l_); - if (!stem_l || stem_l->beam_l_) - return; + 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_point ()) + return ; + + Item *stem = dynamic_cast (info.grob_); + if (Stem::get_beam (stem)) + return; - bool stem_grace = stem_l->get_elt_property (grace_scm_sym) != SCM_BOOL_F; + 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; + } - if (get_property ("weAreGraceContext",0).to_bool () != stem_grace) - return; - 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); - - return; - } - - if (rhythmic_req->duration_.durlog_i_<= 2) - { - rhythmic_req->warning (_ ("stem doesn't fit in beam")); - prev_start_req_->warning (_ ("beam was started here")); - return; - } + last_stem_added_at_ = now; + int durlog = unsmob_duration (m->get_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 - stem_l->flag_i_ = 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); - beam_p_->add_stem (stem_l); + [r4 c8] can just as well be modern notation. + */ + } + + stem->set_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); + } } } -ADD_THIS_TRANSLATOR(Beam_engraver); + + +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", +/* 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 (); +} + + + +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", +/* acks */ "stem-interface rest-interface", +/* reads */ "beamMelismaBusy beatLength allowBeamBreak subdivideBeams", +/* write */ ""); +