Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / music.cc

diff --git a/lily/music.cc b/lily/music.cc
index 246074f475f132ca540ce5bdb8c4ee80661657fe..02a9876b1c2f6779f1df43b5ff11b63170bf4293 100644 (file)
--- a/lily/music.cc
+++ b/lily/music.cc
@@ -21,11 +21,11 @@
 #include "warn.hh"
 
 /*
-  Music is anything that has (possibly zero) duration and supports
-  both time compression and transposition.
+  Music is anything that has duration and supports both time compression
+  and transposition.
 
   In Lily, everything that can be thought to have a length and a pitch
-  (which has a duration which can be transposed) is considered "music".
+  (which has a duration which can be transposed) is considered "music",
 */
 bool
 Music::internal_is_music_type (SCM k) const
@@ -236,54 +236,11 @@ Music::origin () const
   return ip ? ip : &dummy_input_global;
 }
 
-/*
-  ES TODO: This method should probably be reworked or junked.
-*/
-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++)
-    {
-      if (isupper (in[inpos]))
-       out[outpos++] = '-';
-      out[outpos++] = tolower (in[inpos]);      
-    }
-  out[outpos] = 0;
-  SCM class_name = ly_symbol2scm (out);
-
-  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 ());
-
-  /*
-    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 (),
+  send_stream_event (c, "MusicEvent",
                     ly_symbol2scm("music"), self_scm (), 0);
-
-  Stream_event *ev = to_event ();
-  c->event_source ()->broadcast (ev);
-  ev->unprotect ();
 }
 
 Music *