X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmulti-measure-rest-engraver.cc;h=ff073601e938be2081af8b271c3c20a2bada0aeb;hb=455116c39466c026839f1bf728c05ecaa6015a9c;hp=164fbcb65ba584d14faedb7a707dc66fb98194bd;hpb=0d239922fe322428efabd1fb20c8a54c2a6bacfb;p=lilypond.git diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc index 164fbcb65b..ff073601e9 100644 --- a/lily/multi-measure-rest-engraver.cc +++ b/lily/multi-measure-rest-engraver.cc @@ -1,238 +1,260 @@ /* multi_measure_rest-engraver.cc -- implement Multi_measure_rest_engraver - (c) 1998--2002 Jan Nieuwenhuizen - Han-Wen Nienhuys + (c) 1998--2006 Jan Nieuwenhuizen + Han-Wen Nienhuys */ -#include "event.hh" #include "multi-measure-rest.hh" #include "paper-column.hh" -#include "engraver-group-engraver.hh" +#include "engraver-group.hh" #include "side-position-interface.hh" #include "staff-symbol-referencer.hh" -#include "engraver.hh" +#include "stream-event.hh" #include "moment.hh" -#include "spanner.hh" -/** - The name says it all: make multi measure rests +#include "translator.icc" +/** + 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*); - virtual void process_music (); - virtual void stop_translation_timestep (); - virtual void start_translation_timestep (); + void process_music (); + void stop_translation_timestep (); + void start_translation_timestep (); virtual void finalize (); + DECLARE_TRANSLATOR_LISTENER (multi_measure_rest); + DECLARE_TRANSLATOR_LISTENER (multi_measure_text); private: - Music * new_req_; - Music * busy_span_req_; - Music * stop_req_; + Stream_event *rest_ev_; + vector text_events_; int start_measure_; - Moment start_moment_; - + Rational last_main_moment_; + Moment stop_moment_; + bool bar_seen_; + Item *last_command_item_; + Spanner *last_rest_; Spanner *mmrest_; - Spanner *number_; - Spanner *last_number_; - Spanner *last_rest_; + vector numbers_; + vector last_numbers_; }; Multi_measure_rest_engraver::Multi_measure_rest_engraver () { + last_command_item_ = 0; + + /* + For the start of a score. + */ + bar_seen_ = true; start_measure_ = 0; mmrest_ = 0; - last_rest_ =0; - number_ = 0; - new_req_ = busy_span_req_ = stop_req_ =0; + last_rest_ = 0; + rest_ev_ = 0; } -bool -Multi_measure_rest_engraver::try_music (Music* req) +IMPLEMENT_TRANSLATOR_LISTENER (Multi_measure_rest_engraver, multi_measure_rest); +void +Multi_measure_rest_engraver::listen_multi_measure_rest (Stream_event *ev) { - if (req->is_mus_type ("multi-measure-rest-event")) - { - Direction d = to_dir (req->get_mus_property ("span-direction")); - if (d == STOP) - { - stop_req_ = req; - } - else if (d == START&& !new_req_) - { - new_req_ = req; - } - return true; - } - return false; + rest_ev_ = ev; + stop_moment_ = now_mom () + get_event_length (rest_ev_); } +IMPLEMENT_TRANSLATOR_LISTENER (Multi_measure_rest_engraver, multi_measure_text); void -Multi_measure_rest_engraver::process_music () +Multi_measure_rest_engraver::listen_multi_measure_text (Stream_event *ev) { - if (new_req_ && stop_req_) - stop_req_ = 0; - - if (new_req_) - start_moment_ = now_mom (); + text_events_.push_back (ev); +} - if (stop_req_) - { - busy_span_req_ =0; - stop_req_ = 0; - } - - if (new_req_) +void +Multi_measure_rest_engraver::process_music () +{ + if (rest_ev_ && !mmrest_ + && stop_moment_ > now_mom ()) { - busy_span_req_ = new_req_; - new_req_ =0; - } + mmrest_ = make_spanner ("MultiMeasureRest", rest_ev_->self_scm ()); - if (busy_span_req_ && !mmrest_) - { - mmrest_ = new Spanner (get_property ("MultiMeasureRest")); - number_ = new Spanner (get_property ("MultiMeasureRestNumber")); + Spanner *sp + = make_spanner ("MultiMeasureRestNumber", rest_ev_->self_scm ()); + numbers_.push_back (sp); - Side_position_interface::add_support (number_, mmrest_); - number_->set_parent (mmrest_, Y_AXIS); + if (text_events_.size ()) + { + for (vsize i = 0; i < text_events_.size (); i++) + { + Stream_event *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); - announce_grob (mmrest_, busy_span_req_->self_scm()); - announce_grob (number_, busy_span_req_->self_scm()); - start_measure_ - = gh_scm2int (get_property ("currentBarNumber")); - } + numbers_.push_back (sp); + } - 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); - add_bound_item (number_, it); + /* + Stack different scripts. + */ + Direction d = DOWN; + do + { + Grob *last = 0; + for (vsize i = 0; i < numbers_.size (); i++) + { + if (scm_from_int (d) == numbers_[i]->get_property ("direction")) + { + if (last) + Side_position_interface::add_support (numbers_[i], last); + last = numbers_[i]; + } + } + } + while (flip (&d) != DOWN); } - if (last_rest_) + + for (vsize i = 0; i < numbers_.size (); i++) { - add_bound_item (last_rest_,it); - add_bound_item (last_number_, it); - } + Side_position_interface::add_support (numbers_[i], mmrest_); + numbers_[i]->set_parent (mmrest_, Y_AXIS); + } + + start_measure_ + = scm_to_int (get_property ("currentBarNumber")); } + + bar_seen_ = bar_seen_ || scm_is_string (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_ && (now_mom () >= start_moment_) - && !mp.to_bool () - && mmrest_->get_bound (LEFT) && mmrest_->get_bound (RIGHT)) + /* We cannot do this earlier, as breakableSeparationItem is not yet + there. */ + if (bar_seen_) { - typeset_grob (mmrest_); - typeset_grob (number_); - Side_position_interface::add_staff_support (number_); - /* - we must keep mmrest_ around to set measure-count, so - no mmrest_ = 0 here. - */ + Grob *cmc = unsmob_grob (get_property ("breakableSeparationItem")); + if (!cmc) + cmc = unsmob_grob (get_property ("currentCommandColumn")); - + /* Ugh, this is a kludge - need this for multi-measure-rest-grace.ly */ + last_command_item_ = dynamic_cast (cmc); } - if (last_rest_) + if (last_command_item_ && (mmrest_ || 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)) + if (last_rest_) { - typeset_grob (last_rest_); - typeset_grob (last_number_); + add_bound_item (last_rest_, last_command_item_); + for (vsize 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 (vsize i = 0; i < numbers_.size (); i++) + add_bound_item (numbers_[i], last_command_item_); + + last_command_item_ = 0; } - last_rest_ = 0; - last_number_ = 0; } - if (new_req_) + Moment mp (robust_scm2moment (get_property ("measurePosition"), Moment (0))); + if (last_rest_) { - busy_span_req_ = new_req_; - new_req_ =0; + last_rest_ = 0; + last_numbers_.clear (); } - + + text_events_.clear (); + bar_seen_ = false; } void Multi_measure_rest_engraver::start_translation_timestep () { - SCM smp = get_property ("measurePosition"); - Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0); - - if (mmrest_ && !mp.to_bool ()) + if (now_mom ().main_part_ >= stop_moment_.main_part_) + rest_ev_ = 0; + + Moment mp (robust_scm2moment (get_property ("measurePosition"), Moment (0))); + + Moment now = now_mom (); + if (mmrest_ + && now.main_part_ != last_main_moment_ + && mp.main_part_ == Rational (0)) { last_rest_ = mmrest_; - last_number_ = number_; + last_numbers_ = numbers_; - int cur = gh_scm2int (get_property ("currentBarNumber")); + int cur = scm_to_int (get_property ("currentBarNumber")); int num = cur - start_measure_; - last_rest_->set_grob_property ("measure-count", gh_int2scm (num)); + + /* + 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_from_int (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); - } + last_rest_->set_property ("use-breve-rest", SCM_BOOL_T); mmrest_ = 0; + numbers_.clear (); - SCM text =last_number_->get_grob_property ("text"); - SCM thres = get_property ("restNumberThreshold"); - int t = 1; - if (gh_number_p (thres)) - t = gh_scm2int (thres); - - if (text == SCM_EOL && num <= t) - last_number_->suicide(); - else if (text == SCM_EOL) + Grob *last = last_numbers_.size () ? last_numbers_[0] : 0; + if (last && last->get_property ("text") == SCM_EOL) { - text = scm_number_to_string (gh_int2scm (num), SCM_MAKINUM (10)); - last_number_->set_grob_property ("text", text); + SCM thres = get_property ("restNumberThreshold"); + int t = 1; + if (scm_is_number (thres)) + t = scm_to_int (thres); + + if (num <= t) + last->suicide (); + else + { + SCM text + = scm_number_to_string (scm_from_int (num), scm_from_int (10)); + last->set_property ("text", text); + } } } -} + last_main_moment_ = now.main_part_; +} void Multi_measure_rest_engraver::finalize () { - if (mmrest_) - { - typeset_grob (mmrest_); - typeset_grob (number_); - } - if (last_rest_) - { - typeset_grob (last_rest_); - typeset_grob (last_number_); - } } -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", -/* accepts */ "multi-measure-rest-event", -/* acks */ "", -/* reads */ "currentBarNumber restNumberThreshold currentCommandColumn measurePosition measureLength", -/* write */ ""); +ADD_TRANSLATOR (Multi_measure_rest_engraver, + /* doc */ + "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 ", + /* create */ "MultiMeasureRest MultiMeasureRestNumber MultiMeasureRestText", + /* accept */ "multi-measure-rest-event multi-measure-text-event", + /* read */ + "currentBarNumber " + "restNumberThreshold " + "breakableSeparationItem " + "currentCommandColumn " + "measurePosition " + "measureLength", + /* write */ "");