markup-commands rest-by-number and rest

[lilypond.git] / lily / music.cc

diff --git a/lily/music.cc b/lily/music.cc
index e96e83d59fa14016a3afc10b14c5b63fbcc7dd6e..7a38d7af41d84851151b65e2c5bcbdaa4cc4e010 100644 (file)
--- a/lily/music.cc
+++ b/lily/music.cc
@@ -234,7 +234,7 @@ transpose_mutable (SCM alist, Pitch delta)
             m->transpose (delta);
         }
       else if (prop == ly_symbol2scm ("elements")
-              || prop == ly_symbol2scm ("articulations"))
+               || prop == ly_symbol2scm ("articulations"))
         transpose_music_list (val, delta);
       else if (prop == ly_symbol2scm ("pitch-alist")
                && scm_is_pair (val))
@@ -271,7 +271,7 @@ Music::origin () const
   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"));
 
@@ -279,9 +279,8 @@ Music::to_event () const
   if (!internal_is_music_type (class_name))
     programming_error ("Not a music type");
 
-  Stream_event *e = new Stream_event
-    (scm_call_1 (ly_lily_module_constant ("ly:make-event-class"), 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 ());
@@ -294,7 +293,7 @@ Music::to_event () const
       for (; scm_is_pair (art_mus); art_mus = scm_cdr (art_mus))
         {
           Music *m = unsmob_music (scm_car (art_mus));
-          art_ev = scm_cons (m->to_event ()->unprotect (), art_ev);
+          art_ev = scm_cons (m->to_event (c)->unprotect (), art_ev);
         }
       e->set_property ("articulations", scm_reverse_x (art_ev, SCM_EOL));
     }
@@ -311,7 +310,7 @@ Music::to_event () const
 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 ();
 }