X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmulti-measure-rest-engraver.cc;h=7d66ce48be1560b4284166ab97fe9ed4849d7c37;hb=b1a521c92717244d4bff11bb0b2b1304e4355956;hp=03578a58153053d8da994bf152d9acc0acea0bc3;hpb=9efbad2d9487a05b04423e7e9f062968e8f8eaf4;p=lilypond.git diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc index 03578a5815..7d66ce48be 100644 --- a/lily/multi-measure-rest-engraver.cc +++ b/lily/multi-measure-rest-engraver.cc @@ -1,82 +1,304 @@ /* multi_measure_rest-engraver.cc -- implement Multi_measure_rest_engraver - (c) 1998 Jan Nieuwenhuizen + (c) 1998--2004 Jan Nieuwenhuizen Han-Wen Nienhuys */ -#include "proto.hh" -#include "musical-request.hh" +#include "event.hh" #include "multi-measure-rest.hh" -#include "multi-measure-rest-engraver.hh" -#include "score-column.hh" -#include "time-description.hh" +#include "paper-column.hh" +#include "engraver-group-engraver.hh" +#include "side-position-interface.hh" +#include "staff-symbol-referencer.hh" +#include "engraver.hh" +#include "moment.hh" +#include "spanner.hh" -IMPLEMENT_IS_TYPE_B1 (Multi_measure_rest_engraver, Engraver); -ADD_THIS_TRANSLATOR (Multi_measure_rest_engraver); +/** + The name says it all: make multi measure rests + +*/ +class Multi_measure_rest_engraver : public Engraver +{ +public: + TRANSLATOR_DECLARATIONS (Multi_measure_rest_engraver); + +protected: + virtual bool try_music (Music*); + virtual void process_music (); + virtual void stop_translation_timestep (); + virtual void start_translation_timestep (); + virtual void finalize (); + +private: + Music * rest_ev_; + Link_array text_events_; + int start_measure_; + Rational last_main_moment_; + Moment stop_moment_; + + bool bar_seen_; + + Spanner *last_rest_; + Spanner *mmrest_; + + Link_array numbers_; + Link_array last_numbers_; +}; Multi_measure_rest_engraver::Multi_measure_rest_engraver () { - start_measure_i_ = 0; - rest_item_creation_mom_ = rest_req_stop_mom_ =0; - multi_measure_req_l_ = 0; - mmrest_p_ = 0; + bar_seen_ = false; + start_measure_ = 0; + mmrest_ = 0; + last_rest_ =0; + rest_ev_ = 0; } bool -Multi_measure_rest_engraver::do_try_request (Request* req_l) +Multi_measure_rest_engraver::try_music (Music* req) { - if (!dynamic_cast (req_l)) - return false; + if (req->is_mus_type ("multi-measure-rest-event")) + { + rest_ev_ = req; + stop_moment_ = now_mom () + rest_ev_->get_length (); + + return true; + } + else if (req->is_mus_type ("multi-measure-text-event")) + { + text_events_.push (req); + return true; + } + return false; +} - if (multi_measure_req_l_) - if (!multi_measure_req_l_->equal_b (req_l) - || req_start_mom_ != now_moment ()) - return false; - - multi_measure_req_l_ = dynamic_cast (req_l); - req_start_mom_ = now_moment (); - - rest_req_stop_mom_ = req_start_mom_ + multi_measure_req_l_->duration_.length (); +void +Multi_measure_rest_engraver::process_music () +{ + if (rest_ev_ && !mmrest_ + && stop_moment_ > now_mom ()) + { + mmrest_ = make_spanner ("MultiMeasureRest"); + + if (text_events_.size ()) + { + for (int i = 0; i < text_events_.size (); i++) + { + Spanner *sp + = make_spanner ("MultiMeasureRestText"); - return true; + Music* e = text_events_[i]; + SCM t = e->get_property ("text"); + SCM dir = e->get_property ("direction"); + sp->set_property ("text",t); + if (is_direction (dir)) + sp->set_property ("direction",dir); + + numbers_.push (sp); + announce_grob (sp, e->self_scm ()); + } + + /* + Stack different scripts. + */ + Direction d = DOWN; + do { + Grob *last =0; + for (int i=0; i get_property ("direction")) + { + if (last) + Side_position_interface::add_support (numbers_[i], last); + last = numbers_[i]; + } + } + } while (flip (&d) != DOWN); + } + else + { + Spanner *sp + = make_spanner ("MultiMeasureRestNumber"); + numbers_.push (sp); + announce_grob (sp, rest_ev_->self_scm ()); + } + + for (int i =0 ; i < numbers_.size (); i++) + { + Side_position_interface::add_support (numbers_[i], mmrest_); + numbers_[i]->set_parent (mmrest_, Y_AXIS); + } + + announce_grob (mmrest_, rest_ev_->self_scm ()); + start_measure_ + = gh_scm2int (get_property ("currentBarNumber")); + } + + bar_seen_ = gh_string_p (get_property ("whichBar")); } void -Multi_measure_rest_engraver::do_process_requests () +Multi_measure_rest_engraver::stop_translation_timestep () { - if (multi_measure_req_l_ && !mmrest_p_) + /* + We can not do this earlier, as breakableSeparationItem is not yet there. + */ + + if (bar_seen_) { - Time_description const *time = get_staff_info().time_C_; - mmrest_p_ = new Multi_measure_rest; - rest_item_creation_mom_ = time->when_mom (); - announce_element (Score_element_info (mmrest_p_, multi_measure_req_l_)); - start_measure_i_ = time->bars_i_; + Grob *cmc = unsmob_grob (get_property ("breakableSeparationItem")); + if (!cmc) + cmc = unsmob_grob (get_property ("currentCommandColumn")); + + Item *it = dynamic_cast (cmc); + + if (mmrest_) + { + add_bound_item (mmrest_, it); + for (int i = 0; i < numbers_.size (); i++) + add_bound_item (numbers_[i], it); + } + + if (last_rest_) + { + add_bound_item (last_rest_,it); + for (int i = 0; i < last_numbers_.size (); i++) + add_bound_item (last_numbers_[i], it); + } } + + SCM smp = get_property ("measurePosition"); + Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0); + + if (mmrest_ + && !mp.to_bool () + && mmrest_->get_bound (LEFT) && mmrest_->get_bound (RIGHT)) + { + typeset_grob (mmrest_); + for (int i = 0 ; i < numbers_.size (); i++) + { + typeset_grob (numbers_[i]); + } + + /* + we must keep mmrest_ around to set measure-count, so + no mmrest_ = 0 here. + */ + } + + if (last_rest_) + { + /* sanity check */ + if (last_rest_->get_bound (LEFT) && last_rest_->get_bound (RIGHT) + && last_rest_->get_bound (LEFT) != last_rest_->get_bound (RIGHT)) + { + typeset_grob (last_rest_); + + for (int i = 0; i < last_numbers_.size ();i++) + { + typeset_grob (last_numbers_[i]); + } + } + last_rest_ = 0; + last_numbers_.clear (); + } + + text_events_.clear (); } void -Multi_measure_rest_engraver::do_pre_move_processing () +Multi_measure_rest_engraver::start_translation_timestep () { - Moment now (now_moment ()); - if (mmrest_p_ && rest_item_creation_mom_ == now) + if (now_mom ().main_part_ >= stop_moment_.main_part_) + { + rest_ev_ = 0; + } + + bar_seen_ = false; + + SCM smp = get_property ("measurePosition"); + Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0); + + Moment now =now_mom (); + if (mmrest_ + && now.main_part_ != last_main_moment_ + && mp.main_part_ == Rational (0)) { - typeset_element (mmrest_p_); + last_rest_ = mmrest_; + last_numbers_ = numbers_; + + int cur = gh_scm2int (get_property ("currentBarNumber")); + int num = cur - start_measure_; + + /* + We can't plug a markup directly into the grob, since the + measure-count determines the formatting of the mmrest. + */ + last_rest_->set_property ("measure-count", gh_int2scm (num)); + + SCM sml = get_property ("measureLength"); + Rational ml = (unsmob_moment (sml)) ? unsmob_moment (sml)->main_part_ : Rational (1); + if (ml >= Rational (2)) + { + last_rest_->set_property ("use-breve-rest", SCM_BOOL_T); + } + + mmrest_ = 0; + numbers_.clear (); + + Grob * last = last_numbers_.size () ? last_numbers_[0] : 0; + if (last && last->get_property ("text") == SCM_EOL) + { + SCM thres = get_property ("restNumberThreshold"); + int t = 1; + if (gh_number_p (thres)) + t = gh_scm2int (thres); + + if (num <= t) + last->suicide (); + else + { + SCM text + = scm_number_to_string (gh_int2scm (num), SCM_MAKINUM (10)); + last->set_property ("text", text); + } + } } + + last_main_moment_ = now.main_part_; } void -Multi_measure_rest_engraver::do_post_move_processing () +Multi_measure_rest_engraver::finalize () { - Time_description const *time = get_staff_info().time_C_; - Moment now (now_moment ()); - if (rest_req_stop_mom_ <= now) - multi_measure_req_l_ = 0; - - if (mmrest_p_ && (!time->whole_in_measure_ || !multi_measure_req_l_)) + if (mmrest_) { - assert (rest_item_creation_mom_ < now); - mmrest_p_->measures_i_ = time->bars_i_ - start_measure_i_; - mmrest_p_ = 0; + typeset_grob (mmrest_); } + if (last_rest_) + { + typeset_grob (last_rest_); + } + + for (int i = 0; i < last_numbers_.size ();i++) + typeset_grob (last_numbers_[i]); + + for (int i = 0; i < numbers_.size ();i++) + typeset_grob (numbers_[i]); + } + +ENTER_DESCRIPTION (Multi_measure_rest_engraver, +/* descr */ + "Engraves multi-measure rests that are produced with @code{R}. Reads " +"measurePosition and currentBarNumber to determine what number to print " +"over the MultiMeasureRest. Reads measureLength to determine if it " +"should use a whole rest or a breve rest to represent 1 measure " + , +/* creats*/ "MultiMeasureRest MultiMeasureRestNumber MultiMeasureRestText", +/* accepts */ "multi-measure-rest-event multi-measure-text-event", +/* acks */ "", +/* reads */ "currentBarNumber restNumberThreshold breakableSeparationItem currentCommandColumn measurePosition measureLength", +/* write */ "");