X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-heads-engraver.cc;h=7240d61d51e267ca9ad56a2976ba47cfd7e9ec90;hb=80a4253726ff55f14448d9c614433b7d1779286e;hp=73a467c1d7bc777e0370e5670f980510c1bef414;hpb=2cd24831defba0e63223a55cf20b3bac5608be4f;p=lilypond.git

diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc
index 73a467c1d7..7240d61d51 100644
--- a/lily/note-heads-engraver.cc
+++ b/lily/note-heads-engraver.cc
@@ -1,89 +1,86 @@
 /*
   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"
+
 #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 "engraver.hh"
+#include "stream-event.hh"
 #include "warn.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);
-  virtual void process_music ();
-  virtual void stop_translation_timestep ();
+  DECLARE_TRANSLATOR_LISTENER (note);
+  void process_music ();
+  void stop_translation_timestep ();
 };
 
 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++)
+  SCM c0 = get_property ("middleCPosition");
+  SCM layout_proc = get_property("staffLineLayoutFunction");
+      
+  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_int2num (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_int2num (dur.dot_count ()));
+      Pitch *pit = unsmob_pitch (ev->get_property ("pitch"));
 
-	  d->set_parent (note, Y_AXIS);
+#if 0 /* TODO: should have a mechanism to switch off these warnings. */
 
-	  dots_.push (d);
-	}
+      if (!pit)
+	ev->origin ()->warning (_ ("NoteEvent without pitch"));
+#endif
 
-      Pitch *pit = unsmob_pitch (ev->get_property ("pitch"));
+      int pos;
+      if (pit == 0)
+	pos = 0;
+      else if (ly_is_procedure (layout_proc)){
+	SCM pitch = ev->get_property("pitch");
+	pos = scm_to_int(scm_call_1 (layout_proc, pitch));
+      }
+      else 
+	pos = pit->steps ();
 
-      int pos = pit ? pit->steps () : 0;
-      SCM c0 = get_property ("middleCPosition");
       if (scm_is_number (c0))
-	pos += scm_to_int (c0);
-
-      note->set_property ("staff-position", scm_int2num (pos));
+	pos += scm_to_int(c0);
+      
+      note->set_property ("staff-position", scm_from_int (pos));
 
       /*
-	Shaped note heads change on step of the scale.
+	Shape note heads change on step of the scale.
       */
       SCM shape_vector = get_property ("shapeNoteStyles");
       if (scm_is_vector (shape_vector))
@@ -98,16 +95,12 @@ Note_heads_engraver::process_music ()
 	  SCM style = SCM_EOL;
 	  if (scm_c_vector_length (shape_vector) > delta
 	      && scm_is_symbol (scm_vector_ref (shape_vector, scm_from_int (delta))))
-	    {
-	      style = scm_vector_ref (shape_vector, scm_from_int (delta));
-	    }
+	    style = scm_vector_ref (shape_vector, scm_from_int (delta));
 	  if (scm_is_symbol (style))
-	    {
-	      note->set_property ("style", style);
-	    }
+	    note->set_property ("style", style);
 	}
 
-      notes_.push (note);
+      notes_.push_back (note);
     }
 }
 
@@ -115,14 +108,13 @@ void
 Note_heads_engraver::stop_translation_timestep ()
 {
   notes_.clear ();
-  dots_.clear ();
   note_evs_.clear ();
 }
 
 ADD_TRANSLATOR (Note_heads_engraver,
-		/* descr */ "Generate noteheads.",
-		/* creats*/ "NoteHead Dots",
-		/* accepts */ "note-event busy-playing-event",
-		/* acks  */ "",
-		/* reads */ "middleCPosition",
+		/* doc */ "Generate noteheads.",
+		/* create */
+		"NoteHead ",
+		/* read */ "middleCPosition "
+		"staffLineLayoutFunction ",
 		/* write */ "");