#include "stream-event.hh"
#include "warn.hh"
+#include "translator.icc"
+
class Pitched_trill_engraver : public Engraver
{
public:
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);
}
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");
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
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_)
{
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 ());
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);