X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeam-engraver.cc;h=bd12ffbc2580c17b7ddf133c081e02f4edcaa105;hb=be50e2580ab88b01ff5a903350c01ecba1b96d16;hp=d389789d3a7629ccfd7debe9ae6be4ac54cd7d93;hpb=3b963e7de14816666287b7a2bcfd35eccef977c4;p=lilypond.git diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc index d389789d3a..bd12ffbc25 100644 --- a/lily/beam-engraver.cc +++ b/lily/beam-engraver.cc @@ -1,35 +1,58 @@ -/* - beam-engraver.cc -- implement Beam_engraver - - source file of the GNU LilyPond music typesetter - - (c) 1998--2002 Han-Wen Nienhuys - - */ -#include "engraver-group-engraver.hh" -#include "engraver.hh" -#include "musical-request.hh" +/* + This file is part of LilyPond, the GNU music typesetter. + + Copyright (C) 1998--2009 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 "stem.hh" -#include "warn.hh" -#include "beaming.hh" -#include "score-engraver.hh" -#include "rest.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 "translator.icc" class Beam_engraver : public Engraver { -protected: - Drul_array reqs_drul_; - - Spanner *finished_beam_p_; - Spanner *beam_p_; - Span_req * prev_start_req_; +public: + DECLARE_ACKNOWLEDGER (stem); + DECLARE_ACKNOWLEDGER (rest); - Beaming_info_list * beam_info_p_; - Beaming_info_list * finished_beam_info_p_; +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_; @@ -37,34 +60,33 @@ protected: /// moment (global time) where beam started. Moment beam_start_mom_; - bool subdivide_beams_; - + Beaming_options beaming_options_; + Beaming_options finished_beaming_options_; + void typeset_beam (); void set_melisma (bool); Moment last_stem_added_at_; - - - - virtual void stop_translation_timestep (); - virtual void start_translation_timestep (); + void stop_translation_timestep (); + void start_translation_timestep (); virtual void finalize (); - virtual void acknowledge_grob (Grob_info); - virtual bool try_music (Music*); - virtual void process_music (); + void process_music (); - virtual bool valid_start_moment(); - virtual bool valid_end_moment (); - + virtual bool valid_start_point (); + virtual bool valid_end_point (); + + DECLARE_TRANSLATOR_LISTENER (beam); public: - TRANSLATOR_DECLARATIONS( Beam_engraver ); + TRANSLATOR_DECLARATIONS (Beam_engraver); }; - - +/* + Hmm. this isn't necessary, since grace beams and normal beams are + always nested. +*/ bool -Beam_engraver::valid_start_moment() +Beam_engraver::valid_start_point () { Moment n = now_mom (); @@ -72,279 +94,287 @@ Beam_engraver::valid_start_moment() } bool -Beam_engraver::valid_end_moment() +Beam_engraver::valid_end_point () { - return last_stem_added_at_.grace_part_ == Rational(0); + return valid_start_point (); } - Beam_engraver::Beam_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; - + 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; } -bool -Beam_engraver::try_music (Music *m) +IMPLEMENT_TRANSLATOR_LISTENER (Beam_engraver, beam); +void +Beam_engraver::listen_beam (Stream_event *ev) { - if (Span_req * c = dynamic_cast (m)) + Direction d = to_dir (ev->get_property ("span-direction")); + + if (d == START && valid_start_point ()) { - if (scm_equal_p (c->get_mus_property ("span-type"), - ly_str02scm ("abort")) == SCM_BOOL_T) - { - reqs_drul_[START] = 0; - reqs_drul_[STOP] = 0; - if (beam_p_) - beam_p_->suicide (); - beam_p_ = 0; - } - else if (scm_equal_p (c->get_mus_property ("span-type"), - ly_str02scm ("beam")) == SCM_BOOL_T) - { - Direction d =c->get_span_dir (); - - - if (d == STOP && !valid_end_moment()) - return false; - - if (d == START && !valid_start_moment ()) - return false; - - if (d == STOP) - { - SCM m = get_property ("automaticMelismata"); - SCM b = get_property ("autoBeaming"); - if (to_boolean (m) && !to_boolean (b)) - { - set_melisma (false); - } - } - - reqs_drul_[d ] = c; - return true; - } + ASSIGN_EVENT_ONCE (start_ev_, ev); + + Direction updown = to_dir (ev->get_property ("direction")); + if (updown) + forced_direction_ = updown; } - return false; + else if (d == STOP && valid_end_point ()) + ASSIGN_EVENT_ONCE (stop_ev_, ev); } void -Beam_engraver::set_melisma (bool m) +Beam_engraver::set_melisma (bool ml) { - daddy_trans_l_->set_property ("beamMelismaBusy", m ? SCM_BOOL_T :SCM_BOOL_F); + SCM b = get_property ("autoBeaming"); + if (!to_boolean (b)) + context ()->set_property ("beamMelismaBusy", ml ? SCM_BOOL_T : SCM_BOOL_F); } void Beam_engraver::process_music () { - if (reqs_drul_[STOP]) + if (start_ev_) { - prev_start_req_ =0; - finished_beam_p_ = beam_p_; - finished_beam_info_p_ = beam_info_p_; - - beam_info_p_ =0; - beam_p_ = 0; - } - - - if (beam_p_) - { - top_engraver ()->forbid_breaks (); - } - if (reqs_drul_[START]) - { - if (beam_p_) + if (beam_) { - reqs_drul_[START]->origin ()->warning (_ ("already have a beam")); + start_ev_->origin ()->warning (_ ("already have a beam")); return; } - prev_start_req_ = reqs_drul_[START]; - beam_p_ = new Spanner (get_property ("Beam")); - SCM smp = get_property ("measurePosition"); - Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0); + 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))); beam_start_location_ = mp; beam_start_mom_ = now_mom (); - - beam_info_p_ = new Beaming_info_list; - + + beaming_options_.from_context (context ()); + beam_info_ = new Beaming_pattern; /* urg, must copy to Auto_beam_engraver too */ - - announce_grob(beam_p_, reqs_drul_[START]->self_scm()); } + 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(*unsmob_moment (get_property ("beatLength")), - subdivide_beams_); - - Beam::set_beaming (finished_beam_p_, finished_beam_info_p_); - typeset_grob (finished_beam_p_); - delete finished_beam_info_p_; - finished_beam_info_p_ =0; - finished_beam_p_ = 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::start_translation_timestep () { - reqs_drul_ [START] =0; - reqs_drul_[STOP] = 0; - - if (beam_p_) - { - SCM m = get_property ("automaticMelismata"); - SCM b = get_property ("autoBeaming"); - if (to_boolean (m) && !to_boolean (b)) - { - set_melisma (true); - } - subdivide_beams_ = to_boolean(get_property("subdivideBeams")); - } + start_ev_ = 0; + + if (beam_) + set_melisma (true); } void 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::finalize () { typeset_beam (); - if (beam_p_) + if (beam_) { - prev_start_req_->origin ()->warning (_ ("unterminated beam")); + prev_start_ev_->origin ()->warning (_ ("unterminated beam")); /* we don't typeset it, (we used to, but it was commented out. Reason unknown) */ - beam_p_->suicide (); - delete beam_info_p_; + beam_->suicide (); + delete beam_info_; } } void -Beam_engraver::acknowledge_grob (Grob_info info) +Beam_engraver::acknowledge_rest (Grob_info info) { - if (beam_p_) + 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; + + Moment now = now_mom (); + if (!valid_start_point ()) + return; + + Item *stem = dynamic_cast (info.grob ()); + if (Stem::get_beam (stem)) + return; + + Stream_event *ev = info.ultimate_event_cause (); + if (!ev->in_event_class ("rhythmic-event")) { - if (Rest::has_interface (info.grob_l_)) - { - info.grob_l_->add_offset_callback (Beam::rest_collision_callback_proc, Y_AXIS); - } - else if (Stem::has_interface (info.grob_l_)) - { - Moment now = now_mom(); - - if (!valid_start_moment ()) - return ; - - Item *stem_l = dynamic_cast (info.grob_l_); - if (Stem::beam_l (stem_l)) - return; - - Rhythmic_req *rhythmic_req = dynamic_cast (info.music_cause ()); - if (!rhythmic_req) - { - String s = _ ("stem must have Rhythmic structure"); - if (info.music_cause ()) - info.music_cause ()->origin ()->warning (s); - else - ::warning (s); - - return; - } - - - last_stem_added_at_ = now; - int durlog = unsmob_duration (rhythmic_req->get_mus_property ("duration"))-> duration_log (); - if (durlog <= 2) - { - rhythmic_req->origin ()->warning (_ ("stem doesn't fit in beam")); - prev_start_req_->origin ()->warning (_ ("beam was started here")); - /* - don't return, since - - [r4 c8] can just as well be modern notation. - */ - } - - stem_l->set_grob_property ("duration-log", - gh_int2scm (durlog)); - Moment stem_location = now - beam_start_mom_ + beam_start_location_; - beam_info_p_->add_stem (stem_location, - (durlog- 2) >? 0); - Beam::add_stem (beam_p_, stem_l); - } + info.grob ()->warning (_ ("stem must have Rhythmic structure")); + 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 + [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); +} -ENTER_DESCRIPTION(Beam_engraver, -/* descr */ "Handles Beam_requests by engraving Beams. If omitted, then notes will be -printed with flags instead of beams.", -/* creats*/ "Beam", -/* acks */ "stem-interface rest-interface", -/* reads */ "beamMelismaBusy subdivideBeams", -/* write */ ""); +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 */ + "beamMelismaBusy " + "beatLength " + "subdivideBeams ", + + /* write */ + "forbidBreak" + ); class Grace_beam_engraver : public Beam_engraver { public: - TRANSLATOR_DECLARATIONS(Grace_beam_engraver); + TRANSLATOR_DECLARATIONS (Grace_beam_engraver); + DECLARE_TRANSLATOR_LISTENER (beam); + protected: - virtual bool valid_start_moment(); - virtual bool valid_end_moment (); + virtual bool valid_start_point (); + virtual bool valid_end_point (); }; -Grace_beam_engraver::Grace_beam_engraver() +Grace_beam_engraver::Grace_beam_engraver () { } bool -Grace_beam_engraver::valid_start_moment() +Grace_beam_engraver::valid_start_point () { Moment n = now_mom (); return n.grace_part_ != Rational (0); } - bool -Grace_beam_engraver::valid_end_moment () +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) { - return beam_p_ && last_stem_added_at_.grace_part_ != Rational(0); + 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 */ + "beamMelismaBusy " + "beatLength " + "subdivideBeams ", -ENTER_DESCRIPTION(Grace_beam_engraver, -/* descr */ "Handles Beam_requests 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. -", -/* creats*/ "Beam", -/* acks */ "stem-interface rest-interface", -/* reads */ "beamMelismaBusy subdivideBeams", -/* write */ ""); + /* write */ + "" + );