X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeam-engraver.cc;h=43c1264741c186131dc34b54d72ec5f22f25db00;hb=09bf9a18185476020686ff65b5d70b57051be780;hp=e8a77ec1ffb8514ba77c149dcf5700fe1bed943d;hpb=b37e3f652677ae0298423db9fa0e552e5fce0c92;p=lilypond.git diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc index e8a77ec1ff..43c1264741 100644 --- a/lily/beam-engraver.cc +++ b/lily/beam-engraver.cc @@ -3,11 +3,11 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2006 Han-Wen Nienhuys + (c) 1998--2009 Han-Wen Nienhuys */ #include "beam.hh" -#include "beaming.hh" +#include "beaming-pattern.hh" #include "context.hh" #include "drul-array.hh" #include "duration.hh" @@ -15,8 +15,8 @@ #include "international.hh" #include "item.hh" #include "rest.hh" -#include "score-engraver.hh" #include "spanner.hh" +#include "stream-event.hh" #include "stem.hh" #include "warn.hh" @@ -27,17 +27,18 @@ class Beam_engraver : public Engraver public: DECLARE_ACKNOWLEDGER (stem); DECLARE_ACKNOWLEDGER (rest); + protected: - Music *start_ev_; + Stream_event *start_ev_; Spanner *finished_beam_; Spanner *beam_; - Music *prev_start_ev_; + Stream_event *prev_start_ev_; - Music *now_stop_ev_; + Stream_event *stop_ev_; - Beaming_info_list *beam_info_; - Beaming_info_list *finished_beam_info_; + Beaming_pattern *beam_info_; + Beaming_pattern *finished_beam_info_; /// location within measure where beam started. Moment beam_start_location_; @@ -45,9 +46,9 @@ protected: /// moment (global time) where beam started. Moment beam_start_mom_; - bool subdivide_beams_; - Moment beat_length_; - + Beaming_options beaming_options_; + Beaming_options finished_beaming_options_; + void typeset_beam (); void set_melisma (bool); @@ -56,12 +57,12 @@ protected: void start_translation_timestep (); virtual void finalize (); - virtual bool try_music (Music *); void process_music (); virtual bool valid_start_point (); virtual bool valid_end_point (); + DECLARE_TRANSLATOR_LISTENER (beam); public: TRANSLATOR_DECLARATIONS (Beam_engraver); }; @@ -90,29 +91,21 @@ Beam_engraver::Beam_engraver () finished_beam_ = 0; finished_beam_info_ = 0; beam_info_ = 0; - now_stop_ev_ = 0; + stop_ev_ = 0; start_ev_ = 0; prev_start_ev_ = 0; } -bool -Beam_engraver::try_music (Music *m) +IMPLEMENT_TRANSLATOR_LISTENER (Beam_engraver, beam); +void +Beam_engraver::listen_beam (Stream_event *ev) { - if (m->is_mus_type ("beam-event")) - { - 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; - - if (d == START) - start_ev_ = m; - else if (d == STOP) - now_stop_ev_ = m; - return true; - } - return false; + Direction d = to_dir (ev->get_property ("span-direction")); + + if (d == START && valid_start_point ()) + ASSIGN_EVENT_ONCE (start_ev_, ev); + else if (d == STOP && valid_end_point ()) + ASSIGN_EVENT_ONCE (stop_ev_, ev); } void @@ -126,9 +119,6 @@ Beam_engraver::set_melisma (bool ml) void Beam_engraver::process_music () { - if (beam_ && !to_boolean (get_property ("allowBeamBreak"))) - get_score_engraver ()->forbid_breaks (); - if (start_ev_) { if (beam_) @@ -145,10 +135,17 @@ Beam_engraver::process_music () beam_start_location_ = mp; beam_start_mom_ = now_mom (); - beam_info_ = new Beaming_info_list; - + beaming_options_.from_context (context ()); + beam_info_ = new Beaming_pattern; /* urg, must copy to Auto_beam_engraver too */ } + + typeset_beam (); + if (stop_ev_ && beam_) + { + announce_end_grob (beam_, stop_ev_->self_scm ()); + + } } void @@ -156,7 +153,10 @@ Beam_engraver::typeset_beam () { if (finished_beam_) { - finished_beam_info_->beamify (beat_length_, subdivide_beams_); + if (!finished_beam_->get_bound (RIGHT)) + finished_beam_->set_bound (RIGHT, finished_beam_->get_bound (LEFT)); + + finished_beam_info_->beamify (finished_beaming_options_); Beam::set_beaming (finished_beam_, finished_beam_info_); delete finished_beam_info_; @@ -173,22 +173,19 @@ Beam_engraver::start_translation_timestep () if (beam_) { set_melisma (true); - - subdivide_beams_ = to_boolean (get_property ("subdivideBeams")); - beat_length_ = robust_scm2moment (get_property ("beatLength"), Moment (1, 4)); } } void Beam_engraver::stop_translation_timestep () { - typeset_beam (); - if (now_stop_ev_) + if (stop_ev_) { finished_beam_ = beam_; finished_beam_info_ = beam_info_; - - now_stop_ev_ = 0; + finished_beaming_options_ = beaming_options_; + + stop_ev_ = 0; beam_ = 0; beam_info_ = 0; typeset_beam (); @@ -215,9 +212,10 @@ Beam_engraver::finalize () void Beam_engraver::acknowledge_rest (Grob_info info) { - if (beam_) + if (beam_ + && !scm_is_number (info.grob ()->get_property_data ("staff-position"))) { - chain_offset_callback (info.grob(), + chain_offset_callback (info.grob (), Beam::rest_collision_callback_proc, Y_AXIS); } } @@ -240,23 +238,18 @@ Beam_engraver::acknowledge_stem (Grob_info info) - 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")) { - std::string s = _ ("stem must have Rhythmic structure"); - if (info.music_cause ()) - info.music_cause ()->origin ()->warning (s); - else - ::warning (s); - + info.grob ()->warning (_ ("stem must have Rhythmic structure")); return; } last_stem_added_at_ = now; - int durlog = unsmob_duration (m->get_property ("duration"))->duration_log (); + int durlog = unsmob_duration (ev->get_property ("duration"))->duration_log (); if (durlog <= 2) { - m->origin ()->warning (_ ("stem doesn't fit in beam")); + ev->origin ()->warning (_ ("stem does not fit in beam")); prev_start_ev_->origin ()->warning (_ ("beam was started here")); /* don't return, since @@ -269,7 +262,8 @@ Beam_engraver::acknowledge_stem (Grob_info info) scm_from_int (durlog)); Moment stem_location = now - beam_start_mom_ + beam_start_location_; beam_info_->add_stem (stem_location, - max (durlog- 2, 0)); + max (durlog- 2, 0), + Stem::is_invisible (stem)); Beam::add_stem (beam_, stem); } @@ -277,18 +271,29 @@ ADD_ACKNOWLEDGER (Beam_engraver, stem); ADD_ACKNOWLEDGER (Beam_engraver, rest); ADD_TRANSLATOR (Beam_engraver, - /* doc */ "Handles Beam events by engraving Beams. If omitted, then notes will be " - "printed with flags instead of beams.", - /* create */ "Beam", - /* accept */ "beam-event", - /* read */ "beamMelismaBusy beatLength subdivideBeams", - /* write */ ""); + /* doc */ + "Handle @code{Beam} events by engraving beams. If omitted," + " then notes are printed with flags instead of beams.", + + /* create */ + "Beam ", + + /* read */ + "beamMelismaBusy " + "beatLength " + "subdivideBeams ", + + /* write */ + "forbidBreak" + ); class Grace_beam_engraver : public Beam_engraver { public: TRANSLATOR_DECLARATIONS (Grace_beam_engraver); + DECLARE_TRANSLATOR_LISTENER (beam); + protected: virtual bool valid_start_point (); virtual bool valid_end_point (); @@ -312,14 +317,40 @@ Grace_beam_engraver::valid_end_point () return beam_ && valid_start_point (); } +/* + Ugh, C&P code. + */ +IMPLEMENT_TRANSLATOR_LISTENER (Grace_beam_engraver, beam); +void +Grace_beam_engraver::listen_beam (Stream_event *ev) +{ + Direction d = to_dir (ev->get_property ("span-direction")); + + if (d == START && valid_start_point ()) + start_ev_ = ev; + else if (d == STOP && valid_end_point ()) + stop_ev_ = ev; +} + + ADD_ACKNOWLEDGER (Grace_beam_engraver, stem); ADD_ACKNOWLEDGER (Grace_beam_engraver, rest); + ADD_TRANSLATOR (Grace_beam_engraver, - /* doc */ "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. ", - /* create */ "Beam", - /* accept */ "beam-event", - /* read */ "beamMelismaBusy beatLength allowBeamBreak subdivideBeams", - /* write */ ""); + /* doc */ + "Handle @code{Beam} events by engraving beams. If omitted," + " then notes are printed with flags instead of beams. Only" + " engraves beams when we are at grace points in time.", + + /* create */ + "Beam ", + + /* read */ + "beamMelismaBusy " + "beatLength " + "subdivideBeams ", + + /* write */ + "" + );