X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmulti-measure-rest-engraver.cc;h=9391aac0b880d9f56f5b4fc30e1c74a744857121;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=ba7cdafbc730b8335fb8cca6cb487915e2f6eb11;hpb=2804f8f79e01dc606ce067bffda2d966524e6e36;p=lilypond.git diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc index ba7cdafbc7..9391aac0b8 100644 --- a/lily/multi-measure-rest-engraver.cc +++ b/lily/multi-measure-rest-engraver.cc @@ -1,189 +1,277 @@ /* multi_measure_rest-engraver.cc -- implement Multi_measure_rest_engraver - (c) 1998--2002 Jan Nieuwenhuizen - Han-Wen Nienhuys + (c) 1998--2008 Jan Nieuwenhuizen + Han-Wen Nienhuys */ -#include "musical-request.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: - Span_req * new_req_l_; - Span_req * busy_span_req_l_; - Span_req * stop_req_l_; - int start_measure_i_; - Moment start_moment_; - - Spanner *mmrest_p_; - Spanner *lastrest_p_; -}; + Stream_event *rest_ev_; + vector text_events_; + int start_measure_; + Rational last_main_moment_; + Moment stop_moment_; + bool bar_seen_; + Item *last_command_item_; + Spanner *last_rest_; + Spanner *mmrest_; + vector numbers_; + vector 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; + + /* + For the start of a score. + */ + bar_seen_ = true; + start_measure_ = 0; + mmrest_ = 0; + last_rest_ = 0; + rest_ev_ = 0; } +IMPLEMENT_TRANSLATOR_LISTENER (Multi_measure_rest_engraver, multi_measure_rest); +void +Multi_measure_rest_engraver::listen_multi_measure_rest (Stream_event *ev) +{ + /* FIXME: Should use ASSIGN_EVENT_ONCE. Can't do that yet because of + the kill-mm-rests hack in part-combine-iterator. */ + rest_ev_ = ev; + stop_moment_ = now_mom () + get_event_length (rest_ev_, now_mom ()); + /* + if (ASSIGN_EVENT_ONCE (rest_ev_, ev)) + stop_moment_ = now_mom () + get_event_length (rest_ev_); + */ +} -bool -Multi_measure_rest_engraver::try_music (Music* req_l) +IMPLEMENT_TRANSLATOR_LISTENER (Multi_measure_rest_engraver, multi_measure_text); +void +Multi_measure_rest_engraver::listen_multi_measure_text (Stream_event *ev) +{ + text_events_.push_back (ev); +} + +void +Multi_measure_rest_engraver::process_music () { - if (Span_req * sp = dynamic_cast (req_l)) + if (rest_ev_ && !mmrest_ + && stop_moment_ > now_mom ()) { - - if (scm_equal_p (sp->get_mus_property ("span-type"), - ly_str02scm ("rest")) == SCM_BOOL_T) + mmrest_ = make_spanner ("MultiMeasureRest", rest_ev_->self_scm ()); + + Spanner *sp + = make_spanner ("MultiMeasureRestNumber", rest_ev_->self_scm ()); + numbers_.push_back (sp); + + if (text_events_.size ()) { - if (sp->get_span_dir () == STOP) + for (vsize i = 0; i < text_events_.size (); i++) { - stop_req_l_ = sp; + 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); + + numbers_.push_back (sp); } - else if (sp->get_span_dir () == START && !new_req_l_) + + /* + Stack different scripts. + */ + Direction d = DOWN; + do { - new_req_l_ = sp; + 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]; + } + } } - return true; + while (flip (&d) != DOWN); + } + + for (vsize i = 0; i < numbers_.size (); i++) + { + Side_position_interface::add_support (numbers_[i], mmrest_); + numbers_[i]->set_parent (mmrest_, Y_AXIS); } + + start_measure_ + = scm_to_int (get_property ("internalBarNumber")); } - return false; + + bar_seen_ = bar_seen_ || scm_is_string (get_property ("whichBar")); } void -Multi_measure_rest_engraver::process_music () +Multi_measure_rest_engraver::stop_translation_timestep () { - if (new_req_l_ && stop_req_l_) - stop_req_l_ = 0; + /* We cannot do this earlier, as breakableSeparationItem is not yet + there. - 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_) + Actually, we no longer use breakableSeparationItem -- should this be moved? + -- jneem */ + if (bar_seen_) { - busy_span_req_l_ = new_req_l_; - new_req_l_ =0; + Grob *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 (busy_span_req_l_ && !mmrest_p_) + if (last_command_item_ && (mmrest_ || last_rest_)) { - mmrest_p_ = new Spanner (get_property ("MultiMeasureRest")); + if (last_rest_) + { + 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_); + } - Multi_measure_rest::set_interface (mmrest_p_); - Staff_symbol_referencer::set_interface (mmrest_p_); + 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_); - announce_grob(mmrest_p_, busy_span_req_l_->self_scm()); - start_measure_i_ - = gh_scm2int (get_property ("currentBarNumber")); + last_command_item_ = 0; + } } - if (gh_string_p (get_property ("whichBar"))) + Moment mp (robust_scm2moment (get_property ("measurePosition"), Moment (0))); + if (last_rest_) { - 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); + last_rest_ = 0; + last_numbers_.clear (); } + + text_events_.clear (); + bar_seen_ = false; } void -Multi_measure_rest_engraver::stop_translation_timestep () +Multi_measure_rest_engraver::start_translation_timestep () { - SCM smp = get_property ("measurePosition"); - Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0); + if (now_mom ().main_part_ >= stop_moment_.main_part_) + rest_ev_ = 0; - if (mmrest_p_ && (now_mom () >= start_moment_) - && !mp.to_bool () - && mmrest_p_->get_bound (LEFT) && mmrest_p_->get_bound (RIGHT)) + 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)) { - typeset_grob (mmrest_p_); + last_rest_ = mmrest_; + last_numbers_ = numbers_; + + int cur = scm_to_int (get_property ("internalBarNumber")); + int num = cur - start_measure_; + /* - we must keep mmrest_p_ around to set measure-count, so - no mmrest_p_ = 0 here. - */ - } + 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)); - if (lastrest_p_) - { - /* 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; - } + 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); - if (new_req_l_) - { - busy_span_req_l_ = new_req_l_; - new_req_l_ =0; - } - -} + mmrest_ = 0; + numbers_.clear (); -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_p_ && !mp.to_bool ()) - { - 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; + 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 (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_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", -/* write */ ""); +ADD_TRANSLATOR (Multi_measure_rest_engraver, + /* doc */ + "Engrave multi-measure rests that are produced with" + " @samp{R}. It reads @code{measurePosition} and" + " @code{internalBarNumber} to determine what number to print" + " over the @ref{MultiMeasureRest}. Reads @code{measureLength}" + " to determine whether it should use a whole rest or a breve" + " rest to represent one measure.", + + /* create */ + "MultiMeasureRest " + "MultiMeasureRestNumber " + "MultiMeasureRestText ", + + /* read */ + "internalBarNumber " + "restNumberThreshold " + "breakableSeparationItem " + "currentCommandColumn " + "measurePosition " + "measureLength ", + + /* write */ + "" + );