/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2004--2011 Han-Wen Nienhuys
+ Copyright (C) 2004--2014 Han-Wen Nienhuys
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
scm_gc_mark (first_iter_->self_scm ());
if (second_iter_)
scm_gc_mark (second_iter_->self_scm ());
-
- Stream_event *ptrs[]
- =
- {
- unisono_event_,
- mmrest_event_,
- solo_two_event_,
- solo_one_event_,
- 0
- };
- for (int i = 0; ptrs[i]; i++)
- if (ptrs[i])
- scm_gc_mark (ptrs[i]->self_scm ());
+ if (unisono_event_)
+ scm_gc_mark (unisono_event_->self_scm ());
+ if (mmrest_event_)
+ scm_gc_mark (mmrest_event_->self_scm ());
+ if (solo_one_event_)
+ scm_gc_mark (solo_one_event_->self_scm ());
+ if (solo_two_event_)
+ scm_gc_mark (solo_two_event_->self_scm ());
}
void
if (!mmrest_event_)
{
- mmrest_event_ = new Stream_event (ly_symbol2scm ("multi-measure-rest-event"));
+ mmrest_event_ = new Stream_event
+ (scm_call_1 (ly_lily_module_constant ("ly:make-event-class"),
+ ly_symbol2scm ("multi-measure-rest-event")));
mmrest_event_->set_property ("duration", SCM_EOL);
mmrest_event_->unprotect ();
}
{
if (!unisono_event_)
{
- unisono_event_ = new Stream_event (ly_symbol2scm ("unisono-event"));
+ unisono_event_ = new Stream_event
+ (scm_call_1 (ly_lily_module_constant ("ly:make-event-class"),
+ ly_symbol2scm ("unisono-event")));
unisono_event_->unprotect ();
}
{
if (!solo_one_event_)
{
- solo_one_event_ = new Stream_event (ly_symbol2scm ("solo-one-event"));
+ solo_one_event_ = new Stream_event
+ (scm_call_1 (ly_lily_module_constant ("ly:make-event-class"),
+ ly_symbol2scm ("solo-one-event")));
solo_one_event_->unprotect ();
}
{
if (!solo_two_event_)
{
- solo_two_event_ = new Stream_event (ly_symbol2scm ("solo-two-event"));
+ solo_two_event_ = new Stream_event
+ (scm_call_1 (ly_lily_module_constant ("ly:make-event-class"),
+ ly_symbol2scm ("solo-two-event")));
solo_two_event_->unprotect ();
}
"DynamicLineSpanner",
"Tie",
"Dots",
+ "MultiMeasureRest",
"Rest",
"Slur",
"TextScript",
ly_symbol2scm ("horizontal-shift"), horizontalShiftOne_);
execute_pushpop_property (two, ly_symbol2scm ("NoteColumn"),
ly_symbol2scm ("horizontal-shift"), horizontalShiftTwo_);
- /* Also handle MultiMeasureRest positions for voice 1/2 */
- execute_pushpop_property (one, ly_symbol2scm ("MultiMeasureRest"),
- ly_symbol2scm ("staff-position"), scm_from_int (4));
- execute_pushpop_property (two, ly_symbol2scm ("MultiMeasureRest"),
- ly_symbol2scm ("staff-position"), scm_from_int (-4));
}