X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fauto-beam-engraver.cc;h=4156afeffa886b7426a8f02f3d163df35b6d9537;hb=f459e523e2df1d26a854b4ff1e1d2f18189a7287;hp=0690d1ccc84201d44b116a1ac79e65fa89fb1062;hpb=851513b7710283de2111ceeefb909cd8093bdb11;p=lilypond.git diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc index 0690d1ccc8..4156afeffa 100644 --- a/lily/auto-beam-engraver.cc +++ b/lily/auto-beam-engraver.cc @@ -3,12 +3,12 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2002 Jan Nieuwenhuizen + (c) 1999--2004 Jan Nieuwenhuizen */ #include "beaming.hh" -#include "musical-request.hh" +#include "event.hh" #include "beam.hh" #include "stem.hh" #include "warn.hh" @@ -18,10 +18,10 @@ #include "engraver.hh" #include "item.hh" #include "spanner.hh" +#include "duration.hh" +#include "context.hh" /* - TODO: figure what to do in grace? - TODO: documentme. */ class Auto_beam_engraver : public Engraver @@ -30,6 +30,8 @@ class Auto_beam_engraver : public Engraver protected: virtual void stop_translation_timestep (); virtual void start_translation_timestep (); + virtual void process_music (); + virtual bool try_music (Music*); virtual void finalize (); virtual void acknowledge_grob (Grob_info); virtual void process_acknowledged_grobs (); @@ -38,22 +40,23 @@ private: bool test_moment (Direction, Moment); void consider_begin (Moment); void consider_end (Moment); - Spanner* create_beam_p (); + Spanner* create_beam (); void begin_beam (); void end_beam (); void junk_beam (); - bool same_grace_state_b (Grob* e); + bool is_same_grace_state (Grob* e); void typeset_beam (); + Music *forbid_; /* shortest_mom is the shortest note in the beam. */ Moment shortest_mom_; - Spanner *finished_beam_p_; - Link_array* stem_l_arr_p_; + Spanner *finished_beam_; + Link_array* stems_; - int count_i_; + int count_; Moment last_add_mom_; /* Projected ending of the beam we're working on. @@ -66,25 +69,54 @@ private: Moment beat_length_; // We act as if beam were created, and start a grouping anyway. - Beaming_info_list*grouping_p_; + Beaming_info_list*grouping_; SCM beam_settings_ ; // ugh. should protect ? - Beaming_info_list*finished_grouping_p_; + Beaming_info_list*finished_grouping_; }; +void +Auto_beam_engraver::process_music () +{ + if (gh_string_p (get_property ("whichBar"))) + { + consider_end (shortest_mom_); + junk_beam (); + } + + if (forbid_) + { + consider_end (shortest_mom_); + junk_beam (); + } +} Auto_beam_engraver::Auto_beam_engraver () { - count_i_ = 0; - stem_l_arr_p_ = 0; + forbid_ = 0; + count_ = 0; + stems_ = 0; shortest_mom_ = Moment (Rational (1, 8)); - finished_beam_p_ = 0; - finished_grouping_p_ = 0; - grouping_p_ = 0; + finished_beam_ = 0; + finished_grouping_ = 0; + grouping_ = 0; beam_settings_ = SCM_EOL; } + +bool +Auto_beam_engraver::try_music (Music*m) +{ + if (m->is_mus_type ("beam-forbid-event")) + { + forbid_ = m; + return true; + } + + return false; +} + /* Determine end moment for auto beaming (or begin moment, but mostly 0==anywhere) In order of increasing priority: @@ -129,11 +161,15 @@ Auto_beam_engraver::test_moment (Direction dir, Moment test_mom) Moment one_beat = *unsmob_moment (get_property ("beatLength")); int num = int ((*unsmob_moment (get_property ("measureLength")) / one_beat).main_part_); int den = one_beat.den (); - SCM time = scm_list_n (gh_int2scm (num), gh_int2scm (den), SCM_UNDEFINED); + SCM time = scm_list_n (scm_int2num (num), scm_int2num (den), SCM_UNDEFINED); - SCM type = scm_list_n (gh_int2scm (test_mom.num ()), - gh_int2scm (test_mom.den ()), SCM_UNDEFINED); + SCM type = scm_list_n (scm_int2num (test_mom.num ()), + scm_int2num (test_mom.den ()), SCM_UNDEFINED); + /* + UGH UGH. + settings aren't grob-properties. + */ SCM settings = get_property ("autoBeamSettings"); /* first guess */ @@ -152,23 +188,23 @@ Auto_beam_engraver::test_moment (Direction dir, Moment test_mom) } /* second guess: property generic time exception */ - SCM m = gh_assoc (gh_append3 (function, wild, time), settings); + SCM m = scm_assoc (gh_append3 (function, wild, time), settings); if (m != SCM_BOOL_F && unsmob_moment (ly_cdr (m))) moment = * unsmob_moment (ly_cdr (m)); /* third guess: property time exception, specific for duration type */ - m = gh_assoc (gh_append3 (function, type, time), settings); + m = scm_assoc (gh_append3 (function, type, time), settings); if (m != SCM_BOOL_F && unsmob_moment (ly_cdr (m))) moment = * unsmob_moment (ly_cdr (m)); /* fourth guess [user override]: property plain generic */ - m = gh_assoc (gh_append3 (function, wild, wild), settings); + m = scm_assoc (gh_append3 (function, wild, wild), settings); if (m != SCM_BOOL_F && unsmob_moment (ly_cdr (m))) moment = * unsmob_moment (ly_cdr (m)); /* fifth guess [user override]: property plain, specific for duration type */ - m = gh_assoc (gh_append3 (function, type, wild), settings); + m = scm_assoc (gh_append3 (function, type, wild), settings); if (m != SCM_BOOL_F && unsmob_moment (ly_cdr (m))) moment = * unsmob_moment (ly_cdr (m)); @@ -204,7 +240,8 @@ void Auto_beam_engraver::consider_begin (Moment test_mom) { bool on = to_boolean (get_property ("autoBeaming")); - if (!stem_l_arr_p_ && on) + if (!stems_ && on + && !forbid_) { bool b = test_moment (START, test_mom); if (b) @@ -215,7 +252,7 @@ Auto_beam_engraver::consider_begin (Moment test_mom) void Auto_beam_engraver::consider_end (Moment test_mom) { - if (stem_l_arr_p_) + if (stems_) { /* Allow already started autobeam to end: don't check for autoBeaming */ @@ -226,40 +263,44 @@ Auto_beam_engraver::consider_end (Moment test_mom) } Spanner* -Auto_beam_engraver::create_beam_p () +Auto_beam_engraver::create_beam () { if (to_boolean (get_property ("skipTypesetting"))) { return 0; } - Spanner* beam_p = new Spanner (beam_settings_); - for (int i = 0; i < stem_l_arr_p_->size (); i++) + Spanner* beam = new Spanner (beam_settings_); + for (int i = 0; i < stems_->size (); i++) { /* watch out for stem tremolos and abbreviation beams */ - if (Stem::beam_l ((*stem_l_arr_p_)[i])) + if (Stem::get_beam ((*stems_)[i])) { - scm_gc_unprotect_object (beam_p->self_scm ()); + scm_gc_unprotect_object (beam->self_scm ()); return 0; } - Beam::add_stem (beam_p, (*stem_l_arr_p_)[i]); + Beam::add_stem (beam, (*stems_)[i]); } - announce_grob(beam_p, SCM_EOL); + announce_grob(beam, SCM_EOL); - return beam_p; + return beam; } void Auto_beam_engraver::begin_beam () { - assert (!stem_l_arr_p_); - stem_l_arr_p_ = new Link_array; - assert (!grouping_p_); - grouping_p_ = new Beaming_info_list; - beam_settings_ = get_property ("Beam"); + if (stems_ || grouping_ ) + { + programming_error ("already have autobeam"); + return; + } + + stems_ = new Link_array; + grouping_ = new Beaming_info_list; + beam_settings_ = updated_grob_properties (daddy_context_, ly_symbol2scm ("Beam")); beam_start_moment_ = now_mom (); beam_start_location_ = *unsmob_moment (get_property ("measurePosition")); @@ -267,16 +308,16 @@ Auto_beam_engraver::begin_beam () beat_length_ = *unsmob_moment (get_property ("beatLength")); } - void Auto_beam_engraver::junk_beam () { - assert (stem_l_arr_p_); + if (!stems_) + return ; - delete stem_l_arr_p_; - stem_l_arr_p_ = 0; - delete grouping_p_; - grouping_p_ = 0; + delete stems_; + stems_ = 0; + delete grouping_; + grouping_ = 0; beam_settings_ = SCM_EOL; shortest_mom_ = Moment (Rational (1, 8)); @@ -285,19 +326,18 @@ Auto_beam_engraver::junk_beam () void Auto_beam_engraver::end_beam () { - if (stem_l_arr_p_->size () < 2) + if (stems_->size () < 2) { junk_beam (); } else - { - finished_beam_p_ = create_beam_p (); - if (finished_beam_p_) - finished_grouping_p_ = grouping_p_; - delete stem_l_arr_p_; - stem_l_arr_p_ = 0; - grouping_p_ = 0; + finished_beam_ = create_beam (); + if (finished_beam_) + finished_grouping_ = grouping_; + delete stems_; + stems_ = 0; + grouping_ = 0; beam_settings_ = SCM_EOL; } @@ -307,26 +347,26 @@ Auto_beam_engraver::end_beam () void Auto_beam_engraver::typeset_beam () { - if (finished_beam_p_) + if (finished_beam_) { - finished_grouping_p_->beamify(beat_length_, subdivide_beams_); - Beam::set_beaming (finished_beam_p_, finished_grouping_p_); - typeset_grob (finished_beam_p_); - finished_beam_p_ = 0; + finished_grouping_->beamify(beat_length_, subdivide_beams_); + Beam::set_beaming (finished_beam_, finished_grouping_); + typeset_grob (finished_beam_); + finished_beam_ = 0; - delete finished_grouping_p_; - finished_grouping_p_= 0; + delete finished_grouping_; + finished_grouping_= 0; } } void Auto_beam_engraver::start_translation_timestep () { - count_i_ = 0; + count_ = 0; /* don't beam over skips */ - if (stem_l_arr_p_) + if (stems_) { Moment now = now_mom (); if (extend_mom_ < now) @@ -334,6 +374,7 @@ Auto_beam_engraver::start_translation_timestep () end_beam (); } } + forbid_ = 0; } void @@ -348,7 +389,7 @@ Auto_beam_engraver::finalize () /* finished beams may be typeset */ typeset_beam (); /* but unfinished may need another announce/acknowledge pass */ - if (stem_l_arr_p_) + if (stems_) junk_beam (); } @@ -356,28 +397,27 @@ Auto_beam_engraver::finalize () void Auto_beam_engraver::acknowledge_grob (Grob_info info) { - if (stem_l_arr_p_) + if (stems_) { - if (Beam::has_interface (info.grob_l_)) + if (Beam::has_interface (info.grob_)) { end_beam (); } - else if (Bar_line::has_interface (info.grob_l_)) + else if (Bar_line::has_interface (info.grob_)) { end_beam (); } - else if (Rest::has_interface (info.grob_l_)) + else if (Rest::has_interface (info.grob_)) { end_beam (); } } - if (Stem::has_interface (info.grob_l_)) + if (Stem::has_interface (info.grob_)) { - Item* stem_l = dynamic_cast (info.grob_l_); - - Rhythmic_req *rhythmic_req = dynamic_cast (info.music_cause ()); - if (!rhythmic_req) + Item* stem = dynamic_cast (info.grob_); + Music* m = info.music_cause (); + if (!m->is_mus_type ("rhythmic-event")) { programming_error ("Stem must have rhythmic structure"); return; @@ -386,25 +426,25 @@ Auto_beam_engraver::acknowledge_grob (Grob_info info) /* Don't (start) auto-beam over empty stems; skips or rests */ - if (!Stem::head_count (stem_l)) + if (!Stem::head_count (stem)) { - if (stem_l_arr_p_) + if (stems_) end_beam (); return; } - if (Stem::beam_l (stem_l)) + if (Stem::get_beam (stem)) { - if (stem_l_arr_p_) + if (stems_) junk_beam (); return ; } - int durlog = unsmob_duration (rhythmic_req->get_mus_property ("duration"))->duration_log (); + int durlog = unsmob_duration (m->get_mus_property ("duration"))->duration_log (); if (durlog <= 2) { - if (stem_l_arr_p_) + if (stems_) end_beam (); return; } @@ -417,7 +457,7 @@ Auto_beam_engraver::acknowledge_grob (Grob_info info) return ; - Moment dur = unsmob_duration (rhythmic_req->get_mus_property ("duration"))->length_mom (); + Moment dur = unsmob_duration (m->get_mus_property ("duration"))->get_length (); /* FIXME: This comment has been here since long: @@ -444,30 +484,30 @@ Auto_beam_engraver::acknowledge_grob (Grob_info info) consider_begin (shortest_mom_); #endif - if (!stem_l_arr_p_) + if (!stems_) return; Moment now = now_mom (); - grouping_p_->add_stem (now - beam_start_moment_ + beam_start_location_, + grouping_->add_stem (now - beam_start_moment_ + beam_start_location_, durlog - 2); - stem_l_arr_p_->push (stem_l); + stems_->push (stem); last_add_mom_ = now; - extend_mom_ = (extend_mom_ >? now) + rhythmic_req->length_mom (); + extend_mom_ = (extend_mom_ >? now) + m->get_length (); } } void Auto_beam_engraver::process_acknowledged_grobs () { - if (!count_i_) + if (!count_) { consider_end (shortest_mom_); consider_begin (shortest_mom_); } - else if (count_i_ > 1) + else if (count_ > 1) { - if (stem_l_arr_p_) + if (stems_) { Moment now = now_mom (); if ((extend_mom_ < now) @@ -475,27 +515,25 @@ Auto_beam_engraver::process_acknowledged_grobs () { end_beam (); } - else if (!stem_l_arr_p_->size ()) + else if (!stems_->size ()) { junk_beam (); } } } - - /* - count_i_++ -> - - auto-beam-engraver.cc:459: warning: value computed is not used (gcc: 2.96) */ - count_i_ = count_i_ + 1; + + count_ ++; } -ENTER_DESCRIPTION(Auto_beam_engraver, -/* descr */ "Generate beams based on measure characteristics and observed -Stems. Uses beatLength, measureLength and measurePosition to decide -when to start and stop a beam. Overriding beaming is done through -@ref{Stem_engraver} properties stemLeftBeamCount and -stemRightBeamCount. -", + +ENTER_DESCRIPTION (Auto_beam_engraver, +/* descr */ "Generate beams based on measure characteristics and observed " +"Stems. Uses beatLength, measureLength and measurePosition to decide " +"when to start and stop a beam. Overriding beaming is done through " +"@ref{Stem_engraver} properties stemLeftBeamCount and " +"stemRightBeamCount. " +, /* creats*/ "Beam", -/* acks */ "stem-interface rest-interface beam-interface bar-line-interface", +/* accepts */ "beam-forbid-event", +/* acks */ "stem-interface rest-interface beam-interface bar-line-interface", /* reads */ "autoBeaming autoBeamSettings beatLength subdivideBeams", /* write */ "");