X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-heads-engraver.cc;h=a49bbbe81f64bfefb3d4d43ac1d35111a7895c44;hb=2b8c85e27b554513c6527e8a2d25b0e3d2db4b66;hp=34c65a1cbdd3af945c209a527974cf952f352260;hpb=4ecdbd7d70ca7441be4dddd15ac01cc255bc2a35;p=lilypond.git

diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc
index 34c65a1cbd..a49bbbe81f 100644
--- a/lily/note-heads-engraver.cc
+++ b/lily/note-heads-engraver.cc
@@ -1,7 +1,7 @@
 /*
   note-heads-engraver.cc -- part of GNU LilyPond
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
@@ -9,26 +9,27 @@
 #include <cctype>
 using namespace std;
 
-#include "rhythmic-head.hh"
+#include "duration.hh"
+#include "item.hh"
 #include "output-def.hh"
-#include "dots.hh"
-#include "dot-column.hh"
+#include "pitch.hh"
+#include "rhythmic-head.hh"
 #include "staff-symbol-referencer.hh"
-#include "item.hh"
+#include "stream-event.hh"
 #include "warn.hh"
-#include "duration.hh"
+
+#include "translator.icc"
 
 class Note_heads_engraver : public Engraver
 {
-  Link_array<Item> notes_;
-  Link_array<Item> dots_;
-  Link_array<Music> note_evs_;
+  vector<Item*> notes_;
+  vector<Stream_event*> note_evs_;
 
 public:
   TRANSLATOR_DECLARATIONS (Note_heads_engraver);
 
 protected:
-  virtual bool try_music (Music *ev);
+  DECLARE_TRANSLATOR_LISTENER (note);
   void process_music ();
   void stop_translation_timestep ();
 };
@@ -37,45 +38,21 @@ Note_heads_engraver::Note_heads_engraver ()
 {
 }
 
-bool
-Note_heads_engraver::try_music (Music *m)
+IMPLEMENT_TRANSLATOR_LISTENER (Note_heads_engraver, note);
+void
+Note_heads_engraver::listen_note (Stream_event *ev)
 {
-  if (m->is_mus_type ("note-event"))
-    {
-      note_evs_.push (m);
-      return true;
-    }
-  else if (m->is_mus_type ("busy-playing-event"))
-    return note_evs_.size ();
-
-  return false;
+  note_evs_.push_back (ev);
 }
 
 void
 Note_heads_engraver::process_music ()
 {
-  for (int i = 0; i < note_evs_.size (); i++)
+  for (vsize i = 0; i < note_evs_.size (); i++)
     {
-      Music *ev = note_evs_[i];
+      Stream_event *ev = note_evs_[i];
       Item *note = make_item ("NoteHead", ev->self_scm ());
 
-      Duration dur = *unsmob_duration (ev->get_property ("duration"));
-
-      note->set_property ("duration-log", scm_from_int (dur.duration_log ()));
-      if (dur.dot_count ())
-	{
-	  Item *d = make_item ("Dots", note->self_scm ());
-	  Rhythmic_head::set_dots (note, d);
-
-	  if (dur.dot_count ()
-	      != robust_scm2int (d->get_property ("dot-count"), 0))
-	    d->set_property ("dot-count", scm_from_int (dur.dot_count ()));
-
-	  d->set_parent (note, Y_AXIS);
-
-	  dots_.push (d);
-	}
-
       Pitch *pit = unsmob_pitch (ev->get_property ("pitch"));
 
 #if 0 /* TODO: should have a mechanism to switch off these warnings. */
@@ -112,7 +89,7 @@ Note_heads_engraver::process_music ()
 	    note->set_property ("style", style);
 	}
 
-      notes_.push (note);
+      notes_.push_back (note);
     }
 }
 
@@ -120,15 +97,14 @@ void
 Note_heads_engraver::stop_translation_timestep ()
 {
   notes_.clear ();
-  dots_.clear ();
   note_evs_.clear ();
 }
 
-#include "translator.icc"
-
 ADD_TRANSLATOR (Note_heads_engraver,
 		/* doc */ "Generate noteheads.",
-		/* create */ "NoteHead Dots",
-		/* accept */ "note-event busy-playing-event",
-		/* read */ "middleCPosition",
-		/* write */ "");
+		/* create */
+		"NoteHead ",
+		/* read */
+		"middleCPosition",
+		/* write */
+		"");