X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcompletion-note-heads-engraver.cc;h=66e31aaf52da8b541c31160f86930a0f25154dc8;hb=e3fa24f095381f36fdc5fa17494ec16b5cd18fe8;hp=aee5e181c24ce254f6680593b59a42fa5dd71bc5;hpb=eb51e9b3adf374a806fed1dda25d146974950123;p=lilypond.git

diff --git a/lily/completion-note-heads-engraver.cc b/lily/completion-note-heads-engraver.cc
index aee5e181c2..66e31aaf52 100644
--- a/lily/completion-note-heads-engraver.cc
+++ b/lily/completion-note-heads-engraver.cc
@@ -7,20 +7,22 @@
 #include <cctype>
 using namespace std;
 
-#include "rhythmic-head.hh"
-#include "output-def.hh"
-#include "music.hh"
-#include "dots.hh"
 #include "dot-column.hh"
-#include "staff-symbol-referencer.hh"
+#include "dots.hh"
+#include "duration.hh"
+#include "global-context.hh"
 #include "item.hh"
+#include "output-def.hh"
+#include "pitch.hh"
+#include "rhythmic-head.hh"
 #include "score-engraver.hh"
-#include "warn.hh"
 #include "spanner.hh"
+#include "staff-symbol-referencer.hh"
+#include "stream-event.hh"
 #include "tie.hh"
-#include "global-context.hh"
-#include "duration.hh"
-#include "pitch.hh"
+#include "warn.hh"
+
+#include "translator.icc"
 
 /*
   TODO: make matching rest engraver.
@@ -48,8 +50,8 @@ class Completion_heads_engraver : public Engraver
   vector<Grob*> ties_;
 
   vector<Item*> dots_;
-  vector<Music*> note_events_;
-  vector<Music*> scratch_note_events_;
+  vector<Stream_event*> note_events_;
+  vector<Stream_event*> scratch_note_events_;
 
   Moment note_end_mom_;
   bool is_first_;
@@ -65,9 +67,9 @@ public:
 protected:
   virtual void initialize ();
   void start_translation_timestep ();
-  virtual bool try_music (Music *event);
   void process_music ();
   void stop_translation_timestep ();
+  DECLARE_TRANSLATOR_LISTENER (note);
 };
 
 void
@@ -76,29 +78,24 @@ Completion_heads_engraver::initialize ()
   is_first_ = false;
 }
 
-bool
-Completion_heads_engraver::try_music (Music *m)
+IMPLEMENT_TRANSLATOR_LISTENER (Completion_heads_engraver, note);
+void
+Completion_heads_engraver::listen_note (Stream_event *ev)
 {
-  if (m->is_mus_type ("note-event"))
-    {
-      note_events_.push_back (m);
-
-      is_first_ = true;
-      Moment musiclen = m->get_length ();
-      Moment now = now_mom ();
-
-      if (now_mom ().grace_part_)
-	{
-	  musiclen.grace_part_ = musiclen.main_part_;
-	  musiclen.main_part_ = Rational (0, 1);
-	}
-      note_end_mom_ = max (note_end_mom_, (now + musiclen));
-      do_nothing_until_ = Rational (0, 0);
+  note_events_.push_back (ev);
+  
+  is_first_ = true;
+  Moment musiclen = get_event_length (ev);
+  Moment now = now_mom ();
 
-      return true;
+  if (now_mom ().grace_part_)
+    {
+      musiclen.grace_part_ = musiclen.main_part_;
+      musiclen.main_part_ = Rational (0, 1);
     }
 
-  return false;
+  note_end_mom_ = max (note_end_mom_, (now + musiclen));
+  do_nothing_until_ = Rational (0, 0);
 }
 
 /*
@@ -192,14 +189,22 @@ Completion_heads_engraver::process_music ()
       if (!scratch_note_events_.size ())
 	for (vsize i = 0; i < note_events_.size (); i++)
 	  {
-	    Music *m = note_events_[i]->clone ();
+	    Stream_event *m = note_events_[i]->clone ();
 	    scratch_note_events_.push_back (m);
 	  }
     }
-
+  else
+    {
+      for (vsize i = 0; i < note_events_.size (); i++)
+	{
+	  Stream_event *c =  note_events_[i]->clone ();
+	  scratch_note_events_.push_back (c);
+	}
+    }
+  
   for (vsize i = 0; left_to_do_ && i < note_events_.size (); i++)
     {
-      Music *event = note_events_[i];
+      Stream_event *event = note_events_[i];
       if (scratch_note_events_.size ())
 	{
 	  event = scratch_note_events_[i];
@@ -219,11 +224,7 @@ Completion_heads_engraver::process_music ()
 	  Item *d = make_item ("Dots", SCM_EOL);
 	  Rhythmic_head::set_dots (note, d);
 
-	  /*
-	    measly attempt to save an eeny-weenie bit of memory.
-	  */
-	  if (dots != scm_to_int (d->get_property ("dot-count")))
-	    d->set_property ("dot-count", scm_from_int (dots));
+	  d->set_property ("dot-count", scm_from_int (dots));
 
 	  d->set_parent (note, Y_AXIS);
 	  dots_.push_back (d);
@@ -294,13 +295,17 @@ Completion_heads_engraver::Completion_heads_engraver ()
 {
 }
 
-#include "translator.icc"
-
 ADD_TRANSLATOR (Completion_heads_engraver,
 		/* doc */ "This engraver replaces "
 		"@code{Note_heads_engraver}. It plays some trickery to "
 		"break long notes and automatically tie them into the next measure.",
-		/* create */ "NoteHead Dots Tie",
-		/* accept */ "note-event",
-		/* read */ "middleCPosition measurePosition measureLength",
+		/* create */
+		"NoteHead "
+		"Dots "
+		"Tie",
+		/* read */
+		"middleCPosition "
+		"measurePosition "
+		"measureLength",
+
 		/* write */ "");