X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-heads-engraver.cc;h=4d4ddd8010b77fd316c00f5bdabf9af8c1668637;hb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;hp=7898b85ec39407dfe06f64f7af8f093214fc2edc;hpb=664070d837cc4855091455892cb942cdcedeef0c;p=lilypond.git

diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc
index 7898b85ec3..4d4ddd8010 100644
--- a/lily/note-heads-engraver.cc
+++ b/lily/note-heads-engraver.cc
@@ -1,13 +1,13 @@
 /*
   note-heads-engraver.cc -- part of GNU LilyPond
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
-#include <ctype.h>
+
+#include <cctype>
 
 #include "rhythmic-head.hh"
 #include "output-def.hh"
-#include "event.hh"
 #include "dots.hh"
 #include "dot-column.hh"
 #include "staff-symbol-referencer.hh"
@@ -19,13 +19,13 @@ class Note_heads_engraver : public Engraver
 {
   Link_array<Item> notes_;
   Link_array<Item> dots_;
-  Link_array<Music> note_reqs_;
+  Link_array<Music> note_evs_;
 
 public:
   TRANSLATOR_DECLARATIONS (Note_heads_engraver);
 
 protected:
-  virtual bool try_music (Music *req) ;
+  virtual bool try_music (Music *ev);
   virtual void process_music ();
 
   virtual void stop_translation_timestep ();
@@ -36,56 +36,79 @@ Note_heads_engraver::Note_heads_engraver ()
 }
 
 bool
-Note_heads_engraver::try_music (Music *m) 
+Note_heads_engraver::try_music (Music *m)
 {
   if (m->is_mus_type ("note-event"))
     {
-      note_reqs_.push (m);
+      note_evs_.push (m);
       return true;
     }
   else if (m->is_mus_type ("busy-playing-event"))
-    return note_reqs_.size ();
-  else if (m->is_mus_type ("start-playing-event"))
-    return note_reqs_.size ();
-  
+    return note_evs_.size ();
+
   return false;
 }
 
-
 void
 Note_heads_engraver::process_music ()
 {
-  for (int i=0; i < note_reqs_.size (); i++)
+  for (int i = 0; i < note_evs_.size (); i++)
     {
 
-      Music * req = note_reqs_[i];
-      Item *note = make_item ("NoteHead", req->self_scm ());
-      
-      Duration dur = *unsmob_duration (req->get_property ("duration"));
+      Music *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 ());
+	  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 (req->get_property ("pitch"));
+      Pitch *pit = unsmob_pitch (ev->get_property ("pitch"));
 
       int pos = pit ? pit->steps () : 0;
       SCM c0 = get_property ("middleCPosition");
-      if (ly_c_number_p (c0))
-	pos += ly_scm2int (c0);
+      if (scm_is_number (c0))
+	pos += scm_to_int (c0);
+
+      note->set_property ("staff-position", scm_int2num (pos));
+
+      /*
+	Shaped note heads change on step of the scale.
+      */
+      SCM shape_vector = get_property ("shapeNoteStyles");
+      if (scm_is_vector (shape_vector))
+	{
+	  SCM scm_tonic = get_property ("tonic");
+	  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;
+
+	  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));
+	    }
+	  if (scm_is_symbol (style))
+	    {
+	      note->set_property ("style", style);
+	    }
+	}
 
-      note->set_property ("staff-position",   scm_int2num (pos));
       notes_.push (note);
     }
 }
@@ -93,18 +116,15 @@ Note_heads_engraver::process_music ()
 void
 Note_heads_engraver::stop_translation_timestep ()
 {
-
   notes_.clear ();
   dots_.clear ();
-  note_reqs_.clear ();
+  note_evs_.clear ();
 }
 
-
-
-ENTER_DESCRIPTION (Note_heads_engraver,
-/* descr */       "Generate noteheads.",
-/* creats*/       "NoteHead Dots",
-/* accepts */     "note-event busy-playing-event",
-/* acks  */      "",
-/* reads */       "middleCPosition",
-/* write */       "");
+ADD_TRANSLATOR (Note_heads_engraver,
+		/* descr */ "Generate noteheads.",
+		/* creats*/ "NoteHead Dots",
+		/* accepts */ "note-event busy-playing-event",
+		/* acks  */ "",
+		/* reads */ "middleCPosition",
+		/* write */ "");