X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fnote-heads-engraver.cc;h=7898b85ec39407dfe06f64f7af8f093214fc2edc;hb=14d0e70efc16bfb71c1a235e22b43262942f1674;hp=4a397581a3f3dd63d1b7515bd29f4fd5c971f9c7;hpb=02ad2d3bb642d9228c4ae69efc71a74bd222575f;p=lilypond.git

diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc
index 4a397581a3..7898b85ec3 100644
--- a/lily/note-heads-engraver.cc
+++ b/lily/note-heads-engraver.cc
@@ -1,125 +1,110 @@
 /*
-  head-grav.cc -- part of GNU LilyPond
+  note-heads-engraver.cc -- part of GNU LilyPond
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
+#include <ctype.h>
 
-#include "note-head.hh"
-#include "note-heads-engraver.hh"
-#include "paper-def.hh"
-#include "musical-request.hh"
+#include "rhythmic-head.hh"
+#include "output-def.hh"
+#include "event.hh"
 #include "dots.hh"
 #include "dot-column.hh"
 #include "staff-symbol-referencer.hh"
+#include "item.hh"
+#include "engraver.hh"
+#include "warn.hh"
 
-Note_heads_engraver::Note_heads_engraver()
+class Note_heads_engraver : public Engraver
+{
+  Link_array<Item> notes_;
+  Link_array<Item> dots_;
+  Link_array<Music> note_reqs_;
+
+public:
+  TRANSLATOR_DECLARATIONS (Note_heads_engraver);
+
+protected:
+  virtual bool try_music (Music *req) ;
+  virtual void process_music ();
+
+  virtual void stop_translation_timestep ();
+};
+
+Note_heads_engraver::Note_heads_engraver ()
 {
 }
 
 bool
-Note_heads_engraver::do_try_music (Music *m) 
+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_end_mom_  = note_end_mom_ >? now_mom () + m->length_mom ();
-      
+      note_reqs_.push (m);
       return true;
     }
-  else if (Tonic_req* t = dynamic_cast<Tonic_req*> (m))
-    {
-      return true;
-    }
-  else if (Inversion_req* i = dynamic_cast<Inversion_req*> (m))
-    {
-      return true;
-    }
-  else if (Bass_req* b = dynamic_cast<Bass_req*> (m))
-    {
-      return true;
-    }
-  else if (Busy_playing_req * p = dynamic_cast<Busy_playing_req*> (m))
-    {
-      return now_mom () < note_end_mom_;
-    }
-  else if (Pitch_interrogate_req *p = dynamic_cast<Pitch_interrogate_req*> (m))
-    {
-      for (int i= note_req_l_arr_.size (); i--;)
-	p->pitch_arr_.push (note_req_l_arr_[i]->pitch_); // GUH UGH UGHUGH.
-      return true;
-    }
-  return false;
+  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 false;
 }
 
+
 void
-Note_heads_engraver::do_process_requests()
+Note_heads_engraver::process_music ()
 {
-  if (note_p_arr_.size ())
-    return ;
-  
-  SCM noteheadstyle = get_property ("noteHeadStyle");
-  for (int i=0; i < note_req_l_arr_.size (); i++)
+  for (int i=0; i < note_reqs_.size (); i++)
     {
-      Note_head *note_p  = new Note_head;
-      
-      Staff_symbol_referencer_interface si (note_p);
-      si.set_interface ();
 
+      Music * req = note_reqs_[i];
+      Item *note = make_item ("NoteHead", req->self_scm ());
       
-      Note_req * note_req_l = note_req_l_arr_[i];
-      
-      note_p->set_elt_property ("duration-log",
-				gh_int2scm (note_req_l->duration_.durlog_i_ <? 2));
+      Duration dur = *unsmob_duration (req->get_property ("duration"));
 
-      if (note_req_l->duration_.dots_i_)
+      note->set_property ("duration-log", scm_int2num (dur.duration_log ()));
+      if (dur.dot_count ())
 	{
-	  Dots * d = new Dots;
+	  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 ()));
 
-	  Staff_symbol_referencer_interface sd (d);
-	  sd.set_interface ();
+	  d->set_parent (note, Y_AXIS);
 	  
-	  note_p->add_dots (d);
-	  d->set_elt_property ("dot-count", gh_int2scm (note_req_l->duration_.dots_i_));
-	  announce_element (Score_element_info (d,0));
-	  dot_p_arr_.push (d);
+	  dots_.push (d);
 	}
-      si.set_position(note_req_l->pitch_.steps ());
 
-      /*
-	TODO: transparent note heads.
-       */
-	 
-      if (gh_string_p (noteheadstyle))
-	{
-	  note_p->set_elt_property ("style", noteheadstyle);
-	}
-      
-      Score_element_info itinf (note_p,note_req_l);
-      announce_element (itinf);
-      note_p_arr_.push (note_p);
+      Pitch *pit =unsmob_pitch (req->get_property ("pitch"));
+
+      int pos = pit ? pit->steps () : 0;
+      SCM c0 = get_property ("middleCPosition");
+      if (ly_c_number_p (c0))
+	pos += ly_scm2int (c0);
+
+      note->set_property ("staff-position",   scm_int2num (pos));
+      notes_.push (note);
     }
 }
- 
+
 void
-Note_heads_engraver::do_pre_move_processing()
+Note_heads_engraver::stop_translation_timestep ()
 {
-  for (int i=0; i < note_p_arr_.size (); i++)
-    {
-      typeset_element (note_p_arr_[i]);
-    }
-  note_p_arr_.clear ();
-  for (int i=0; i < dot_p_arr_.size (); i++)
-    {
-      typeset_element (dot_p_arr_[i]);
-    }
-  dot_p_arr_.clear ();
-  
-  note_req_l_arr_.clear ();
-}
-
 
+  notes_.clear ();
+  dots_.clear ();
+  note_reqs_.clear ();
+}
 
 
-ADD_THIS_TRANSLATOR(Note_heads_engraver);
 
+ENTER_DESCRIPTION (Note_heads_engraver,
+/* descr */       "Generate noteheads.",
+/* creats*/       "NoteHead Dots",
+/* accepts */     "note-event busy-playing-event",
+/* acks  */      "",
+/* reads */       "middleCPosition",
+/* write */       "");