X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmulti-measure-rest-engraver.cc;h=9391aac0b880d9f56f5b4fc30e1c74a744857121;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=d0f625b1c9e8ad08f249c05248d612d670d5a31c;hpb=75eebcb49e52d296b1da3e1074e0825d2c780db4;p=lilypond.git diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc index d0f625b1c9..9391aac0b8 100644 --- a/lily/multi-measure-rest-engraver.cc +++ b/lily/multi-measure-rest-engraver.cc @@ -1,7 +1,7 @@ /* multi_measure_rest-engraver.cc -- implement Multi_measure_rest_engraver - (c) 1998--2006 Jan Nieuwenhuizen + (c) 1998--2008 Jan Nieuwenhuizen Han-Wen Nienhuys */ @@ -10,7 +10,11 @@ #include "engraver-group.hh" #include "side-position-interface.hh" #include "staff-symbol-referencer.hh" +#include "stream-event.hh" #include "moment.hh" +#include "spanner.hh" + +#include "translator.icc" /** The name says it all: make multi measure rests @@ -21,15 +25,16 @@ public: TRANSLATOR_DECLARATIONS (Multi_measure_rest_engraver); protected: - virtual bool try_music (Music *); 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 *rest_ev_; - Link_array text_events_; + Stream_event *rest_ev_; + vector text_events_; int start_measure_; Rational last_main_moment_; Moment stop_moment_; @@ -39,8 +44,8 @@ private: Spanner *last_rest_; Spanner *mmrest_; - Link_array numbers_; - Link_array last_numbers_; + vector numbers_; + vector last_numbers_; }; Multi_measure_rest_engraver::Multi_measure_rest_engraver () @@ -57,22 +62,25 @@ Multi_measure_rest_engraver::Multi_measure_rest_engraver () rest_ev_ = 0; } -bool -Multi_measure_rest_engraver::try_music (Music *event) +IMPLEMENT_TRANSLATOR_LISTENER (Multi_measure_rest_engraver, multi_measure_rest); +void +Multi_measure_rest_engraver::listen_multi_measure_rest (Stream_event *ev) { - if (event->is_mus_type ("multi-measure-rest-event")) - { - rest_ev_ = event; - stop_moment_ = now_mom () + rest_ev_->get_length (); + /* 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_); + */ +} - return true; - } - else if (event->is_mus_type ("multi-measure-text-event")) - { - text_events_.push (event); - return true; - } - return false; +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 @@ -85,14 +93,13 @@ Multi_measure_rest_engraver::process_music () Spanner *sp = make_spanner ("MultiMeasureRestNumber", rest_ev_->self_scm ()); - numbers_.push (sp); + numbers_.push_back (sp); if (text_events_.size ()) { - for (int i = 0; i < text_events_.size (); i++) + for (vsize i = 0; i < text_events_.size (); i++) { - - Music *e = text_events_[i]; + Stream_event *e = text_events_[i]; Spanner *sp = make_spanner ("MultiMeasureRestText", e->self_scm ()); SCM t = e->get_property ("text"); @@ -101,7 +108,7 @@ Multi_measure_rest_engraver::process_music () if (is_direction (dir)) sp->set_property ("direction", dir); - numbers_.push (sp); + numbers_.push_back (sp); } /* @@ -111,7 +118,7 @@ Multi_measure_rest_engraver::process_music () do { Grob *last = 0; - for (int i = 0; i < numbers_.size (); i++) + for (vsize i = 0; i < numbers_.size (); i++) { if (scm_from_int (d) == numbers_[i]->get_property ("direction")) { @@ -124,14 +131,14 @@ Multi_measure_rest_engraver::process_music () while (flip (&d) != DOWN); } - for (int i = 0; i < numbers_.size (); i++) + 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")); + = scm_to_int (get_property ("internalBarNumber")); } bar_seen_ = bar_seen_ || scm_is_string (get_property ("whichBar")); @@ -141,12 +148,13 @@ void Multi_measure_rest_engraver::stop_translation_timestep () { /* We cannot do this earlier, as breakableSeparationItem is not yet - there. */ + there. + + Actually, we no longer use breakableSeparationItem -- should this be moved? + -- jneem */ if (bar_seen_) { - Grob *cmc = unsmob_grob (get_property ("breakableSeparationItem")); - if (!cmc) - cmc = unsmob_grob (get_property ("currentCommandColumn")); + 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); @@ -157,14 +165,14 @@ Multi_measure_rest_engraver::stop_translation_timestep () if (last_rest_) { add_bound_item (last_rest_, last_command_item_); - for (int i = 0; i < last_numbers_.size (); i++) + 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 (int i = 0; i < numbers_.size (); i++) + for (vsize i = 0; i < numbers_.size (); i++) add_bound_item (numbers_[i], last_command_item_); last_command_item_ = 0; @@ -198,7 +206,7 @@ Multi_measure_rest_engraver::start_translation_timestep () last_rest_ = mmrest_; last_numbers_ = numbers_; - int cur = scm_to_int (get_property ("currentBarNumber")); + int cur = scm_to_int (get_property ("internalBarNumber")); int num = cur - start_measure_; /* @@ -242,21 +250,28 @@ Multi_measure_rest_engraver::finalize () { } -#include "translator.icc" - 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", + "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 */ - "currentBarNumber " + "internalBarNumber " "restNumberThreshold " "breakableSeparationItem " "currentCommandColumn " "measurePosition " - "measureLength", - /* write */ ""); + "measureLength ", + + /* write */ + "" + );