X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpitched-trill-engraver.cc;h=18482faabd4569f5b0b1ce40e13b950e00287153;hb=38d7d319eabc906e82fb42002678c6d42a23b6f7;hp=b514dfd10158e553744f12fff41e64123db25e4d;hpb=6d0ba72792e43cb3d5986137b4065e9b1e64dc7e;p=lilypond.git

diff --git a/lily/pitched-trill-engraver.cc b/lily/pitched-trill-engraver.cc
index b514dfd101..18482faabd 100644
--- a/lily/pitched-trill-engraver.cc
+++ b/lily/pitched-trill-engraver.cc
@@ -3,19 +3,20 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
 
-#include "dots.hh"
-#include "pointer-group-interface.hh"
 #include "axis-group-interface.hh"
 #include "context.hh"
-#include "note-head.hh"
+#include "dots.hh"
 #include "item.hh"
-#include "side-position-interface.hh"
+#include "note-head.hh"
 #include "pitch.hh"
+#include "pointer-group-interface.hh"
+#include "side-position-interface.hh"
+#include "stream-event.hh"
 #include "warn.hh"
 
 class Pitched_trill_engraver : public Engraver
@@ -26,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:
@@ -37,7 +37,7 @@ private:
 
   vector<Grob*> heads_;
 
-  void make_trill (Music *);
+  void make_trill (Stream_event *);
 };
 
 Pitched_trill_engraver::Pitched_trill_engraver ()
@@ -59,20 +59,20 @@ 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)
 {
-  Music *mus = info.music_cause ();
-  if (mus
-      && mus->is_mus_type ("trill-span-event")
-      && to_dir (mus->get_property ("span-direction")) == START
-      && unsmob_pitch (mus->get_property ("pitch")))
-    make_trill (mus);
+  Stream_event *ev = info.event_cause ();
+  if (ev
+      && ev->in_event_class ("trill-span-event")
+      && to_dir (ev->get_property ("span-direction")) == START
+      && unsmob_pitch (ev->get_property ("pitch")))
+    make_trill (ev);
 }
 
 void
-Pitched_trill_engraver::make_trill (Music *mus)
+Pitched_trill_engraver::make_trill (Stream_event *ev)
 {
-  SCM scm_pitch = mus->get_property ("pitch");
+  SCM scm_pitch = ev->get_property ("pitch");
   Pitch *p = unsmob_pitch (scm_pitch);
 
   SCM keysig = get_property ("localKeySignature");
@@ -80,9 +80,22 @@ Pitched_trill_engraver::make_trill (Music *mus)
   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_)
     {
@@ -90,7 +103,7 @@ Pitched_trill_engraver::make_trill (Music *mus)
       trill_head_ = 0;
     }
 
-  trill_head_ = make_item ("TrillPitchHead", mus->self_scm ());
+  trill_head_ = make_item ("TrillPitchHead", ev->self_scm ());
   SCM c0scm = get_property ("middleCPosition");
 
   int c0 = scm_is_number (c0scm) ? scm_to_int (c0scm) : 0;
@@ -99,18 +112,19 @@ Pitched_trill_engraver::make_trill (Music *mus)
 			     scm_from_int (unsmob_pitch (scm_pitch)->steps ()
 					   + c0));
 
-  trill_group_ = make_item ("TrillPitchGroup", mus->self_scm ());
+  trill_group_ = make_item ("TrillPitchGroup", ev->self_scm ());
   trill_group_->set_parent (trill_head_, Y_AXIS);
 
   Axis_group_interface::add_element (trill_group_, trill_head_);
 
   if (print_acc)
     {
-      trill_accidental_ = make_item ("TrillPitchAccidental", mus->self_scm ());
+      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 ());
       trill_accidental_->set_parent (trill_head_, Y_AXIS);
       Axis_group_interface::add_element (trill_group_, trill_accidental_);
@@ -130,24 +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.",
+		/* doc */
+		"Print the bracketed note head after a note head with trill.",
+
 		/* create */
 		"TrillPitchHead "
 		"TrillPitchAccidental "
-		"TrillPitchGroup",
-		/* accept */ "",
-		/* read */ "",
-		/* write */ "");
+		"TrillPitchGroup ",
+
+		/* read */
+		"",
+
+		/* write */
+		""
+		);