Merge branch 'master' of git://git.sv.gnu.org/lilypond

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

diff --git a/lily/pitched-trill-engraver.cc b/lily/pitched-trill-engraver.cc
index 71913d2bb9e4c7dee1d8ae74fb263b381facea65..d29f6f42caf33ba91dc14b48a86ef3739ed29813 100644 (file)
--- a/lily/pitched-trill-engraver.cc
+++ b/lily/pitched-trill-engraver.cc
@@ -83,7 +83,7 @@ Pitched_trill_engraver::make_trill (Stream_event *ev)
 
   SCM handle = scm_assoc (key, keysig);
   bool print_acc
-    = (handle == SCM_BOOL_F) || p->get_alteration () == 0;
+    = (handle == SCM_BOOL_F) || p->get_alteration () == Rational (0);
 
   if (trill_head_)
     {
@@ -110,8 +110,10 @@ Pitched_trill_engraver::make_trill (Stream_event *ev)
       trill_accidental_ = make_item ("TrillPitchAccidental", ev->self_scm ());
 
       // fixme: naming -> alterations
-      trill_accidental_->set_property ("accidentals", scm_list_1 (scm_from_int (p->get_alteration ())));
+      trill_accidental_->set_property ("accidentals", scm_list_1 (scm_from_int (Rational (4) 
+                                                                               * p->get_alteration ())));
       Side_position_interface::add_support (trill_accidental_, trill_head_);
+      
       trill_head_->set_object ("accidental-grob", trill_accidental_->self_scm ());
       trill_accidental_->set_parent (trill_head_, Y_AXIS);
       Axis_group_interface::add_element (trill_group_, trill_accidental_);
@@ -152,8 +154,6 @@ ADD_TRANSLATOR (Pitched_trill_engraver,
                "TrillPitchAccidental "
                "TrillPitchGroup ",
 
-               /* accept */ "",
-
                /* read */ "",
 
                /* write */ "");