private:
Stream_event *rest_ev_;
- vector<Stream_event*> text_events_;
+ vector<Stream_event *> text_events_;
int start_measure_;
Rational last_main_moment_;
Moment stop_moment_;
Spanner *last_rest_;
Spanner *mmrest_;
- vector<Spanner*> numbers_;
- vector<Spanner*> last_numbers_;
+ vector<Spanner *> numbers_;
+ vector<Spanner *> last_numbers_;
};
Multi_measure_rest_engraver::Multi_measure_rest_engraver ()
mmrest_ = make_spanner ("MultiMeasureRest", rest_ev_->self_scm ());
Spanner *sp
- = make_spanner ("MultiMeasureRestNumber", rest_ev_->self_scm ());
+ = make_spanner ("MultiMeasureRestNumber", rest_ev_->self_scm ());
numbers_.push_back (sp);
if (text_events_.size ())
- {
- for (vsize i = 0; i < text_events_.size (); i++)
- {
- 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);
- }
-
- /*
- Stack different scripts.
- */
- Direction d = DOWN;
- do
- {
- 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];
- }
- }
- }
- while (flip (&d) != DOWN);
- }
+ {
+ for (vsize i = 0; i < text_events_.size (); i++)
+ {
+ 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);
+ }
+
+ /*
+ Stack different scripts.
+ */
+ Direction d = DOWN;
+ do
+ {
+ 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];
+ }
+ }
+ }
+ 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);
- }
+ {
+ Side_position_interface::add_support (numbers_[i], mmrest_);
+ numbers_[i]->set_parent (mmrest_, Y_AXIS);
+ }
start_measure_
- = scm_to_int (get_property ("internalBarNumber"));
+ = scm_to_int (get_property ("internalBarNumber"));
}
bar_seen_ = bar_seen_ || scm_is_string (get_property ("whichBar"));
if (last_command_item_ && (mmrest_ || last_rest_))
{
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_);
- }
+ {
+ 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_);
+ }
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_);
+ {
+ add_bound_item (mmrest_, last_command_item_);
+ for (vsize i = 0; i < numbers_.size (); i++)
+ add_bound_item (numbers_[i], last_command_item_);
- last_command_item_ = 0;
- }
+ last_command_item_ = 0;
+ }
}
Moment mp (robust_scm2moment (get_property ("measurePosition"), Moment (0)));
int num = cur - start_measure_;
/*
- We can't plug a markup directly into the grob, since the
- measure-count determines the formatting of the mmrest.
+ 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));
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);
- }
- }
+ {
+ 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_;
}
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}.",
-
- /* create */
- "MultiMeasureRest "
- "MultiMeasureRestNumber "
- "MultiMeasureRestText ",
-
- /* read */
- "internalBarNumber "
- "restNumberThreshold "
- "currentCommandColumn "
- "measurePosition ",
-
- /* write */
- ""
- );
+ /* 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}.",
+
+ /* create */
+ "MultiMeasureRest "
+ "MultiMeasureRestNumber "
+ "MultiMeasureRestText ",
+
+ /* read */
+ "internalBarNumber "
+ "restNumberThreshold "
+ "currentCommandColumn "
+ "measurePosition ",
+
+ /* write */
+ ""
+ );