Doc: CG - Updates for building the LP Docs using XeLaTex

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

diff --git a/lily/pitched-trill-engraver.cc b/lily/pitched-trill-engraver.cc
index 4f4fad23254966520f1fd325126d11c0c56211b2..30d734346e53df7565c419817a9637ad1524afc0 100644 (file)
--- a/lily/pitched-trill-engraver.cc
+++ b/lily/pitched-trill-engraver.cc
@@ -30,6 +30,8 @@
 #include "stream-event.hh"
 #include "warn.hh"
 
+#include "translator.icc"
+
 class Pitched_trill_engraver : public Engraver
 {
 public:
@@ -88,7 +90,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
-      && Pitch::is_smob (ev->get_property ("pitch")))
+      && unsmob<Pitch> (ev->get_property ("pitch")))
     make_trill (ev);
 }
 
@@ -96,7 +98,7 @@ void
 Pitched_trill_engraver::make_trill (Stream_event *ev)
 {
   SCM scm_pitch = ev->get_property ("pitch");
-  Pitch *p = Pitch::unsmob (scm_pitch);
+  Pitch *p = unsmob<Pitch> (scm_pitch);
 
   SCM keysig = get_property ("localAlterations");
 
@@ -132,7 +134,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 (Pitch::unsmob (scm_pitch)->steps ()
+                             scm_from_int (unsmob<Pitch> (scm_pitch)->steps ()
                                            + c0));
 
   trill_group_ = make_item ("TrillPitchGroup", ev->self_scm ());
@@ -167,8 +169,6 @@ Pitched_trill_engraver::stop_translation_timestep ()
   trill_accidental_ = 0;
 }
 
-#include "translator.icc"
-
 ADD_ACKNOWLEDGER (Pitched_trill_engraver, note_head);
 ADD_ACKNOWLEDGER (Pitched_trill_engraver, dots);
 ADD_ACKNOWLEDGER (Pitched_trill_engraver, stem);