X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-heads-engraver.cc;h=7898b85ec39407dfe06f64f7af8f093214fc2edc;hb=9362af693c2e902d788067f9aff3654ad45d04ff;hp=f3c290916bb43b620edf040645ae977ebb42a628;hpb=4bbc3761de1012c805f55bc957cb9c7c35ef3ddc;p=lilypond.git

diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc
index f3c290916b..7898b85ec3 100644
--- a/lily/note-heads-engraver.cc
+++ b/lily/note-heads-engraver.cc
@@ -1,109 +1,110 @@
 /*
-  head-grav.cc -- part of GNU LilyPond
+  note-heads-engraver.cc -- part of GNU LilyPond
 
-  (c)  1997--1999 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))
-    {
-      note_req_l_arr_.push (n);
-      notes_end_pq_.insert (now_mom () + m->length_mom ());
-      
-      return true;
-    }
-  else if (Tonic_req* t = dynamic_cast<Tonic_req*> (m))
+  if (m->is_mus_type ("note-event"))
     {
+      note_reqs_.push (m);
       return true;
     }
-  else if (Busy_playing_req * p = dynamic_cast<Busy_playing_req*> (m))
-    {
-      return notes_end_pq_.size ();
-    }
-  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 ;
-  
-  String noteheadstyle = get_property ("noteHeadStyle", 0);
-  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;
-      Note_req * note_req_l = note_req_l_arr_[i];
-      note_p->balltype_i_ = note_req_l->duration_.durlog_i_;
-      note_p->dots_i_ = note_req_l->duration_.dots_i_;
-      if (note_p->dots_i_)
+
+      Music * req = note_reqs_[i];
+      Item *note = make_item ("NoteHead", req->self_scm ());
+      
+      Duration dur = *unsmob_duration (req->get_property ("duration"));
+
+      note->set_property ("duration-log", scm_int2num (dur.duration_log ()));
+      if (dur.dot_count ())
 	{
-	  Dots * d = new Dots;
-	  note_p->dots_l_ = d;
-
-	  Scalar dir = get_property ("verticalDirection",0);
-	  if (dir.isdir_b())
-	    {
-	      d->resolve_dir_ = (Direction)(int)dir;
-	    }
+	  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);
 	  
-	  announce_element (Score_element_info (d,0));
-	  dot_p_arr_.push (d);
+	  dots_.push (d);
 	}
-      note_p->position_i_ = note_req_l->pitch_.steps ();
 
-      if (noteheadstyle == "transparent")
-	note_p->set_elt_property (transparent_scm_sym, SCM_BOOL_T);
-      else 
-        note_p->set_elt_property (style_scm_sym,
-				  ly_ch_C_to_scm (noteheadstyle.ch_C()));
+      Pitch *pit =unsmob_pitch (req->get_property ("pitch"));
 
-      
-      Score_element_info itinf (note_p,note_req_l);
-      announce_element (itinf);
-      note_p_arr_.push (note_p);
-    }
-}
- 
-void
-Note_heads_engraver::do_pre_move_processing()
-{
-  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]);
+      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);
     }
-  dot_p_arr_.clear ();
-  
-  note_req_l_arr_.clear ();
 }
 
 void
-Note_heads_engraver::do_post_move_processing()
+Note_heads_engraver::stop_translation_timestep ()
 {
-  Moment n (now_mom ());
-  while (notes_end_pq_.size () && notes_end_pq_.front () <=n)
-    notes_end_pq_.get ();
+
+  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 */       "");