X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fauto-beam-engraver.cc;h=f86edaecc88eceddb74e17dea010458a24fa826f;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=9609e40aa0cf16b9b5db79f03d9b079c19eb8bf4;hpb=77d72a6b9e7e551dc4a3b365099f9fea339f9c72;p=lilypond.git diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc index 9609e40aa0..f86edaecc8 100644 --- a/lily/auto-beam-engraver.cc +++ b/lily/auto-beam-engraver.cc @@ -3,20 +3,21 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2005 Jan Nieuwenhuizen + (c) 1999--2008 Jan Nieuwenhuizen */ -#include "engraver.hh" -#include "beaming.hh" -#include "beam.hh" -#include "stem.hh" -#include "warn.hh" #include "bar-line.hh" -#include "rest.hh" -#include "item.hh" -#include "spanner.hh" +#include "beaming-pattern.hh" +#include "beam.hh" #include "context.hh" #include "duration.hh" +#include "engraver.hh" +#include "item.hh" +#include "rest.hh" +#include "spanner.hh" +#include "stream-event.hh" +#include "stem.hh" +#include "warn.hh" #include "translator.icc" @@ -26,9 +27,7 @@ class Auto_beam_engraver : public Engraver protected: void stop_translation_timestep (); - void start_translation_timestep (); void process_music (); - virtual bool try_music (Music *); virtual void finalize (); virtual void derived_mark () const; @@ -36,6 +35,7 @@ protected: DECLARE_ACKNOWLEDGER (beam); DECLARE_ACKNOWLEDGER (bar_line); DECLARE_ACKNOWLEDGER (stem); + DECLARE_TRANSLATOR_LISTENER (beam_forbid); void process_acknowledged (); @@ -50,13 +50,13 @@ private: bool is_same_grace_state (Grob *e); void typeset_beam (); - Music *forbid_; + Stream_event *forbid_; /* shortest_mom is the shortest note in the beam. */ Moment shortest_mom_; Spanner *finished_beam_; - Link_array *stems_; + vector *stems_; int process_acknowledged_count_; Moment last_add_mom_; @@ -67,15 +67,17 @@ private: 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_; + Beaming_pattern *grouping_; SCM beam_settings_; - Beaming_info_list *finished_grouping_; + Beaming_pattern *finished_grouping_; + + Beaming_options beaming_options_; + Beaming_options finished_beaming_options_; + + void check_bar_property (); }; @@ -103,6 +105,16 @@ Auto_beam_engraver::check_bar_property () void Auto_beam_engraver::process_music () { + /* + don't beam over skips + */ + if (stems_) + { + Moment now = now_mom (); + if (extend_mom_ < now) + end_beam (); + } + if (scm_is_string (get_property ("whichBar"))) { consider_end (shortest_mom_); @@ -128,16 +140,11 @@ Auto_beam_engraver::Auto_beam_engraver () beam_settings_ = SCM_EOL; } -bool -Auto_beam_engraver::try_music (Music *m) +IMPLEMENT_TRANSLATOR_LISTENER (Auto_beam_engraver, beam_forbid); +void +Auto_beam_engraver::listen_beam_forbid (Stream_event *ev) { - if (m->is_mus_type ("beam-forbid-event")) - { - forbid_ = m; - return true; - } - - return false; + ASSIGN_EVENT_ONCE (forbid_, ev); } bool @@ -182,18 +189,17 @@ Auto_beam_engraver::create_beam () if (to_boolean (get_property ("skipTypesetting"))) return 0; - for (int i = 0; i < stems_->size (); i++) + for (vsize i = 0; i < stems_->size (); i++) if (Stem::get_beam ((*stems_)[i])) return 0; /* - Can't use make_spanner_from_properties() because we have to use + Can't use make_spanner_from_properties () because we have to use beam_settings_. */ - Spanner *beam = new Spanner (beam_settings_, - context ()->get_grob_key ("Beam")); + Spanner *beam = new Spanner (beam_settings_); - for (int i = 0; i < stems_->size (); i++) + for (vsize i = 0; i < stems_->size (); i++) Beam::add_stem (beam, (*stems_)[i]); announce_grob (beam, (*stems_)[0]->self_scm ()); @@ -210,15 +216,14 @@ Auto_beam_engraver::begin_beam () return; } - stems_ = new Link_array; - grouping_ = new Beaming_info_list; + stems_ = new vector; + grouping_ = new Beaming_pattern (); + beaming_options_.from_context (context ()); beam_settings_ = updated_grob_properties (context (), ly_symbol2scm ("Beam")); beam_start_moment_ = now_mom (); beam_start_location_ = robust_scm2moment (get_property ("measurePosition"), Moment (0)); - subdivide_beams_ = ly_scm2bool (get_property ("subdivideBeams")); - beat_length_ = robust_scm2moment (get_property ("beatLength"), Moment (1, 4)); } void @@ -244,8 +249,13 @@ Auto_beam_engraver::end_beam () else { finished_beam_ = create_beam (); + if (finished_beam_) - finished_grouping_ = grouping_; + { + announce_end_grob (finished_beam_, SCM_EOL); + finished_grouping_ = grouping_; + finished_beaming_options_ = beaming_options_; + } delete stems_; stems_ = 0; grouping_ = 0; @@ -260,7 +270,10 @@ Auto_beam_engraver::typeset_beam () { if (finished_beam_) { - finished_grouping_->beamify (beat_length_, subdivide_beams_); + if (!finished_beam_->get_bound (RIGHT)) + finished_beam_->set_bound (RIGHT, finished_beam_->get_bound (LEFT)); + + finished_grouping_->beamify (finished_beaming_options_); Beam::set_beaming (finished_beam_, finished_grouping_); finished_beam_ = 0; @@ -269,26 +282,12 @@ Auto_beam_engraver::typeset_beam () } } -void -Auto_beam_engraver::start_translation_timestep () -{ - process_acknowledged_count_ = 0; - /* - don't beam over skips - */ - if (stems_) - { - Moment now = now_mom (); - if (extend_mom_ < now) - end_beam (); - } - forbid_ = 0; -} - void Auto_beam_engraver::stop_translation_timestep () { typeset_beam (); + process_acknowledged_count_ = 0; + forbid_ = 0; } void @@ -334,8 +333,8 @@ Auto_beam_engraver::acknowledge_stem (Grob_info info) { check_bar_property (); Item *stem = dynamic_cast (info.grob ()); - Music *m = info.ultimate_music_cause (); - if (!m->is_mus_type ("rhythmic-event")) + Stream_event *ev = info.ultimate_event_cause (); + if (!ev->in_event_class ("rhythmic-event")) { programming_error ("stem must have rhythmic structure"); return; @@ -358,7 +357,7 @@ Auto_beam_engraver::acknowledge_stem (Grob_info info) return; } - int durlog = unsmob_duration (m->get_property ("duration"))->duration_log (); + int durlog = unsmob_duration (ev->get_property ("duration"))->duration_log (); if (durlog <= 2) { @@ -374,7 +373,7 @@ Auto_beam_engraver::acknowledge_stem (Grob_info info) if (bool (beam_start_location_.grace_part_) != bool (now.grace_part_)) return; - Moment dur = unsmob_duration (m->get_property ("duration"))->get_length (); + Moment dur = unsmob_duration (ev->get_property ("duration"))->get_length (); consider_end (dur); consider_begin (dur); @@ -386,10 +385,11 @@ Auto_beam_engraver::acknowledge_stem (Grob_info info) return; grouping_->add_stem (now - beam_start_moment_ + beam_start_location_, - durlog - 2); - stems_->push (stem); + durlog - 2, + Stem::is_invisible (stem)); + stems_->push_back (stem); last_add_mom_ = now; - extend_mom_ = max (extend_mom_, now) + m->get_length (); + extend_mom_ = max (extend_mom_, now) + get_event_length (ev, now); } void @@ -424,12 +424,23 @@ ADD_ACKNOWLEDGER (Auto_beam_engraver, bar_line); ADD_ACKNOWLEDGER (Auto_beam_engraver, beam); ADD_ACKNOWLEDGER (Auto_beam_engraver, rest); ADD_TRANSLATOR (Auto_beam_engraver, - /* doc */ "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 @code{stemLeftBeamCount} and " - "@code{stemRightBeamCount}. ", - /* create */ "Beam", - /* accept */ "beam-forbid-event", - /* read */ "autoBeaming autoBeamSettings beatLength subdivideBeams", - /* write */ ""); + /* doc */ + "Generate beams based on measure characteristics and observed" + " Stems. Uses @code{beatLength}, @code{measureLength}, and" + " @code{measurePosition} to decide when to start and stop a" + " beam. Overriding beaming is done through" + " @ref{Stem_engraver} properties @code{stemLeftBeamCount} and" + " @code{stemRightBeamCount}.", + + /* create */ + "Beam ", + + /* read */ + "autoBeaming " + "autoBeamSettings " + "beatLength " + "subdivideBeams ", + + /* write */ + "" + );