Use aligned-on-x-parent instead of other callbacks for some grobs

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

diff --git a/lily/pitched-trill-engraver.cc b/lily/pitched-trill-engraver.cc
index 04b620a9122b190617d6a0a06ce0ce7fa131fe4a..40f1fc9bd23bb575b4e3fb7ccc560cf096f08e9b 100644 (file)
--- a/lily/pitched-trill-engraver.cc
+++ b/lily/pitched-trill-engraver.cc
@@ -88,7 +88,7 @@ Pitched_trill_engraver::acknowledge_trill_spanner (Grob_info info)
   if (ev
       && ev->in_event_class ("trill-span-event")
       && to_dir (ev->get_property ("span-direction")) == START
-      && unsmob_pitch (ev->get_property ("pitch")))
+      && Pitch::unsmob (ev->get_property ("pitch")))
     make_trill (ev);
 }
 
@@ -96,9 +96,9 @@ void
 Pitched_trill_engraver::make_trill (Stream_event *ev)
 {
   SCM scm_pitch = ev->get_property ("pitch");
-  Pitch *p = unsmob_pitch (scm_pitch);
+  Pitch *p = Pitch::unsmob (scm_pitch);
 
-  SCM keysig = get_property ("localKeySignature");
+  SCM keysig = get_property ("localAlterations");
 
   SCM key = scm_cons (scm_from_int (p->get_octave ()),
                       scm_from_int (p->get_notename ()));
@@ -132,7 +132,7 @@ Pitched_trill_engraver::make_trill (Stream_event *ev)
   int c0 = scm_is_number (c0scm) ? scm_to_int (c0scm) : 0;
 
   trill_head_->set_property ("staff-position",
-                             scm_from_int (unsmob_pitch (scm_pitch)->steps ()
+                             scm_from_int (Pitch::unsmob (scm_pitch)->steps ()
                                            + c0));
 
   trill_group_ = make_item ("TrillPitchGroup", ev->self_scm ());