X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-heads-engraver.cc;h=23de800ffc9e770e6b47676d753eccb6d884a118;hb=97ebd8b72cdd2db28ad8eb38629d51f285afff22;hp=23ded7abd544d84c12bd61842b2bef96ff9270ef;hpb=c380a7abde14a60ebd6d8a6eab91ae4e13677a23;p=lilypond.git

diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc
index 23ded7abd5..23de800ffc 100644
--- a/lily/note-heads-engraver.cc
+++ b/lily/note-heads-engraver.cc
@@ -1,58 +1,50 @@
 /*
-  head-grav.cc -- part of GNU LilyPond
+  note-heads-engraver.cc -- part of GNU LilyPond
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
-#include <ctype.h>
+
+#include <cctype>
 
 #include "rhythmic-head.hh"
-#include "paper-def.hh"
-#include "musical-request.hh"
+#include "output-def.hh"
 #include "dots.hh"
 #include "dot-column.hh"
 #include "staff-symbol-referencer.hh"
 #include "item.hh"
-#include "score-engraver.hh"
+#include "engraver.hh"
 #include "warn.hh"
 
-/**
-  make balls and rests
- */
 class Note_heads_engraver : public Engraver
 {
-  Link_array<Item> note_p_arr_;
-  
-  Link_array<Item> dot_p_arr_;
-  Link_array<Note_req> note_req_l_arr_;
+  Link_array<Item> notes_;
+  Link_array<Item> dots_;
+  Link_array<Music> note_evs_;
 
 public:
-  TRANSLATOR_DECLARATIONS(Note_heads_engraver);
+  TRANSLATOR_DECLARATIONS (Note_heads_engraver);
 
 protected:
-  virtual void start_translation_timestep ();
-  virtual bool try_music (Music *req_l) ;
+  virtual bool try_music (Music *ev) ;
   virtual void process_music ();
 
   virtual void stop_translation_timestep ();
 };
 
-
-Note_heads_engraver::Note_heads_engraver()
+Note_heads_engraver::Note_heads_engraver ()
 {
 }
 
 bool
 Note_heads_engraver::try_music (Music *m) 
 {
-  if (Note_req * n =dynamic_cast <Note_req *> (m))
+  if (m->is_mus_type ("note-event"))
     {
-      note_req_l_arr_.push (n);
+      note_evs_.push (m);
       return true;
     }
-  else if (dynamic_cast<Busy_playing_req*> (m))
-    {
-      return note_req_l_arr_.size ();
-    }
+  else if (m->is_mus_type ("busy-playing-event"))
+    return note_evs_.size ();
   
   return false;
 }
@@ -61,70 +53,81 @@ Note_heads_engraver::try_music (Music *m)
 void
 Note_heads_engraver::process_music ()
 {
-  for (int i=0; i < note_req_l_arr_.size (); i++)
+  for (int i = 0; i < note_evs_.size (); i++)
     {
-      Item *note_p  = new Item (get_property ("NoteHead"));
-      
-      Music * req = note_req_l_arr_[i];
-      
-      Duration dur = *unsmob_duration (req->get_mus_property ("duration"));
 
-      note_p->set_grob_property ("duration-log", gh_int2scm (dur.duration_log ()));
+      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 = new Item (get_property ("Dots"));
-	  Rhythmic_head::set_dots (note_p, d);
+	  Item * d = make_item ("Dots", note->self_scm ());
+	  Rhythmic_head::set_dots (note, d);
 	  
 	  if (dur.dot_count ()
-	      != gh_scm2int (d->get_grob_property ("dot-count")))
-	    d->set_grob_property ("dot-count", gh_int2scm (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_p, Y_AXIS);
-	  announce_grob (d, SCM_EOL);
-	  dot_p_arr_.push (d);
+	  d->set_parent (note, Y_AXIS);
+	  
+	  dots_.push (d);
 	}
 
-      Pitch *pit =unsmob_pitch (req->get_mus_property ("pitch"));
+      Pitch *pit = unsmob_pitch (ev->get_property ("pitch"));
 
-      int pos = pit->steps ();
-      SCM c0 = get_property ("centralCPosition");
-      if (gh_number_p (c0))
-	pos += gh_scm2int (c0);
+      int pos = pit ? pit->steps () : 0;
+      SCM c0 = get_property ("middleCPosition");
+      if (scm_is_number (c0))
+	pos += scm_to_int (c0);
 
-      note_p->set_grob_property ("staff-position",   gh_int2scm (pos));
-      announce_grob (note_p,req->self_scm());
-      note_p_arr_.push (note_p);
+      note->set_property ("staff-position",   scm_int2num (pos));
+
+      /*
+	Shaped note heads change on step of the scale.
+       */
+      SCM shape_vector = get_property ("shapeNoteStyles");
+      if (ly_c_vector_p (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_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);
+	    }
+	}
+      
+      notes_.push (note);
     }
 }
 
 void
 Note_heads_engraver::stop_translation_timestep ()
 {
-  for (int i=0; i < note_p_arr_.size (); i++)
-    {
-      typeset_grob (note_p_arr_[i]);
-    }
-
-  note_p_arr_.clear ();
-  for (int i=0; i < dot_p_arr_.size (); i++)
-    {
-      typeset_grob (dot_p_arr_[i]);
-    }
-  dot_p_arr_.clear ();
-  
-  note_req_l_arr_.clear ();
+  notes_.clear ();
+  dots_.clear ();
+  note_evs_.clear ();
 }
 
-void
-Note_heads_engraver::start_translation_timestep ()
-{
-}
 
 
-ENTER_DESCRIPTION(Note_heads_engraver,
-/* descr */       "Generate one or more noteheads from Music of type Note_req.",
+ADD_TRANSLATOR (Note_heads_engraver,
+/* descr */       "Generate noteheads.",
 /* creats*/       "NoteHead Dots",
-/* acks  */       "",
-/* reads */       "centralCPosition",
+/* accepts */     "note-event busy-playing-event",
+/* acks  */      "",
+/* reads */       "middleCPosition",
 /* write */       "");