X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmulti-measure-rest-engraver.cc;h=3c7eed7524500cdbf455151667b93c1db892aa6e;hb=5d1d077e3d4f49fd822d3c04e785eee4be06a7fc;hp=a4969776819ffcb207986a64b82b37eb8a6f2375;hpb=a1aebf5d6fccf7ab9a7106178e017c370484d40f;p=lilypond.git diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc index a496977681..3c7eed7524 100644 --- a/lily/multi-measure-rest-engraver.cc +++ b/lily/multi-measure-rest-engraver.cc @@ -1,13 +1,13 @@ /* multi_measure_rest-engraver.cc -- implement Multi_measure_rest_engraver - (c) 1998--2005 Jan Nieuwenhuizen - Han-Wen Nienhuys + (c) 1998--2006 Jan Nieuwenhuizen + Han-Wen Nienhuys */ #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 "moment.hh" @@ -22,14 +22,14 @@ public: protected: virtual bool try_music (Music *); - PRECOMPUTED_VIRTUAL void process_music (); - PRECOMPUTED_VIRTUAL void stop_translation_timestep (); - PRECOMPUTED_VIRTUAL void start_translation_timestep (); + void process_music (); + void stop_translation_timestep (); + void start_translation_timestep (); virtual void finalize (); private: Music *rest_ev_; - Link_array text_events_; + vector text_events_; int start_measure_; Rational last_main_moment_; Moment stop_moment_; @@ -39,8 +39,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 () @@ -49,7 +49,7 @@ Multi_measure_rest_engraver::Multi_measure_rest_engraver () /* For the start of a score. - */ + */ bar_seen_ = true; start_measure_ = 0; mmrest_ = 0; @@ -69,7 +69,7 @@ Multi_measure_rest_engraver::try_music (Music *event) } else if (event->is_mus_type ("multi-measure-text-event")) { - text_events_.push (event); + text_events_.push_back (event); return true; } return false; @@ -85,11 +85,11 @@ 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]; @@ -101,7 +101,7 @@ Multi_measure_rest_engraver::process_music () if (is_direction (dir)) sp->set_property ("direction", dir); - numbers_.push (sp); + numbers_.push_back (sp); } /* @@ -111,9 +111,9 @@ 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_int2num (d) == numbers_[i]->get_property ("direction")) + if (scm_from_int (d) == numbers_[i]->get_property ("direction")) { if (last) Side_position_interface::add_support (numbers_[i], last); @@ -124,7 +124,7 @@ 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); @@ -157,14 +157,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; @@ -186,9 +186,7 @@ void Multi_measure_rest_engraver::start_translation_timestep () { if (now_mom ().main_part_ >= stop_moment_.main_part_) - { - rest_ev_ = 0; - } + rest_ev_ = 0; Moment mp (robust_scm2moment (get_property ("measurePosition"), Moment (0))); @@ -207,14 +205,12 @@ Multi_measure_rest_engraver::start_translation_timestep () 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)); + 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_property ("use-breve-rest", SCM_BOOL_T); - } + last_rest_->set_property ("use-breve-rest", SCM_BOOL_T); mmrest_ = 0; numbers_.clear (); @@ -232,7 +228,7 @@ Multi_measure_rest_engraver::start_translation_timestep () else { SCM text - = scm_number_to_string (scm_int2num (num), scm_from_int (10)); + = scm_number_to_string (scm_from_int (num), scm_from_int (10)); last->set_property ("text", text); } } @@ -249,13 +245,18 @@ Multi_measure_rest_engraver::finalize () #include "translator.icc" ADD_TRANSLATOR (Multi_measure_rest_engraver, - /* descr */ + /* 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 ", - /* creats*/ "MultiMeasureRest MultiMeasureRestNumber MultiMeasureRestText", - /* accepts */ "multi-measure-rest-event multi-measure-text-event", - /* acks */ "", - /* reads */ "currentBarNumber restNumberThreshold breakableSeparationItem currentCommandColumn measurePosition measureLength", + /* create */ "MultiMeasureRest MultiMeasureRestNumber MultiMeasureRestText", + /* accept */ "multi-measure-rest-event multi-measure-text-event", + /* read */ + "currentBarNumber " + "restNumberThreshold " + "breakableSeparationItem " + "currentCommandColumn " + "measurePosition " + "measureLength", /* write */ "");