Add scons cruft.

[lilypond.git] / lily / music.cc

diff --git a/lily/music.cc b/lily/music.cc
index 377551253891f82cf24be6743e42948675c7a395..fb272aae0372af067db72aeef159af97d50271dd 100644 (file)
--- a/lily/music.cc
+++ b/lily/music.cc
@@ -11,12 +11,11 @@
 #include "context.hh"
 #include "dispatcher.hh"
 #include "duration.hh"
-#include "input-smob.hh"
+#include "input.hh"
 #include "international.hh"
 #include "ly-smobs.icc"
 #include "main.hh"
 #include "music-sequence.hh"
-#include "pitch.hh"
 #include "score.hh"
 #include "warn.hh"
 
@@ -253,48 +252,45 @@ Music::origin () const
 Stream_event *
 Music::to_event () const
 {
-  /* UGH. Temp hack */
-  SCM orig_sym = get_property ("name");
-  char out[200];
-  string in = ly_symbol2string (orig_sym);
-  /* don't add '-' before first character */
-  out[0] = tolower (in[0]);
-  size_t outpos = 1;
-  for (size_t inpos = 1; inpos < in.size () && outpos < 190; inpos++)
+  SCM class_name = ly_camel_case_to_lisp_identifier (get_property ("name"));
+
+  // catch programming mistakes.
+  if (!internal_is_music_type (class_name))
     {
-      if (isupper (in[inpos]))
-       out[outpos++] = '-';
-      out[outpos++] = tolower (in[inpos]);      
+      programming_error ("Not a music type");
     }
-  out[outpos] = 0;
-  SCM class_name = ly_symbol2scm (out);
-
-  // catch mistakes.
-  assert (internal_is_music_type (class_name));
 
   Stream_event *e = new Stream_event (class_name, mutable_property_alist_);
   Moment length = get_length ();
   if (length.to_bool ())
     e->set_property ("length", length.smobbed_copy ());
 
+  // articulations as events.
+  SCM art_mus = e->get_property ("articulations");
+  if (scm_is_pair (art_mus))
+    {
+      SCM art_ev = SCM_EOL;
+      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);
+       }
+      e->set_property ("articulations", scm_reverse_x (art_ev, SCM_EOL));
+    }
+
   /*
     ES TODO: This is a temporary fix. Stream_events should not be
     aware of music.
   */
   e->set_property ("music-cause", self_scm ());
+
   return e;
 }
 
 void
 Music::send_to_context (Context *c)
 {
-  /*
-    TODO: This is a work-in-progress solution. Send the event so it
-    can be read both by old-style translators and the new ones.
-  */
-  send_stream_event (c, "OldMusicEvent", origin (),
-                    ly_symbol2scm("music"), self_scm (), 0);
-
   Stream_event *ev = to_event ();
   c->event_source ()->broadcast (ev);
   ev->unprotect ();