X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpitched-trill-engraver.cc;h=30d734346e53df7565c419817a9637ad1524afc0;hb=2034ca4fcbed9253b5a85e9360e47d3fe3ff1d09;hp=b30d984edca68b17d5de89ca8f190b714f30b357;hpb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;p=lilypond.git

diff --git a/lily/pitched-trill-engraver.cc b/lily/pitched-trill-engraver.cc
index b30d984edc..30d734346e 100644
--- 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");
 
@@ -106,7 +108,7 @@ Pitched_trill_engraver::make_trill (Stream_event *ev)
   int bn = measure_number (context ());
 
   SCM handle = scm_assoc (key, keysig);
-  if (handle != SCM_BOOL_F)
+  if (scm_is_true (handle))
     {
       bool same_bar = (bn == robust_scm2int (scm_caddr (handle), 0));
       bool same_alt
@@ -116,9 +118,9 @@ Pitched_trill_engraver::make_trill (Stream_event *ev)
         handle = SCM_BOOL_F;
     }
 
-  bool print_acc
-    = (handle == SCM_BOOL_F) || p->get_alteration () == Rational (0)
-      || (ev->get_property ("force-accidental") == SCM_BOOL_T);
+  bool print_acc = scm_is_false (handle)
+                   || p->get_alteration () == Rational (0)
+                   || to_boolean (ev->get_property ("force-accidental"));
 
   if (trill_head_)
     {
@@ -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);