X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeam-engraver.cc;h=99c15143bf786564fb0d80d1847f828b51e2a40f;hb=f9efd2c54b174591fa42889557686c7aea356547;hp=25ab6a735eeaf90fc259bf688f5ea9e48393bb00;hpb=0faba210842f1b0dd3863bfa6e2238bfa7384ba5;p=lilypond.git diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc index 25ab6a735e..99c15143bf 100644 --- a/lily/beam-engraver.cc +++ b/lily/beam-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2002 Han-Wen Nienhuys */ #include "engraver-group-engraver.hh" @@ -21,8 +21,9 @@ class Beam_engraver : public Engraver { +protected: Drul_array reqs_drul_; - + Spanner *finished_beam_p_; Spanner *beam_p_; Span_req * prev_start_req_; @@ -35,22 +36,52 @@ class Beam_engraver : public Engraver /// moment (global time) where beam started. Moment beam_start_mom_; - + + bool subdivide_beams_; + Moment beat_length_; + void typeset_beam (); void set_melisma (bool); -protected: - virtual void do_pre_move_processing (); - virtual void do_post_move_processing (); - virtual void do_removal_processing (); - virtual void acknowledge_element (Score_element_info); - virtual bool do_try_music (Music*); - virtual void do_process_music (); + + 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: - Beam_engraver (); - VIRTUAL_COPY_CONS (Translator); + 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; @@ -59,14 +90,16 @@ Beam_engraver::Beam_engraver () beam_info_p_ =0; reqs_drul_[LEFT] = reqs_drul_[RIGHT] =0; prev_start_req_ =0; + } bool -Beam_engraver::do_try_music (Music *m) +Beam_engraver::try_music (Music *m) { - if (Span_req * c = dynamic_cast(m)) + if (Span_req * c = dynamic_cast (m)) { - if (c->span_type_str_ == "abort") + if (scm_equal_p (c->get_mus_property ("span-type"), + ly_str02scm ("abort")) == SCM_BOOL_T) { reqs_drul_[START] = 0; reqs_drul_[STOP] = 0; @@ -74,22 +107,23 @@ Beam_engraver::do_try_music (Music *m) beam_p_->suicide (); beam_p_ = 0; } - else if (c->span_type_str_ == "beam") + else if (scm_equal_p (c->get_mus_property ("span-type"), + ly_str02scm ("beam")) == SCM_BOOL_T) { - - Direction d =c->span_dir_; + Direction d =c->get_span_dir (); - if (d == STOP && !beam_p_) - { - m->origin ()->warning (_ ("can't find start of beam")); - return false; - } - if(d == STOP) + if (d == STOP && !valid_end_moment()) + return false; + + if (d == START && !valid_start_moment ()) + return false; + + if (d == STOP) { 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 (false); } @@ -108,14 +142,11 @@ Beam_engraver::set_melisma (bool m) daddy_trans_l_->set_property ("beamMelismaBusy", m ? SCM_BOOL_T :SCM_BOOL_F); } - void -Beam_engraver::do_process_music () +Beam_engraver::process_music () { if (reqs_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_; @@ -125,21 +156,10 @@ Beam_engraver::do_process_music () } - if (beam_p_ && !to_boolean (get_property ("weAreGraceContext"))) + if (beam_p_) { - Score_engraver * e = 0; - Translator * t = daddy_grav_l (); - for (; !e && t; t = t->daddy_trans_l_) - { - e = dynamic_cast (t); - } - - if (!e) - programming_error ("No score engraver!"); - else - e->forbid_breaks (); + top_engraver ()->forbid_breaks (); } - if (reqs_drul_[START]) { if (beam_p_) @@ -149,113 +169,114 @@ Beam_engraver::do_process_music () } prev_start_req_ = reqs_drul_[START]; - beam_p_ = new Spanner (get_property ("basicBeamProperties")); - Beam::set_interface (beam_p_); - + beam_p_ = new Spanner (get_property ("Beam")); SCM smp = get_property ("measurePosition"); - Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0); + 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_start_mom_ = now_mom (); + beam_info_p_ = new Beaming_info_list; /* urg, must copy to Auto_beam_engraver too */ - announce_element (beam_p_, reqs_drul_[START]); + announce_grob(beam_p_, reqs_drul_[START]->self_scm()); } + } + void Beam_engraver::typeset_beam () { if (finished_beam_p_) { - finished_beam_info_p_->beamify (); - + finished_beam_info_p_->beamify(beat_length_, subdivide_beams_); Beam::set_beaming (finished_beam_p_, finished_beam_info_p_); - typeset_element (finished_beam_p_); + typeset_grob (finished_beam_p_); delete finished_beam_info_p_; finished_beam_info_p_ =0; finished_beam_p_ = 0; - - reqs_drul_[STOP] = 0; } } void -Beam_engraver::do_post_move_processing () +Beam_engraver::start_translation_timestep () { reqs_drul_ [START] =0; - if(beam_p_) { - SCM m = get_property ("automaticMelismata"); - SCM b = get_property("noAutoBeaming"); - if (to_boolean (m) && to_boolean(b)) { - set_melisma (true); + reqs_drul_[STOP] = 0; + + if (beam_p_) + { + 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 (); } void -Beam_engraver::do_removal_processing () +Beam_engraver::finalize () { typeset_beam (); if (beam_p_) { prev_start_req_->origin ()->warning (_ ("unterminated beam")); -#if 0 - finished_beam_p_ = beam_p_; - finished_beam_info_p_ = beam_info_p_; - typeset_beam (); -#else + + /* + we don't typeset it, (we used to, but it was commented + out. Reason unknown) */ beam_p_->suicide (); delete beam_info_p_; -#endif } } void -Beam_engraver::acknowledge_element (Score_element_info info) +Beam_engraver::acknowledge_grob (Grob_info info) { if (beam_p_) { - if (Rest::has_interface (info.elem_l_)) + if (Rest::has_interface (info.grob_l_)) { - info.elem_l_->add_offset_callback (Beam::rest_collision_callback, Y_AXIS); + info.grob_l_->add_offset_callback (Beam::rest_collision_callback_proc, Y_AXIS); } - else if (Stem::has_interface (info.elem_l_)) + else if (Stem::has_interface (info.grob_l_)) { - Item *stem_l = dynamic_cast (info.elem_l_); - if (Stem::beam_l (stem_l)) - return; + Moment now = now_mom(); - bool stem_grace = stem_l->get_elt_property ("grace") == SCM_BOOL_T; - - SCM wg =get_property ("weAreGraceContext"); - bool wgb= to_boolean (wg); - - if (wgb!= stem_grace) + if (!valid_start_moment ()) + return ; + + Item *stem_l = dynamic_cast (info.grob_l_); + if (Stem::beam_l (stem_l)) return; - Rhythmic_req *rhythmic_req = dynamic_cast (info.req_l_); + Rhythmic_req *rhythmic_req = dynamic_cast (info.music_cause ()); if (!rhythmic_req) { String s = _ ("stem must have Rhythmic structure"); - if (info.req_l_) - info.req_l_->origin ()->warning (s); + if (info.music_cause ()) + info.music_cause ()->origin ()->warning (s); else ::warning (s); return; } - if (rhythmic_req->duration_.durlog_i_<= 2) + + 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")); @@ -266,11 +287,11 @@ Beam_engraver::acknowledge_element (Score_element_info info) */ } - stem_l->set_elt_property ("duration-log", - gh_int2scm (rhythmic_req->duration_.durlog_i_)); - Moment stem_location = now_mom () - beam_start_mom_ + beam_start_location_; + stem_l->set_grob_property ("duration-log", + gh_int2scm (durlog)); + Moment stem_location = now - beam_start_mom_ + beam_start_location_; beam_info_p_->add_stem (stem_location, - (rhythmic_req->duration_.durlog_i_ - 2) >? 1); + (durlog- 2) >? 0); Beam::add_stem (beam_p_, stem_l); } } @@ -278,5 +299,55 @@ Beam_engraver::acknowledge_element (Score_element_info info) -ADD_THIS_TRANSLATOR(Beam_engraver); + + +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 */ ""); + + +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_p_ && last_stem_added_at_.grace_part_ != Rational(0); +} + + + +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 */ "");