X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpitched-trill-engraver.cc;h=817ae68724adbb66ef7a9fd4fd3ff322ec04873f;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=da74dafcdd75453b51b82b0115842ef662775bfc;hpb=358d6e99ada8019268ade9ba9080b2d0d88eeb7a;p=lilypond.git

diff --git a/lily/pitched-trill-engraver.cc b/lily/pitched-trill-engraver.cc
index da74dafcdd..817ae68724 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--2008 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
@@ -81,9 +80,22 @@ Pitched_trill_engraver::make_trill (Stream_event *ev)
   SCM key = scm_cons (scm_from_int (p->get_octave ()),
 		      scm_from_int (p->get_notename ()));
 
+  int bn = measure_number (context());
+
   SCM handle = scm_assoc (key, keysig);
+  if (handle != SCM_BOOL_F)
+    {
+      bool same_bar = (bn == robust_scm2int (scm_caddr (handle), 0));
+      bool same_alt
+	= (p->get_alteration () == robust_scm2rational (scm_cadr (handle), 0));
+
+      if (!same_bar || (same_bar && !same_alt))
+	handle = SCM_BOOL_F;
+    }
+
   bool print_acc
-    = (handle == SCM_BOOL_F) || p->get_alteration () == 0;
+    = (handle == SCM_BOOL_F) || p->get_alteration () == Rational (0)
+    || (ev->get_property ("force-accidental") == SCM_BOOL_T);
 
   if (trill_head_)
     {
@@ -110,7 +122,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 (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 ());
@@ -132,27 +144,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 */
+		""
+		);