/*
multi_measure_rest-engraver.cc -- implement Multi_measure_rest_engraver
- (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
- Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+ Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#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"
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<Music> text_events_;
+ vector<Music*> text_events_;
int start_measure_;
Rational last_main_moment_;
Moment stop_moment_;
Spanner *last_rest_;
Spanner *mmrest_;
- Link_array<Spanner> numbers_;
- Link_array<Spanner> last_numbers_;
+ vector<Spanner*> numbers_;
+ vector<Spanner*> last_numbers_;
};
Multi_measure_rest_engraver::Multi_measure_rest_engraver ()
/*
For the start of a score.
- */
+ */
bar_seen_ = true;
start_measure_ = 0;
mmrest_ = 0;
}
else if (event->is_mus_type ("multi-measure-text-event"))
{
- text_events_.push (event);
+ text_events_.push_back (event);
return true;
}
return false;
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];
if (is_direction (dir))
sp->set_property ("direction", dir);
- numbers_.push (sp);
+ numbers_.push_back (sp);
}
/*
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);
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);
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;
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)));
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 ();
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);
}
}
#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 */ "");