X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmulti-measure-rest-engraver.cc;h=33a9cfb24b4bc882f307fff099bb3e18b87cd64f;hb=9362af693c2e902d788067f9aff3654ad45d04ff;hp=035f5f8924959af03ea4e81d6b110b332c7a81ec;hpb=d9b43b93f2c885409bafdb157138158f65cc49aa;p=lilypond.git diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc index 035f5f8924..33a9cfb24b 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--2002 Jan Nieuwenhuizen + (c) 1998--2004 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 "side-position-interface.hh" #include "staff-symbol-referencer.hh" #include "engraver.hh" #include "moment.hh" @@ -17,12 +17,11 @@ /** The name says it all: make multi measure rests - */ class Multi_measure_rest_engraver : public Engraver { public: - TRANSLATOR_DECLARATIONS(Multi_measure_rest_engraver); + TRANSLATOR_DECLARATIONS (Multi_measure_rest_engraver); protected: virtual bool try_music (Music*); @@ -32,45 +31,45 @@ protected: virtual void finalize (); private: - Span_req * new_req_l_; - Span_req * busy_span_req_l_; - Span_req * stop_req_l_; - int start_measure_i_; - Moment start_moment_; + Music * rest_ev_; + Link_array text_events_; + int start_measure_; + Rational last_main_moment_; + Moment stop_moment_; - Spanner *mmrest_p_; - Spanner *lastrest_p_; -}; - + 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 () { - start_measure_i_ = 0; - mmrest_p_ = lastrest_p_ =0; - new_req_l_ = busy_span_req_l_ = stop_req_l_ =0; + last_command_item_ = 0; + bar_seen_ = false; + start_measure_ = 0; + mmrest_ = 0; + last_rest_ =0; + rest_ev_ = 0; } - bool -Multi_measure_rest_engraver::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")) { + rest_ev_ = req; + stop_moment_ = now_mom () + rest_ev_->get_length (); - if (scm_equal_p (sp->get_mus_property ("span-type"), - ly_str02scm ("rest")) == SCM_BOOL_T) - { - if (sp->get_span_dir () == STOP) - { - stop_req_l_ = sp; - } - else if (sp->get_span_dir () == START && !new_req_l_) - { - new_req_l_ = sp; - } - return true; - } + return true; + } + else if (req->is_mus_type ("multi-measure-text-event")) + { + text_events_.push (req); + return true; } return false; } @@ -78,112 +77,193 @@ Multi_measure_rest_engraver::try_music (Music* req_l) void Multi_measure_rest_engraver::process_music () { - if (new_req_l_ && stop_req_l_) - stop_req_l_ = 0; - - if (new_req_l_) - start_moment_ = now_mom (); - - if (stop_req_l_) - { - busy_span_req_l_ =0; - stop_req_l_ = 0; - } - - if (new_req_l_) + if (rest_ev_ && !mmrest_ + && stop_moment_ > now_mom ()) { - busy_span_req_l_ = new_req_l_; - new_req_l_ =0; - } + mmrest_ = make_spanner ("MultiMeasureRest", rest_ev_->self_scm ()); - if (busy_span_req_l_ && !mmrest_p_) - { - mmrest_p_ = new Spanner (get_property ("MultiMeasureRest")); + if (text_events_.size ()) + { + for (int i = 0; i < text_events_.size (); i++) + { - Multi_measure_rest::set_interface (mmrest_p_); - Staff_symbol_referencer::set_interface (mmrest_p_); + 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); + } - announce_grob (mmrest_p_, busy_span_req_l_); - start_measure_i_ - = gh_scm2int (get_property ("currentBarNumber")); - } + /* + 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); + } - if (gh_string_p (get_property ("whichBar"))) - { - Grob *cmc = unsmob_grob (get_property( "currentCommandColumn")); - Item *it = dynamic_cast (cmc); - if (mmrest_p_) - add_bound_item (mmrest_p_, it); - if (lastrest_p_) - add_bound_item (lastrest_p_,it); + 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::stop_translation_timestep () { - SCM smp = get_property ("measurePosition"); - Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0); - - if (mmrest_p_ && (now_mom () >= start_moment_) - && !mp.to_bool () - && mmrest_p_->get_bound (LEFT) && mmrest_p_->get_bound (RIGHT)) + /* + We can not do this earlier, as breakableSeparationItem is not yet there. + */ + + if (bar_seen_) { - typeset_grob (mmrest_p_); + Grob *cmc = unsmob_grob (get_property ("breakableSeparationItem")); + if (!cmc) + cmc = unsmob_grob (get_property ("currentCommandColumn")); + /* - we must keep mmrest_p_ around to set measure-count, so - no mmrest_p_ = 0 here. + Ugh, this is a kludge - need this for multi-measure-rest-grace.ly */ + last_command_item_ = dynamic_cast (cmc); } - if (lastrest_p_) + if (last_command_item_ && (mmrest_ || last_rest_)) { - /* sanity check */ - if (lastrest_p_->get_bound (LEFT) && lastrest_p_->get_bound (RIGHT) - && lastrest_p_->get_bound (LEFT) != lastrest_p_->get_bound (RIGHT)) - typeset_grob (lastrest_p_); - lastrest_p_ = 0; + + 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 (mmrest_) + { + add_bound_item (mmrest_, last_command_item_); + for (int i = 0; i < numbers_.size (); i++) + add_bound_item (numbers_[i], last_command_item_); + + last_command_item_ = 0; + } } + + + SCM smp = get_property ("measurePosition"); + Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0); - if (new_req_l_) + if (last_rest_) { - busy_span_req_l_ = new_req_l_; - new_req_l_ =0; + last_rest_ = 0; + last_numbers_.clear (); } - + + text_events_.clear (); } void Multi_measure_rest_engraver::start_translation_timestep () { + 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); - - if (mmrest_p_ && !mp.to_bool ()) + + Moment now =now_mom (); + if (mmrest_ + && now.main_part_ != last_main_moment_ + && mp.main_part_ == Rational (0)) { - lastrest_p_ = mmrest_p_; - int cur = gh_scm2int (get_property ("currentBarNumber")); - lastrest_p_->set_grob_property ("measure-count", - gh_int2scm (cur - start_measure_i_)); - mmrest_p_ = 0; + last_rest_ = mmrest_; + last_numbers_ = numbers_; + + int cur = ly_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", 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 () { - if (mmrest_p_) - typeset_grob (mmrest_p_); - if (lastrest_p_) - typeset_grob (lastrest_p_); } -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 -", -/* creats*/ "MultiMeasureRest", -/* acks */ "", -/* reads */ "currentBarNumber currentCommandColumn measurePosition", +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 */ "");