X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpitched-trill-engraver.cc;h=3104b48ce02b1ba3ad1b0224eb5de04edf2c3d79;hb=6b1e151b36017e487949b260d843992fccf3e9a2;hp=d29f6f42caf33ba91dc14b48a86ef3739ed29813;hpb=03ce3667568361ee7433032988a4089c64de2ec7;p=lilypond.git

diff --git a/lily/pitched-trill-engraver.cc b/lily/pitched-trill-engraver.cc
index d29f6f42ca..3104b48ce0 100644
--- a/lily/pitched-trill-engraver.cc
+++ b/lily/pitched-trill-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
@@ -27,8 +27,7 @@ public:
 protected:
   DECLARE_ACKNOWLEDGER (note_head);
   DECLARE_ACKNOWLEDGER (dots);
-  DECLARE_ACKNOWLEDGER (text_spanner);
-  void process_music ();
+  DECLARE_ACKNOWLEDGER (trill_spanner);
   void stop_translation_timestep ();
 
 private:
@@ -60,7 +59,7 @@ Pitched_trill_engraver::acknowledge_note_head (Grob_info info)
 }
 
 void
-Pitched_trill_engraver::acknowledge_text_spanner (Grob_info info)
+Pitched_trill_engraver::acknowledge_trill_spanner (Grob_info info)
 {
   Stream_event *ev = info.event_cause ();
   if (ev
@@ -110,8 +109,7 @@ 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 (Rational (4) 
-										* p->get_alteration ())));
+      trill_accidental_->set_property ("alteration", ly_rational2scm (p->get_alteration ()));
       Side_position_interface::add_support (trill_accidental_, trill_head_);
       
       trill_head_->set_object ("accidental-grob", trill_accidental_->self_scm ());
@@ -133,27 +131,25 @@ Pitched_trill_engraver::stop_translation_timestep ()
   trill_accidental_ = 0;
 }
 
-void
-Pitched_trill_engraver::process_music ()
-{
-}
-
 
 #include "translator.icc"
 
 ADD_ACKNOWLEDGER (Pitched_trill_engraver, note_head);
 ADD_ACKNOWLEDGER (Pitched_trill_engraver, dots);
-ADD_ACKNOWLEDGER (Pitched_trill_engraver, text_spanner);
+ADD_ACKNOWLEDGER (Pitched_trill_engraver, trill_spanner);
 
 ADD_TRANSLATOR (Pitched_trill_engraver,
 		/* doc */
-		"Print the bracketed notehead after a notehead with trill.",
+		"Print the bracketed note head after a note head with trill.",
 
 		/* create */
 		"TrillPitchHead "
 		"TrillPitchAccidental "
 		"TrillPitchGroup ",
 
-		/* read */ "",
+		/* read */
+		"",
 
-		/* write */ "");
+		/* write */
+		""
+		);