X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmulti-measure-rest-engraver.cc;h=09b81be76006c8f15f8d17378254f9cba42b02c2;hb=ab7a4832dbcc1964c023d6035830b96b8e9076a3;hp=552865111bdd9c3073a09fd84827b1d196354e3f;hpb=7181c77e5d46a271f5f76e99bee7f844611e23e4;p=lilypond.git diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc index 552865111b..09b81be760 100644 --- a/lily/multi-measure-rest-engraver.cc +++ b/lily/multi-measure-rest-engraver.cc @@ -1,15 +1,15 @@ /* multi_measure_rest-engraver.cc -- implement Multi_measure_rest_engraver - (c) 1998--2000 Jan Nieuwenhuizen + (c) 1998--2003 Jan Nieuwenhuizen Han-Wen Nienhuys */ -#include "musical-request.hh" +#include "event.hh" #include "multi-measure-rest.hh" #include "paper-column.hh" #include "engraver-group-engraver.hh" -#include "bar.hh" +#include "side-position-interface.hh" #include "staff-symbol-referencer.hh" #include "engraver.hh" #include "moment.hh" @@ -18,164 +18,295 @@ /** The name says it all: make multi measure rests -FIXME? The MM rest engraver must be able to see bar lines, so it won't -work at Voice level. Not a problem in practice, but aesthetically pleasing? - */ class Multi_measure_rest_engraver : public Engraver { public: - VIRTUAL_COPY_CONS(Translator); - Multi_measure_rest_engraver (); + TRANSLATOR_DECLARATIONS(Multi_measure_rest_engraver); protected: - virtual void acknowledge_element (Score_element_info i); - virtual void do_process_music (); - virtual bool do_try_music (Music*); - virtual void do_pre_move_processing (); - virtual void do_post_move_processing (); - virtual void do_removal_processing (); + virtual bool try_music (Music*); + virtual void process_music (); + virtual void stop_translation_timestep (); + virtual void start_translation_timestep (); + virtual void finalize (); + private: - Span_req * new_req_l_; - Span_req * busy_span_req_l_; - Span_req * stop_req_l_; - int start_measure_i_; + Music * new_req_; + Music * busy_span_req_; + Music * stop_req_; + Link_array text_events_; + int start_measure_; Moment start_moment_; - - Spanner *mmrest_p_; - Spanner *lastrest_p_; -}; + Rational last_main_moment_; -ADD_THIS_TRANSLATOR (Multi_measure_rest_engraver); + Spanner *mmrest_; + Link_array numbers_; -Multi_measure_rest_engraver::Multi_measure_rest_engraver () -{ - start_measure_i_ = 0; - mmrest_p_ = lastrest_p_ =0; - new_req_l_ = busy_span_req_l_ = stop_req_l_ =0; -} + Link_array last_numbers_; + Spanner *last_rest_; +}; -void -Multi_measure_rest_engraver::acknowledge_element (Score_element_info i) +Multi_measure_rest_engraver::Multi_measure_rest_engraver () { - Item * item = dynamic_cast (i.elem_l_); - if (item && Bar::has_interface (item)) - { - if (mmrest_p_) - Multi_measure_rest::add_column (mmrest_p_,item); - if (lastrest_p_) - Multi_measure_rest::add_column (lastrest_p_,item); - } + start_measure_ = 0; + mmrest_ = 0; + last_rest_ =0; + new_req_ = busy_span_req_ = stop_req_ =0; } bool -Multi_measure_rest_engraver::do_try_music (Music* req_l) +Multi_measure_rest_engraver::try_music (Music* req) { - if (Span_req * sp = dynamic_cast (req_l)) + if (req->is_mus_type ("multi-measure-rest-event")) { - if (sp->span_type_str_ == "rest") + Direction d = to_dir (req->get_mus_property ("span-direction")); + if (d == STOP) { - if (sp->span_dir_ == STOP) - { - stop_req_l_ = sp; - } - else if (sp->span_dir_ == START && !new_req_l_) - { - new_req_l_ = sp; - } - return true; + stop_req_ = req; + } + else if (d == START&& !new_req_) + { + new_req_ = req; } + 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_process_music () +Multi_measure_rest_engraver::process_music () { - if (new_req_l_ && stop_req_l_) - stop_req_l_ = 0; + if (new_req_ && stop_req_) + stop_req_ = 0; - if (new_req_l_) + if (new_req_) start_moment_ = now_mom (); - if (stop_req_l_) + if (stop_req_) { - busy_span_req_l_ =0; - stop_req_l_ = 0; + busy_span_req_ =0; + stop_req_ = 0; } - if (new_req_l_) + if (new_req_) { - busy_span_req_l_ = new_req_l_; - new_req_l_ =0; + busy_span_req_ = new_req_; + new_req_ =0; } - if (busy_span_req_l_ && !mmrest_p_) + if (busy_span_req_ && !mmrest_) { - mmrest_p_ = new Spanner (get_property ("basicMultiMeasureRestProperties")); + mmrest_ = new Spanner (get_property ("MultiMeasureRest")); - Multi_measure_rest::set_interface (mmrest_p_); - Staff_symbol_referencer::set_interface (mmrest_p_); + if (text_events_.size()) + { + for (int i = 0; i < text_events_.size(); i++) + { + Spanner *sp + = new Spanner (get_property ("MultiMeasureRestText")); + + Music* e = text_events_[i]; + SCM t = e->get_mus_property ("text"); + SCM dir = e->get_mus_property ("direction"); + sp->set_grob_property ("text",t); + if (ly_dir_p (dir)) + sp->set_grob_property ("direction",dir); + + numbers_.push (sp); + announce_grob (sp, e->self_scm()); + } - announce_element (mmrest_p_, busy_span_req_l_); - start_measure_i_ + /* + Stack different scripts. + */ + Direction d = DOWN; + do { + Grob *last =0; + for (int i=0; i get_grob_property ("direction")) + { + if (last) + Side_position_interface::add_support (numbers_[i], last); + last = numbers_[i]; + } + } + } while (flip (&d) != DOWN); + } + else + { + Spanner *sp + = new Spanner (get_property ("MultiMeasureRestNumber")); + numbers_.push (sp); + announce_grob (sp, busy_span_req_->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_, busy_span_req_->self_scm()); + start_measure_ = gh_scm2int (get_property ("currentBarNumber")); } + + if (gh_string_p (get_property ("whichBar"))) + { + Grob *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); + } + } } void -Multi_measure_rest_engraver::do_pre_move_processing () +Multi_measure_rest_engraver::stop_translation_timestep () { SCM smp = get_property ("measurePosition"); - Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0); + Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0); - if (mmrest_p_ && (now_mom () >= start_moment_) - && !mp - && (scm_ilength (mmrest_p_->get_elt_property ("columns")) >= 2)) + if (mmrest_ && (now_mom () >= start_moment_) + && !mp.to_bool () + && mmrest_->get_bound (LEFT) && mmrest_->get_bound (RIGHT)) { - typeset_element (mmrest_p_); + typeset_grob (mmrest_); + for (int i = 0 ; i < numbers_.size(); i++) + { + typeset_grob (numbers_[i]); + Side_position_interface::add_staff_support (numbers_[i]); + } + /* - must keep mmrest_p_ around to set measures_i_ + we must keep mmrest_ around to set measure-count, so + no mmrest_ = 0 here. */ } - if (lastrest_p_) + + if (last_rest_) { - typeset_element (lastrest_p_); - lastrest_p_ = 0; + /* 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]); + Side_position_interface::add_staff_support (last_numbers_[i]); + } + } + last_rest_ = 0; + last_numbers_.clear(); } - if (new_req_l_) + if (new_req_) { - busy_span_req_l_ = new_req_l_; - new_req_l_ =0; + busy_span_req_ = new_req_; + new_req_ =0; } - + + text_events_.clear (); } void -Multi_measure_rest_engraver::do_post_move_processing () +Multi_measure_rest_engraver::start_translation_timestep () { SCM smp = get_property ("measurePosition"); - Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0); - - if (mmrest_p_ && !mp) + 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)) { - lastrest_p_ = mmrest_p_; + last_rest_ = mmrest_; + last_numbers_ = numbers_; + int cur = gh_scm2int (get_property ("currentBarNumber")); - lastrest_p_->set_elt_property ("measure-count", - gh_int2scm (cur - start_measure_i_)); - mmrest_p_ = 0; + int num = cur - start_measure_; + last_rest_->set_grob_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_grob_property ("use-breve-rest", SCM_BOOL_T); + } + + mmrest_ = 0; + numbers_.clear (); + + Grob * last = last_numbers_.size() ? last_numbers_[0] : 0; + if (last && last->get_grob_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_grob_property ("text", text); + } + } } -} + last_main_moment_ = now.main_part_; +} void -Multi_measure_rest_engraver::do_removal_processing () +Multi_measure_rest_engraver::finalize () { - if (mmrest_p_) - typeset_element (mmrest_p_); - if (lastrest_p_) - typeset_element (lastrest_p_); + if (mmrest_) + { + 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 currentCommandColumn measurePosition measureLength", +/* write */ "");