/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
if (Music *m = unsmob_music (elt))
last = m->to_relative_octave (last);
+ (void) music_list_to_relative (get_property ("articulations"), last, true);
last = music_list_to_relative (get_property ("elements"), last, false);
return last;
}
if (Music *m = unsmob_music (val))
m->transpose (delta);
}
- else if (prop == ly_symbol2scm ("elements"))
+ else if (prop == ly_symbol2scm ("elements")
+ || prop == ly_symbol2scm ("articulations"))
transpose_music_list (val, delta);
else if (prop == ly_symbol2scm ("pitch-alist")
&& scm_is_pair (val))
ES TODO: This method should probably be reworked or junked.
*/
Stream_event *
-Music::to_event () const
+Music::to_event (Context *c) const
{
SCM class_name = ly_camel_case_2_lisp_identifier (get_property ("name"));
if (!internal_is_music_type (class_name))
programming_error ("Not a music type");
- Stream_event *e = new Stream_event (class_name, mutable_property_alist_);
+ Stream_event *e = new Stream_event (c->make_event_class (class_name),
+ mutable_property_alist_);
Moment length = get_length ();
if (length.to_bool ())
e->set_property ("length", length.smobbed_copy ());
for (; scm_is_pair (art_mus); art_mus = scm_cdr (art_mus))
{
Music *m = unsmob_music (scm_car (art_mus));
- SCM ev = m ? m->to_event ()->unprotect () : scm_car (art_mus);
- art_ev = scm_cons (ev, art_ev);
+ art_ev = scm_cons (m->to_event (c)->unprotect (), art_ev);
}
e->set_property ("articulations", scm_reverse_x (art_ev, SCM_EOL));
}
void
Music::send_to_context (Context *c)
{
- Stream_event *ev = to_event ();
+ Stream_event *ev = to_event (c);
c->event_source ()->broadcast (ev);
ev->unprotect ();
}