X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeam-engraver.cc;h=04e571f68a953d0197908dc3a75386cd6e7eecc7;hb=refs%2Fheads%2Fbugs%2F567849;hp=cb5132932c2d9dd6e6413d5d4d880f49f902b650;hpb=48f2b9351f93d0161c675cfb60e95bf919041df2;p=lilypond.git diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc index cb5132932c..04e571f68a 100644 --- a/lily/beam-engraver.cc +++ b/lily/beam-engraver.cc @@ -1,197 +1,382 @@ -/* - beam-engraver.cc -- implement Beam_engraver - - source file of the GNU LilyPond music typesetter - - (c) 1998--1999 Han-Wen Nienhuys - - */ -#include "timing-engraver.hh" -#include "engraver-group-engraver.hh" -#include "beam-engraver.hh" -#include "musical-request.hh" +/* + This file is part of LilyPond, the GNU music typesetter. + + Copyright (C) 1998--2011 Han-Wen Nienhuys + + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . +*/ + #include "beam.hh" +#include "beaming-pattern.hh" +#include "context.hh" +#include "directional-element-interface.hh" +#include "drul-array.hh" +#include "duration.hh" +#include "engraver.hh" +#include "international.hh" +#include "item.hh" +#include "rest.hh" +#include "spanner.hh" +#include "stream-event.hh" #include "stem.hh" #include "warn.hh" -#include "timing-translator.hh" -#include "beaming.hh" -#include "score-engraver.hh" -Beam_engraver::Beam_engraver () +#include "translator.icc" + +class Beam_engraver : public Engraver { - beam_p_ = 0; - finished_beam_p_ =0; - finished_beam_info_p_=0; - beam_info_p_ =0; - reqs_drul_[LEFT] = reqs_drul_[RIGHT] =0; - prev_start_req_ =0; -} +public: + DECLARE_ACKNOWLEDGER (stem); + DECLARE_ACKNOWLEDGER (rest); + +protected: + Stream_event *start_ev_; + + Spanner *finished_beam_; + Spanner *beam_; + Stream_event *prev_start_ev_; + + Stream_event *stop_ev_; + + Direction forced_direction_; + + Beaming_pattern *beam_info_; + Beaming_pattern *finished_beam_info_; + /// location within measure where beam started. + Moment beam_start_location_; + + /// moment (global time) where beam started. + Moment beam_start_mom_; + + Beaming_options beaming_options_; + Beaming_options finished_beaming_options_; + + void typeset_beam (); + void set_melisma (bool); + + Moment last_stem_added_at_; + void stop_translation_timestep (); + void start_translation_timestep (); + virtual void finalize (); + + void process_music (); + + virtual bool valid_start_point (); + virtual bool valid_end_point (); + + DECLARE_TRANSLATOR_LISTENER (beam); +public: + TRANSLATOR_DECLARATIONS (Beam_engraver); +}; + +/* + Hmm. this isn't necessary, since grace beams and normal beams are + always nested. +*/ bool -Beam_engraver::do_try_music (Music *m) +Beam_engraver::valid_start_point () { - if (Span_req * c = dynamic_cast(m)) - { - if (c->span_type_str_ != "beam") - return false; - - Direction d =c->span_dir_; + Moment n = now_mom (); - if (d == STOP && !beam_p_) - { - m->warning (_ ("no beam to end")); - return false; - } - reqs_drul_[d ] = c; - return true; - } - return false; + return n.grace_part_ == Rational (0); } +bool +Beam_engraver::valid_end_point () +{ + return valid_start_point (); +} +Beam_engraver::Beam_engraver () +{ + beam_ = 0; + finished_beam_ = 0; + finished_beam_info_ = 0; + beam_info_ = 0; + forced_direction_ = CENTER; + stop_ev_ = 0; + start_ev_ = 0; + prev_start_ev_ = 0; +} + +IMPLEMENT_TRANSLATOR_LISTENER (Beam_engraver, beam); void -Beam_engraver::do_process_requests () +Beam_engraver::listen_beam (Stream_event *ev) { - if (reqs_drul_[STOP]) + Direction d = to_dir (ev->get_property ("span-direction")); + + if (d == START && valid_start_point ()) { - if (!beam_p_) - reqs_drul_[STOP]->warning (_("no beam to end")); - prev_start_req_ =0; - finished_beam_p_ = beam_p_; - finished_beam_info_p_ = beam_info_p_; - - beam_info_p_ =0; - beam_p_ = 0; + ASSIGN_EVENT_ONCE (start_ev_, ev); + + Direction updown = to_dir (ev->get_property ("direction")); + if (updown) + forced_direction_ = updown; } + else if (d == STOP && valid_end_point ()) + ASSIGN_EVENT_ONCE (stop_ev_, ev); +} +void +Beam_engraver::set_melisma (bool ml) +{ + SCM b = get_property ("autoBeaming"); + if (!to_boolean (b)) + context ()->set_property ("beamMelismaBusy", ml ? SCM_BOOL_T : SCM_BOOL_F); +} - 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 (); - } - - if (reqs_drul_[START]) +void +Beam_engraver::process_music () +{ + if (start_ev_) { - if (beam_p_) + if (beam_) { - reqs_drul_[START]->warning (_ ("Already have a beam")); + start_ev_->origin ()->warning (_ ("already have a beam")); return; } - prev_start_req_ = reqs_drul_[START]; - beam_p_ = new Beam; + set_melisma (true); + prev_start_ev_ = start_ev_; + beam_ = make_spanner ("Beam", start_ev_->self_scm ()); + + Moment mp (robust_scm2moment (get_property ("measurePosition"), + Moment (0))); - Translator * t = daddy_grav_l ()->get_simple_translator ("Timing_engraver"); - Timing_engraver *timer = dynamic_cast (t); - beam_start_location_ = (t) ? timer->measure_position () : Moment (0); - beam_start_mom_ = now_mom(); - beam_info_p_ = new Beaming_info_list; - - + beam_start_location_ = mp; + beam_start_mom_ = now_mom (); + + beaming_options_.from_context (context ()); + beam_info_ = new Beaming_pattern; /* urg, must copy to Auto_beam_engraver too */ - - announce_element (Score_element_info (beam_p_, reqs_drul_[START])); + } + + typeset_beam (); + if (stop_ev_ && beam_) + { + announce_end_grob (beam_, stop_ev_->self_scm ()); + } } void Beam_engraver::typeset_beam () { - if (finished_beam_p_) + if (finished_beam_) { - finished_beam_info_p_->beamify (); - - finished_beam_p_->set_beaming (finished_beam_info_p_); - typeset_element (finished_beam_p_); - delete finished_beam_info_p_; - finished_beam_info_p_ =0; - finished_beam_p_ = 0; - - reqs_drul_[STOP] = 0; + if (!finished_beam_->get_bound (RIGHT)) + finished_beam_->set_bound (RIGHT, finished_beam_->get_bound (LEFT)); + if (forced_direction_) + { + Grob *stem = finished_beam_->get_bound (RIGHT); + set_grob_direction (stem, forced_direction_); + forced_direction_ = CENTER; + } + finished_beam_info_->beamify (finished_beaming_options_); + + Beam::set_beaming (finished_beam_, finished_beam_info_); + + delete finished_beam_info_; + finished_beam_info_ = 0; + finished_beam_ = 0; + } } void -Beam_engraver::do_post_move_processing () +Beam_engraver::start_translation_timestep () { - reqs_drul_ [START] =0; + start_ev_ = 0; + + if (beam_) + set_melisma (true); } void -Beam_engraver::do_pre_move_processing () +Beam_engraver::stop_translation_timestep () { - typeset_beam (); + if (stop_ev_) + { + finished_beam_ = beam_; + finished_beam_info_ = beam_info_; + finished_beaming_options_ = beaming_options_; + + stop_ev_ = 0; + beam_ = 0; + beam_info_ = 0; + typeset_beam (); + set_melisma (false); + } } void -Beam_engraver::do_removal_processing () +Beam_engraver::finalize () { typeset_beam (); - if (beam_p_) + if (beam_) { - prev_start_req_->warning (_ ("unfinished beam")); - finished_beam_p_ = beam_p_; - finished_beam_info_p_ = beam_info_p_; - typeset_beam (); + prev_start_ev_->origin ()->warning (_ ("unterminated beam")); + + /* + we don't typeset it, (we used to, but it was commented + out. Reason unknown) */ + beam_->suicide (); + delete beam_info_; } } void -Beam_engraver::acknowledge_element (Score_element_info info) +Beam_engraver::acknowledge_rest (Grob_info info) { - if (beam_p_) - { - Stem* stem_l = dynamic_cast (info.elem_l_); - if (!stem_l || stem_l->beam_l ()) - return; + if (beam_ + && !scm_is_number (info.grob ()->get_property_data ("staff-position"))) + chain_offset_callback (info.grob (), + Beam::rest_collision_callback_proc, Y_AXIS); +} +void +Beam_engraver::acknowledge_stem (Grob_info info) +{ + if (!beam_) + return; - bool stem_grace = stem_l->get_elt_property ("grace") == SCM_BOOL_T; + Moment now = now_mom (); + if (!valid_start_point ()) + return; - SCM wg =get_property ("weAreGraceContext",0); - bool wgb= to_boolean (wg); + Item *stem = dynamic_cast (info.grob ()); + if (Stem::get_beam (stem)) + return; - if (wgb!= stem_grace) - return; + Stream_event *ev = info.ultimate_event_cause (); + if (!ev->in_event_class ("rhythmic-event")) + { + info.grob ()->warning (_ ("stem must have Rhythmic structure")); + return; + } - Rhythmic_req *rhythmic_req = dynamic_cast (info.req_l_); - if (!rhythmic_req) - { - String s = _ ("Stem must have Rhythmic structure"); - if (info.req_l_) - info.req_l_->warning (s); - else - ::warning (s); - - return; - } - - if (rhythmic_req->duration_.durlog_i_<= 2) - { - rhythmic_req->warning (_ ("Stem doesn't fit in beam")); - prev_start_req_->warning (_ ("Beam was started here")); - return; - } + last_stem_added_at_ = now; + int durlog = unsmob_duration (ev->get_property ("duration"))->duration_log (); + if (durlog <= 2) + { + ev->origin ()->warning (_ ("stem does not fit in beam")); + prev_start_ev_->origin ()->warning (_ ("beam was started here")); + /* + don't return, since - 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_; - beam_info_p_->add_stem (stem_location, rhythmic_req->duration_.durlog_i_ - 2); - beam_p_->add_stem (stem_l); + [r4 c8] can just as well be modern notation. + */ } + + if (forced_direction_) + set_grob_direction (stem, forced_direction_); + + stem->set_property ("duration-log", scm_from_int (durlog)); + Moment stem_location = now - beam_start_mom_ + beam_start_location_; + beam_info_->add_stem (stem_location, + max (durlog- 2, 0), + Stem::is_invisible (stem)); + Beam::add_stem (beam_, stem); } +ADD_ACKNOWLEDGER (Beam_engraver, stem); +ADD_ACKNOWLEDGER (Beam_engraver, rest); + +ADD_TRANSLATOR (Beam_engraver, + /* doc */ + "Handle @code{Beam} events by engraving beams. If omitted," + " then notes are printed with flags instead of beams.", + + /* create */ + "Beam ", + + /* read */ + "baseMoment " + "beamMelismaBusy " + "beatStructure " + "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 (); +}; + +Grace_beam_engraver::Grace_beam_engraver () +{ +} + +bool +Grace_beam_engraver::valid_start_point () +{ + Moment n = now_mom (); + + return n.grace_part_ != Rational (0); +} + +bool +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 */ + "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 */ + "baseMoment " + "beamMelismaBusy " + "beatStructure " + "subdivideBeams ", -ADD_THIS_TRANSLATOR(Beam_engraver); + /* write */ + "" + );