Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/pitched-trill-engraver.cc b/lily/pitched-trill-engraver.cc
index 71913d2bb9e4c7dee1d8ae74fb263b381facea65..84e391e231b301647120a5a9da73d00ef34d46d7 100644 (file)
--- a/lily/pitched-trill-engraver.cc
+++ b/lily/pitched-trill-engraver.cc
@@ -8,15 +8,14 @@
 
 #include "engraver.hh"
 
+#include "dots.hh"
+#include "pointer-group-interface.hh"
 #include "axis-group-interface.hh"
 #include "context.hh"
-#include "dots.hh"
-#include "item.hh"
 #include "note-head.hh"
-#include "pitch.hh"
-#include "pointer-group-interface.hh"
+#include "item.hh"
 #include "side-position-interface.hh"
-#include "stream-event.hh"
+#include "pitch.hh"
 #include "warn.hh"
 
 class Pitched_trill_engraver : public Engraver
@@ -38,7 +37,7 @@ private:
 
   vector<Grob*> heads_;
 
-  void make_trill (Stream_event *);
+  void make_trill (Music *);
 };
 
 Pitched_trill_engraver::Pitched_trill_engraver ()
@@ -62,18 +61,18 @@ Pitched_trill_engraver::acknowledge_note_head (Grob_info info)
 void
 Pitched_trill_engraver::acknowledge_text_spanner (Grob_info info)
 {
-  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);
+  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);
 }
 
 void
-Pitched_trill_engraver::make_trill (Stream_event *ev)
+Pitched_trill_engraver::make_trill (Music *mus)
 {
-  SCM scm_pitch = ev->get_property ("pitch");
+  SCM scm_pitch = mus->get_property ("pitch");
   Pitch *p = unsmob_pitch (scm_pitch);
 
   SCM keysig = get_property ("localKeySignature");
@@ -83,7 +82,8 @@ Pitched_trill_engraver::make_trill (Stream_event *ev)
 
   SCM handle = scm_assoc (key, keysig);
   bool print_acc
-    = (handle == SCM_BOOL_F) || p->get_alteration () == 0;
+    = (handle == SCM_BOOL_F)
+    || p->get_alteration () == 0;
 
   if (trill_head_)
     {
@@ -91,7 +91,7 @@ Pitched_trill_engraver::make_trill (Stream_event *ev)
       trill_head_ = 0;
     }
 
-  trill_head_ = make_item ("TrillPitchHead", ev->self_scm ());
+  trill_head_ = make_item ("TrillPitchHead", mus->self_scm ());
   SCM c0scm = get_property ("middleCPosition");
 
   int c0 = scm_is_number (c0scm) ? scm_to_int (c0scm) : 0;
@@ -100,21 +100,21 @@ Pitched_trill_engraver::make_trill (Stream_event *ev)
                             scm_from_int (unsmob_pitch (scm_pitch)->steps ()
                                           + c0));
 
-  trill_group_ = make_item ("TrillPitchGroup", ev->self_scm ());
-  trill_group_->set_parent (trill_head_, Y_AXIS);
+  trill_group_ = make_item ("TrillPitchGroup", mus->self_scm ());
 
   Axis_group_interface::add_element (trill_group_, trill_head_);
 
   if (print_acc)
     {
-      trill_accidental_ = make_item ("TrillPitchAccidental", ev->self_scm ());
+      trill_accidental_ = make_item ("TrillPitchAccidental", mus->self_scm ());
 
       // fixme: naming -> alterations
       trill_accidental_->set_property ("accidentals", scm_list_1 (scm_from_int (p->get_alteration ())));
       Side_position_interface::add_support (trill_accidental_, trill_head_);
       trill_head_->set_object ("accidental-grob", trill_accidental_->self_scm ());
-      trill_accidental_->set_parent (trill_head_, Y_AXIS);
+      trill_group_->set_parent (trill_head_, Y_AXIS);
       Axis_group_interface::add_element (trill_group_, trill_accidental_);
+      trill_accidental_->set_parent (trill_head_, Y_AXIS);
     }
 }
 
@@ -144,16 +144,11 @@ 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 */ "");