X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-heads-engraver.cc;h=e3fce707fae3210d16c222c4a1b735ec8d349b65;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=595750e2440a9c7e09de44561b6d86cc3a81e224;hpb=163225c0cbb1055dfd3614615350ab9f3aaba74c;p=lilypond.git

diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc
index 595750e244..e3fce707fa 100644
--- a/lily/note-heads-engraver.cc
+++ b/lily/note-heads-engraver.cc
@@ -1,116 +1,106 @@
 /*
   note-heads-engraver.cc -- part of GNU LilyPond
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 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 ()));
-
-	  d->set_parent (note, Y_AXIS);
-	  
-	  dots_.push (d);
-	}
+      Pitch *pit = unsmob_pitch (ev->get_property ("pitch"));
 
-      Pitch *pit =unsmob_pitch (ev->get_property ("pitch"));
+#if 0 /* TODO: should have a mechanism to switch off these warnings. */
 
-      int pos = pit ? pit->steps () : 0;
-      SCM c0 = get_property ("middleCPosition");
-      if (scm_is_number (c0))
-	pos += scm_to_int (c0);
+      if (!pit)
+	ev->origin ()->warning (_ ("NoteEvent without pitch"));
+#endif
+
+      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 ();
 
-      note->set_property ("staff-position",   scm_int2num (pos));
+      if (scm_is_number (c0))
+	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 (ly_c_vector_p (shape_vector))
+      if (scm_is_vector (shape_vector))
 	{
 	  SCM scm_tonic = get_property ("tonic");
-	  Pitch tonic (0,0,0); 
+	  Pitch tonic (0, 0, 0);
 	  if (unsmob_pitch (scm_tonic))
 	    tonic = *unsmob_pitch (scm_tonic);
-      
-	  unsigned int delta = (pit->get_notename() - tonic.get_notename() + 7) % 7;
-	  
+
+	  unsigned int delta = (pit->get_notename () - tonic.get_notename () + 7) % 7;
+
 	  SCM style = SCM_EOL;
-	  if (SCM_VECTOR_LENGTH (shape_vector) > delta
+	  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);
     }
 }
 
@@ -118,16 +108,20 @@ void
 Note_heads_engraver::stop_translation_timestep ()
 {
   notes_.clear ();
-  dots_.clear ();
   note_evs_.clear ();
 }
 
+ADD_TRANSLATOR (Note_heads_engraver,
+		/* doc */
+		"Generate note heads.",
+
+		/* create */
+		"NoteHead ",
 
+		/* read */
+		"middleCPosition "
+		"staffLineLayoutFunction ",
 
-ENTER_DESCRIPTION (Note_heads_engraver,
-/* descr */       "Generate noteheads.",
-/* creats*/       "NoteHead Dots",
-/* accepts */     "note-event busy-playing-event",
-/* acks  */      "",
-/* reads */       "middleCPosition",
-/* write */       "");
+		/* write */
+		""
+		);