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 cba10da79c9f84b917b82d46caf2449be656618f..02a9876b1c2f6779f1df43b5ff11b63170bf4293 100644 (file)
--- a/lily/music.cc
+++ b/lily/music.cc
@@ -7,11 +7,15 @@
 */
 
 #include "music.hh"
-#include "music-sequence.hh"
+
+#include "context.hh"
+#include "dispatcher.hh"
 #include "duration.hh"
 #include "input-smob.hh"
+#include "international.hh"
 #include "ly-smobs.icc"
 #include "main.hh"
+#include "music-sequence.hh"
 #include "pitch.hh"
 #include "score.hh"
 #include "warn.hh"
@@ -32,7 +36,7 @@ Music::internal_is_music_type (SCM k) const
 }
 
 Music::Music (SCM init)
-  : Prob (init)
+  : Prob (ly_symbol2scm ("Music"), init)
 {
   length_callback_ = SCM_EOL;
   start_callback_ = SCM_EOL;
@@ -135,7 +139,7 @@ Music::generic_to_relative_octave (Pitch last)
          Pitch expected_pit (scm_to_int (check),
                              new_pit.get_notename (),
                              new_pit.get_alteration ());
-         origin ()->warning (_f ("octave check failed; expected %s, found: %s",
+         origin ()->warning (_f ("octave check failed; expected \"%s\", found: %s",
                                  expected_pit.to_string (),
                                  new_pit.to_string ()));
          new_pit = expected_pit;
@@ -219,8 +223,6 @@ Music::transpose (Pitch delta)
     set_property ("pitch-alist", ly_transpose_key_alist (pa, delta.smobbed_copy ()));
 }
 
-
-
 void
 Music::set_spot (Input ip)
 {
@@ -234,6 +236,13 @@ Music::origin () const
   return ip ? ip : &dummy_input_global;
 }
 
+void
+Music::send_to_context (Context *c)
+{
+  send_stream_event (c, "MusicEvent",
+                    ly_symbol2scm("music"), self_scm (), 0);
+}
+
 Music *
 make_music_by_name (SCM sym)
 {