X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmulti-measure-rest-engraver.cc;h=3c7eed7524500cdbf455151667b93c1db892aa6e;hb=1da74a6f525cdbb102ad93bfbcc36a620a5754ee;hp=3729344c06448cd434d021043bffdba3f4c26d2e;hpb=5175fb07679b964a62202f6c900451e88d120f69;p=lilypond.git diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc index 3729344c06..3c7eed7524 100644 --- a/lily/multi-measure-rest-engraver.cc +++ b/lily/multi-measure-rest-engraver.cc @@ -1,177 +1,262 @@ /* multi_measure_rest-engraver.cc -- implement Multi_measure_rest_engraver - (c) 1998--2000 Jan Nieuwenhuizen - Han-Wen Nienhuys + (c) 1998--2006 Jan Nieuwenhuizen + Han-Wen Nienhuys */ -#include "musical-request.hh" #include "multi-measure-rest.hh" #include "paper-column.hh" -#include "engraver-group-engraver.hh" -#include "bar.hh" +#include "engraver-group.hh" +#include "side-position-interface.hh" #include "staff-symbol-referencer.hh" -#include "engraver.hh" #include "moment.hh" -#include "spanner.hh" /** - The name says it all: make multi measure rests - */ + The name says it all: make multi measure rests +*/ 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 *); + void process_music (); + void stop_translation_timestep (); + 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_; - Moment start_moment_; - - Spanner *mmrest_p_; - Spanner *lastrest_p_; -}; + Music *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_; -ADD_THIS_TRANSLATOR (Multi_measure_rest_engraver); + 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; } -void -Multi_measure_rest_engraver::acknowledge_element (Score_element_info i) +bool +Multi_measure_rest_engraver::try_music (Music *event) { - Item * item = dynamic_cast (i.elem_l_); - if (item && Bar::has_interface (item)) + if (event->is_mus_type ("multi-measure-rest-event")) { - if (mmrest_p_) - Multi_measure_rest::add_column (mmrest_p_,item); - if (lastrest_p_) - Multi_measure_rest::add_column (lastrest_p_,item); + rest_ev_ = event; + stop_moment_ = now_mom () + rest_ev_->get_length (); + + return true; + } + else if (event->is_mus_type ("multi-measure-text-event")) + { + text_events_.push_back (event); + return true; } + return false; } -bool -Multi_measure_rest_engraver::do_try_music (Music* req_l) +void +Multi_measure_rest_engraver::process_music () { - if (Span_req * sp = dynamic_cast (req_l)) + if (rest_ev_ && !mmrest_ + && stop_moment_ > now_mom ()) { - if (sp->span_type_str_ == "rest") + 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->span_dir_ == STOP) + for (vsize i = 0; i < text_events_.size (); i++) { - stop_req_l_ = sp; + + 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_back (sp); } - else if (sp->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); } - } - return false; -} + 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 ("currentBarNumber")); + } + bar_seen_ = bar_seen_ || scm_is_string (get_property ("whichBar")); +} void -Multi_measure_rest_engraver::do_process_music () +Multi_measure_rest_engraver::stop_translation_timestep () { - 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_) + /* We cannot do this earlier, as breakableSeparationItem is not yet + there. */ + if (bar_seen_) { - busy_span_req_l_ = new_req_l_; - new_req_l_ =0; + 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 (busy_span_req_l_ && !mmrest_p_) + if (last_command_item_ && (mmrest_ || last_rest_)) { - mmrest_p_ = new Spanner (get_property ("basicMultiMeasureRestProperties")); + 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_element (mmrest_p_, busy_span_req_l_); - start_measure_i_ - = gh_scm2int (get_property ("currentBarNumber")); + last_command_item_ = 0; + } } + + Moment mp (robust_scm2moment (get_property ("measurePosition"), Moment (0))); + if (last_rest_) + { + last_rest_ = 0; + last_numbers_.clear (); + } + + text_events_.clear (); + bar_seen_ = false; } void -Multi_measure_rest_engraver::do_pre_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 (now_mom ().main_part_ >= stop_moment_.main_part_) + rest_ev_ = 0; - if (mmrest_p_ && (now_mom () >= start_moment_) - && !mp - && (scm_ilength (mmrest_p_->get_elt_property ("columns")) >= 2)) + 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_element (mmrest_p_); + last_rest_ = mmrest_; + last_numbers_ = numbers_; + + int cur = scm_to_int (get_property ("currentBarNumber")); + int num = cur - start_measure_; + /* - must keep mmrest_p_ around to set measures_i_ - */ - } - if (lastrest_p_) - { - typeset_element (lastrest_p_); - lastrest_p_ = 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_from_int (num)); - if (new_req_l_) - { - busy_span_req_l_ = new_req_l_; - new_req_l_ =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); + + 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 (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::do_post_move_processing () +Multi_measure_rest_engraver::finalize () { - SCM smp = get_property ("measurePosition"); - Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0); - - if (mmrest_p_ && !mp) - { - lastrest_p_ = mmrest_p_; - int cur = gh_scm2int (get_property ("currentBarNumber")); - lastrest_p_->set_elt_property ("measure-count", - gh_int2scm (cur - start_measure_i_)); - mmrest_p_ = 0; - } } +#include "translator.icc" -void -Multi_measure_rest_engraver::do_removal_processing () -{ - if (mmrest_p_) - typeset_element (mmrest_p_); - if (lastrest_p_) - typeset_element (lastrest_p_); -} +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 */ "");