* lily/ligature-bracket-engraver: Bugfix: Add missing stream event

[lilypond.git] / lily / pitched-trill-engraver.cc

diff --git a/lily/pitched-trill-engraver.cc b/lily/pitched-trill-engraver.cc
index b514dfd10158e553744f12fff41e64123db25e4d..71913d2bb9e4c7dee1d8ae74fb263b381facea65 100644 (file)
--- a/lily/pitched-trill-engraver.cc
+++ b/lily/pitched-trill-engraver.cc
@@ -8,14 +8,15 @@
 
 #include "engraver.hh"
 
-#include "dots.hh"
-#include "pointer-group-interface.hh"
 #include "axis-group-interface.hh"
 #include "context.hh"
-#include "note-head.hh"
+#include "dots.hh"
 #include "item.hh"
-#include "side-position-interface.hh"
+#include "note-head.hh"
 #include "pitch.hh"
+#include "pointer-group-interface.hh"
+#include "side-position-interface.hh"
+#include "stream-event.hh"
 #include "warn.hh"
 
 class Pitched_trill_engraver : public Engraver
@@ -37,7 +38,7 @@ private:
 
   vector<Grob*> heads_;
 
-  void make_trill (Music *);
+  void make_trill (Stream_event *);
 };
 
 Pitched_trill_engraver::Pitched_trill_engraver ()
@@ -61,18 +62,18 @@ Pitched_trill_engraver::acknowledge_note_head (Grob_info info)
 void
 Pitched_trill_engraver::acknowledge_text_spanner (Grob_info info)
 {
-  Music *mus = info.music_cause ();
-  if (mus
-      && mus->is_mus_type ("trill-span-event")
-      && to_dir (mus->get_property ("span-direction")) == START
-      && unsmob_pitch (mus->get_property ("pitch")))
-    make_trill (mus);
+  Stream_event *ev = info.event_cause ();
+  if (ev
+      && ev->in_event_class ("trill-span-event")
+      && to_dir (ev->get_property ("span-direction")) == START
+      && unsmob_pitch (ev->get_property ("pitch")))
+    make_trill (ev);
 }
 
 void
-Pitched_trill_engraver::make_trill (Music *mus)
+Pitched_trill_engraver::make_trill (Stream_event *ev)
 {
-  SCM scm_pitch = mus->get_property ("pitch");
+  SCM scm_pitch = ev->get_property ("pitch");
   Pitch *p = unsmob_pitch (scm_pitch);
 
   SCM keysig = get_property ("localKeySignature");
@@ -90,7 +91,7 @@ Pitched_trill_engraver::make_trill (Music *mus)
       trill_head_ = 0;
     }
 
-  trill_head_ = make_item ("TrillPitchHead", mus->self_scm ());
+  trill_head_ = make_item ("TrillPitchHead", ev->self_scm ());
   SCM c0scm = get_property ("middleCPosition");
 
   int c0 = scm_is_number (c0scm) ? scm_to_int (c0scm) : 0;
@@ -99,14 +100,14 @@ Pitched_trill_engraver::make_trill (Music *mus)
                             scm_from_int (unsmob_pitch (scm_pitch)->steps ()
                                           + c0));
 
-  trill_group_ = make_item ("TrillPitchGroup", mus->self_scm ());
+  trill_group_ = make_item ("TrillPitchGroup", ev->self_scm ());
   trill_group_->set_parent (trill_head_, Y_AXIS);
 
   Axis_group_interface::add_element (trill_group_, trill_head_);
 
   if (print_acc)
     {
-      trill_accidental_ = make_item ("TrillPitchAccidental", mus->self_scm ());
+      trill_accidental_ = make_item ("TrillPitchAccidental", ev->self_scm ());
 
       // fixme: naming -> alterations
       trill_accidental_->set_property ("accidentals", scm_list_1 (scm_from_int (p->get_alteration ())));
@@ -143,11 +144,16 @@ ADD_ACKNOWLEDGER (Pitched_trill_engraver, dots);
 ADD_ACKNOWLEDGER (Pitched_trill_engraver, text_spanner);
 
 ADD_TRANSLATOR (Pitched_trill_engraver,
-               /* doc */ "Print the bracketed notehead after a notehead with trill.",
+               /* doc */
+               "Print the bracketed notehead after a notehead with trill.",
+
                /* create */
                "TrillPitchHead "
                "TrillPitchAccidental "
-               "TrillPitchGroup",
+               "TrillPitchGroup ",
+
                /* accept */ "",
+
                /* read */ "",
+
                /* write */ "");