X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fpitched-trill-engraver.cc;h=ac9e4dfd4d7f5be52aa9aa3e3b68aed6f0336026;hb=74fd11beb0b6f89563f93e377e8c8dd1b9aeb3ff;hp=04b620a9122b190617d6a0a06ce0ce7fa131fe4a;hpb=058370efc7e9710f149d0f444328bb1fcd7bdec1;p=lilypond.git

diff --git a/lily/pitched-trill-engraver.cc b/lily/pitched-trill-engraver.cc
index 04b620a912..ac9e4dfd4d 100644
--- a/lily/pitched-trill-engraver.cc
+++ b/lily/pitched-trill-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -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")))
+      && unsmob<Pitch> (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 = unsmob<Pitch> (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 ()));
@@ -106,7 +106,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 +116,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 +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 (unsmob<Pitch> (scm_pitch)->steps ()
                                            + c0));
 
   trill_group_ = make_item ("TrillPitchGroup", ev->self_scm ());