X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fauto-beam-engraver.cc;h=42e3935d8de364475545a473d8ad6fff3931cadb;hb=7095841e441b2ad2d8ca798e6d1d241e57bdd0c5;hp=1dafaad75be120cc1836f2ec1b00cb3da034b88a;hpb=50db74300631704bf9b49eb844434190f2fa811b;p=lilypond.git diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc index 1dafaad75b..42e3935d8d 100644 --- a/lily/auto-beam-engraver.cc +++ b/lily/auto-beam-engraver.cc @@ -3,21 +3,22 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Jan Nieuwenhuizen + (c) 1999--2003 Jan Nieuwenhuizen */ #include "beaming.hh" -#include "musical-request.hh" +#include "event.hh" #include "beam.hh" #include "stem.hh" -#include "debug.hh" +#include "warn.hh" #include "engraver-group-engraver.hh" -#include "bar.hh" +#include "bar-line.hh" #include "rest.hh" #include "engraver.hh" #include "item.hh" #include "spanner.hh" +#include "duration.hh" /* TODO: figure what to do in grace? @@ -26,22 +27,20 @@ */ class Auto_beam_engraver : public Engraver { -public: - Auto_beam_engraver (); - VIRTUAL_COPY_CONS (Translator); - + TRANSLATOR_DECLARATIONS(Auto_beam_engraver); protected: virtual void stop_translation_timestep (); virtual void start_translation_timestep (); + virtual void process_music (); virtual void finalize (); virtual void acknowledge_grob (Grob_info); - virtual void create_grobs (); + virtual void process_acknowledged_grobs (); 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 (); @@ -52,35 +51,49 @@ private: 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. */ Moment extend_mom_; Moment beam_start_moment_; Moment beam_start_location_; + + bool subdivide_beams_; + Moment beat_length_; // We act as if beam were created, and start a grouping anyway. - Beaming_info_list*grouping_p_; - Beaming_info_list*finished_grouping_p_; + Beaming_info_list*grouping_; + SCM beam_settings_ ; // ugh. should protect ? + + Beaming_info_list*finished_grouping_; }; -ADD_THIS_TRANSLATOR (Auto_beam_engraver); +void +Auto_beam_engraver::process_music () +{ + if (gh_string_p (get_property ("whichBar"))) + { + consider_end (shortest_mom_); + junk_beam (); + } +} + Auto_beam_engraver::Auto_beam_engraver () { - count_i_ = 0; - stem_l_arr_p_ = 0; - shortest_mom_ = Moment (1, 8); - finished_beam_p_ = 0; - finished_grouping_p_ = 0; - grouping_p_ = 0; + count_ = 0; + stems_ = 0; + shortest_mom_ = Moment (Rational (1, 8)); + finished_beam_ = 0; + finished_grouping_ = 0; + grouping_ = 0; + beam_settings_ = SCM_EOL; } /* @@ -110,27 +123,34 @@ Auto_beam_engraver::Auto_beam_engraver () bool Auto_beam_engraver::test_moment (Direction dir, Moment test_mom) { - SCM wild = gh_list (ly_symbol2scm ("*"), ly_symbol2scm ("*"), SCM_UNDEFINED); + Moment now = now_mom(); + if (dir == START + && now.grace_part_) + { + return false; + } + + SCM wild = scm_list_n (ly_symbol2scm ("*"), ly_symbol2scm ("*"), SCM_UNDEFINED); SCM function; if (dir == START) - function = gh_list (ly_symbol2scm ("begin"), SCM_UNDEFINED); + function = scm_list_n (ly_symbol2scm ("begin"), SCM_UNDEFINED); else - function = gh_list (ly_symbol2scm ("end"), SCM_UNDEFINED); + function = scm_list_n (ly_symbol2scm ("end"), SCM_UNDEFINED); - Moment one_beat = *unsmob_moment( get_property ("beatLength")); - int num = *unsmob_moment (get_property("measureLength")) / one_beat; - int den = one_beat.den_i (); - SCM time = gh_list (gh_int2scm (num), gh_int2scm (den), SCM_UNDEFINED); + 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 (scm_int2num (num), scm_int2num (den), SCM_UNDEFINED); - SCM type = gh_list (gh_int2scm (test_mom.num_i ()), - gh_int2scm (test_mom.den_i ()), SCM_UNDEFINED); + SCM type = scm_list_n (scm_int2num (test_mom.num ()), + scm_int2num (test_mom.den ()), SCM_UNDEFINED); SCM settings = get_property ("autoBeamSettings"); /* first guess */ /* begin beam at any position - (and fallback for end) */ + (and fallback for end) */ Moment moment (0); /* end beam at end of beat */ @@ -143,28 +163,28 @@ 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 (gh_cdr (m))) - moment = * unsmob_moment (gh_cdr (m)); + 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); - if (m != SCM_BOOL_F && unsmob_moment (gh_cdr (m))) - moment = * unsmob_moment (gh_cdr (m)); + 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); - if (m != SCM_BOOL_F && unsmob_moment (gh_cdr (m))) - moment = * unsmob_moment (gh_cdr (m)); + 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); - if (m != SCM_BOOL_F && unsmob_moment (gh_cdr (m))) - moment = * unsmob_moment (gh_cdr (m)); + 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)); Rational r; - if (moment) + if (moment.to_bool ()) { /* Ugh? measurePosition can be negative, when \partial We may have to fix this elsewhere (timing translator) @@ -176,7 +196,7 @@ Auto_beam_engraver::test_moment (Direction dir, Moment test_mom) Moment length = * unsmob_moment (get_property ("measureLength")); pos = length - pos; } - r = pos.mod_rat (moment); + r = pos.main_part_.mod_rat (moment.main_part_); } else { @@ -187,14 +207,15 @@ Auto_beam_engraver::test_moment (Direction dir, Moment test_mom) /* but ending is not */ r = 1; } + return !r; } void Auto_beam_engraver::consider_begin (Moment test_mom) { - bool off = to_boolean (get_property ("noAutoBeaming")); - if (!stem_l_arr_p_ && ! off) + bool on = to_boolean (get_property ("autoBeaming")); + if (!stems_ && on) { bool b = test_moment (START, test_mom); if (b) @@ -205,10 +226,10 @@ 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 noAutoBeaming */ + don't check for autoBeaming */ bool b = test_moment (STOP, test_mom); if (b) end_beam (); @@ -216,95 +237,110 @@ Auto_beam_engraver::consider_end (Moment test_mom) } Spanner* -Auto_beam_engraver::create_beam_p () +Auto_beam_engraver::create_beam () { - Spanner* beam_p = new Spanner (get_property ("Beam")); - Beam::set_interface (beam_p); - - for (int i = 0; i < stem_l_arr_p_->size (); i++) + if (to_boolean (get_property ("skipTypesetting"))) + { + return 0; + } + + 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_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, 0); + 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; + if (stems_ || grouping_ ) + { + programming_error ("already have autobeam"); + return; + } + + stems_ = new Link_array; + grouping_ = new Beaming_info_list; + beam_settings_ = get_property ("Beam"); + beam_start_moment_ = now_mom (); beam_start_location_ = *unsmob_moment (get_property ("measurePosition")); + subdivide_beams_ = gh_scm2bool(get_property("subdivideBeams")); + beat_length_ = *unsmob_moment (get_property ("beatLength")); } - void Auto_beam_engraver::junk_beam () { - assert (stem_l_arr_p_); + if (!stems_) + return ; + + delete stems_; + stems_ = 0; + delete grouping_; + grouping_ = 0; + beam_settings_ = SCM_EOL; - delete stem_l_arr_p_; - stem_l_arr_p_ = 0; - delete grouping_p_; - grouping_p_ = 0; - shortest_mom_ = Moment (1, 8); + shortest_mom_ = Moment (Rational (1, 8)); } 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; - shortest_mom_ = Moment (1, 8); + finished_beam_ = create_beam (); + if (finished_beam_) + finished_grouping_ = grouping_; + delete stems_; + stems_ = 0; + grouping_ = 0; + beam_settings_ = SCM_EOL; } + + shortest_mom_ = Moment (Rational (1, 8)); } void Auto_beam_engraver::typeset_beam () { - if (finished_beam_p_) + if (finished_beam_) { - finished_grouping_p_->beamify (); - 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) @@ -317,7 +353,6 @@ Auto_beam_engraver::start_translation_timestep () void Auto_beam_engraver::stop_translation_timestep () { - typeset_beam (); } @@ -327,46 +362,35 @@ 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 (); } -bool -Auto_beam_engraver::same_grace_state_b (Grob* e) -{ - bool gr = e->get_grob_property ("grace") == SCM_BOOL_T; - SCM wg =get_property ("weAreGraceContext"); - return (to_boolean (wg)) == gr; -} void Auto_beam_engraver::acknowledge_grob (Grob_info info) { - if (!same_grace_state_b (info.elem_l_)) - return; - - if (stem_l_arr_p_) + if (stems_) { - if (Beam::has_interface (info.elem_l_)) + if (Beam::has_interface (info.grob_)) { end_beam (); } - else if (Bar::has_interface (info.elem_l_)) + else if (Bar_line::has_interface (info.grob_)) { end_beam (); } - else if (Rest::has_interface (info.elem_l_)) + else if (Rest::has_interface (info.grob_)) { end_beam (); } } - if (Stem::has_interface (info.elem_l_)) + if (Stem::has_interface (info.grob_)) { - Item* stem_l = dynamic_cast (info.elem_l_); - - Rhythmic_req *rhythmic_req = dynamic_cast (info.req_l_); - 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; @@ -375,30 +399,38 @@ Auto_beam_engraver::acknowledge_grob (Grob_info info) /* Don't (start) auto-beam over empty stems; skips or rests */ - if (!Stem::heads_i (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; } - Moment dur = unsmob_duration (rhythmic_req->get_mus_property ("duration"))->length_mom (); + + /* + ignore grace notes. + */ + if (bool (beam_start_location_.grace_part_) != bool (now_mom ().grace_part_)) + return ; + + + Moment dur = unsmob_duration (m->get_mus_property ("duration"))->get_length (); /* FIXME: This comment has been here since long: @@ -425,47 +457,56 @@ 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::create_grobs () +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) - || ((extend_mom_ == now) && (last_add_mom_ != now ))) + || ((extend_mom_ == now) && (last_add_mom_ != now))) { 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. " +, +/* creats*/ "Beam", +/* accepts */ "", +/* acks */ "stem-interface rest-interface beam-interface bar-line-interface", +/* reads */ "autoBeaming autoBeamSettings beatLength subdivideBeams", +/* write */ "");