X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmulti-measure-rest-engraver.cc;h=33a9cfb24b4bc882f307fff099bb3e18b87cd64f;hb=9362af693c2e902d788067f9aff3654ad45d04ff;hp=2c93ec04c695259a0dd817921a68c801f36729bd;hpb=2059367f59496fb11796bd2cf239f6b58625231e;p=lilypond.git diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc index 2c93ec04c6..33a9cfb24b 100644 --- a/lily/multi-measure-rest-engraver.cc +++ b/lily/multi-measure-rest-engraver.cc @@ -1,84 +1,269 @@ /* 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 "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_; + Item *last_command_item_ ; + Spanner *last_rest_; + Spanner *mmrest_; + + Link_array numbers_; + Link_array last_numbers_; +}; Multi_measure_rest_engraver::Multi_measure_rest_engraver () { - last_mom_ = 0; - multi_measure_req_l_ = 0; - mmrest_p_ = 0; + last_command_item_ = 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 (!req_l->musical () || !req_l->musical ()->multi_measure ()) - return false; - - multi_measure_req_l_ = req_l->musical ()->multi_measure (); - last_mom_ = now_moment () + multi_measure_req_l_->duration_.length (); - - return true; + 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; } void -Multi_measure_rest_engraver::do_removal_processing () +Multi_measure_rest_engraver::process_music () { - if (mmrest_p_) + if (rest_ev_ && !mmrest_ + && stop_moment_ > now_mom ()) { - typeset_element (mmrest_p_); - mmrest_p_ = 0; + mmrest_ = make_spanner ("MultiMeasureRest", rest_ev_->self_scm ()); + + if (text_events_.size ()) + { + for (int i = 0; i < text_events_.size (); i++) + { + + Music* e = text_events_[i]; + Spanner *sp + = make_spanner ("MultiMeasureRestText", e->self_scm () ); + 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); + } + + /* + 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", rest_ev_->self_scm () ); + numbers_.push (sp); + } + + for (int i =0 ; i < numbers_.size (); i++) + { + Side_position_interface::add_support (numbers_[i], mmrest_); + numbers_[i]->set_parent (mmrest_, Y_AXIS); + } + + start_measure_ + = ly_scm2int (get_property ("currentBarNumber")); } + + bar_seen_ = ly_c_string_p (get_property ("whichBar")); } void -Multi_measure_rest_engraver::do_process_requests () +Multi_measure_rest_engraver::stop_translation_timestep () { - if (mmrest_p_ || !multi_measure_req_l_) - return; + /* + We can not do this earlier, as breakableSeparationItem is not yet there. + */ + + if (bar_seen_) + { + Grob *cmc = unsmob_grob (get_property ("breakableSeparationItem")); + if (!cmc) + cmc = unsmob_grob (get_property ("currentCommandColumn")); - mmrest_p_ = new Multi_measure_rest; + /* + Ugh, this is a kludge - need this for multi-measure-rest-grace.ly + */ + last_command_item_ = dynamic_cast (cmc); + } - Scalar prop = get_property ("part"); - if (prop.isnum_b ()) - part_b_ = prop.to_bool (); + if (last_command_item_ && (mmrest_ || last_rest_)) + { + + if (last_rest_) + { + add_bound_item (last_rest_, last_command_item_); + for (int i = 0; i < last_numbers_.size (); i++) + add_bound_item (last_numbers_[i], last_command_item_); + } -// if (!part_b_) -// return; + if (mmrest_) + { + add_bound_item (mmrest_, last_command_item_); + for (int i = 0; i < numbers_.size (); i++) + add_bound_item (numbers_[i], last_command_item_); - int measures_i = (int)multi_measure_req_l_->duration_.plet_.iso_i_; - if (part_b_) - mmrest_p_->measures_i_ = measures_i; + last_command_item_ = 0; + } + } + + + SCM smp = get_property ("measurePosition"); + Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0); - announce_element (Score_elem_info (mmrest_p_, multi_measure_req_l_)); + if (last_rest_) + { + last_rest_ = 0; + last_numbers_.clear (); + } - multi_measure_req_l_ = 0; + text_events_.clear (); } void -Multi_measure_rest_engraver::do_pre_move_processing () +Multi_measure_rest_engraver::start_translation_timestep () { - if (!mmrest_p_) - return; + if (now_mom ().main_part_ >= stop_moment_.main_part_) + { + rest_ev_ = 0; + } - typeset_element (mmrest_p_); - mmrest_p_ = 0; + bar_seen_ = false; - if (part_b_) - return; + 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)) + { + last_rest_ = mmrest_; + last_numbers_ = numbers_; + + int cur = ly_scm2int (get_property ("currentBarNumber")); + int num = cur - start_measure_; - if (last_mom_ <= now_moment ()) - multi_measure_req_l_ = 0; + /* + 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", scm_int2num (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 (ly_c_number_p (thres)) + t = ly_scm2int (thres); + + if (num <= t) + last->suicide (); + else + { + SCM text + = scm_number_to_string (scm_int2num (num), scm_from_int (10)); + last->set_property ("text", text); + } + } + } + + last_main_moment_ = now.main_part_; +} + +void +Multi_measure_rest_engraver::finalize () +{ } +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 */ "");