X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-heads-engraver.cc;h=55e20f8a6e3bd16597e86f5f5013d091fd857e87;hb=7a9aad3db6fe6ee35bbcda9d9096b5d0df7ef639;hp=7d48f15939122c483cd3d12b1fa1c50d34072b97;hpb=99d0993d76e94b796cf480d8b540cd318d1a2463;p=lilypond.git

diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc
index 7d48f15939..55e20f8a6e 100644
--- a/lily/note-heads-engraver.cc
+++ b/lily/note-heads-engraver.cc
@@ -1,13 +1,13 @@
 /*
   head-grav.cc -- part of GNU LilyPond
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #include <ctype.h>
 
 #include "rhythmic-head.hh"
 #include "paper-def.hh"
-#include "musical-request.hh"
+#include "event.hh"
 #include "dots.hh"
 #include "dot-column.hh"
 #include "staff-symbol-referencer.hh"
@@ -18,57 +18,39 @@
 /**
   make balls and rests
  */
+
 class Note_heads_engraver : public Engraver
 {
-  Link_array<Item> note_p_arr_;
+  Link_array<Item> notes_;
   
-  Link_array<Item> dot_p_arr_;
-  Link_array<Note_req> note_req_l_arr_;
+  Link_array<Item> dots_;
+  Link_array<Music> note_reqs_;
 
 public:
   TRANSLATOR_DECLARATIONS(Note_heads_engraver);
 
 protected:
   virtual void start_translation_timestep ();
-  virtual bool try_music (Music *req_l) ;
+  virtual bool try_music (Music *req) ;
   virtual void process_music ();
 
   virtual void stop_translation_timestep ();
-
-private:
-  bool in_ligature;
 };
 
 Note_heads_engraver::Note_heads_engraver()
 {
-  in_ligature = 0;
 }
 
 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_reqs_.push (m);
       return true;
     }
-  else if (dynamic_cast<Busy_playing_req*> (m))
-    {
-      return note_req_l_arr_.size ();
-    }
-  else if (Span_req *req_ = dynamic_cast<Span_req*> (m))
-    {
-      if (scm_equal_p (req_->get_mus_property ("span-type"),
-		       ly_str02scm ("abort")) == SCM_BOOL_T)
-	{
-	  in_ligature = 0;
-	}
-      else if (scm_equal_p (req_->get_mus_property ("span-type"),
-			    ly_str02scm ("ligature")) == SCM_BOOL_T)
-	{
-	  in_ligature = (req_->get_span_dir () == START);
-	}
-    }
+  else if (m->is_mus_type ("busy-playing-event"))
+    return note_reqs_.size ();
   
   return false;
 }
@@ -77,29 +59,28 @@ 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_reqs_.size (); i++)
     {
-      Item *note_p =
-	new Item (get_property ((in_ligature) ? "LigatureHead" : "NoteHead"));
+      Item *note = new Item (get_property ("NoteHead"));
 
-      Music * req = note_req_l_arr_[i];
+      Music * req = note_reqs_[i];
       
       Duration dur = *unsmob_duration (req->get_mus_property ("duration"));
 
-      note_p->set_grob_property ("duration-log", gh_int2scm (dur.duration_log ()));
+      note->set_grob_property ("duration-log", gh_int2scm (dur.duration_log ()));
 
       if (dur.dot_count ())
 	{
 	  Item * d = new Item (get_property ("Dots"));
-	  Rhythmic_head::set_dots (note_p, d);
+	  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 ()));
 
-	  d->set_parent (note_p, Y_AXIS);
+	  d->set_parent (note, Y_AXIS);
 	  announce_grob (d, SCM_EOL);
-	  dot_p_arr_.push (d);
+	  dots_.push (d);
 	}
 
       Pitch *pit =unsmob_pitch (req->get_mus_property ("pitch"));
@@ -109,41 +90,39 @@ Note_heads_engraver::process_music ()
       if (gh_number_p (c0))
 	pos += gh_scm2int (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_grob_property ("staff-position",   gh_int2scm (pos));
+      announce_grob (note,req->self_scm());
+      notes_.push (note);
     }
 }
 
 void
 Note_heads_engraver::stop_translation_timestep ()
 {
-  for (int i=0; i < note_p_arr_.size (); i++)
+  for (int i=0; i < notes_.size (); i++)
     {
-      typeset_grob (note_p_arr_[i]);
+      typeset_grob (notes_[i]);
     }
 
-  note_p_arr_.clear ();
-  for (int i=0; i < dot_p_arr_.size (); i++)
+  notes_.clear ();
+  for (int i=0; i < dots_.size (); i++)
     {
-      typeset_grob (dot_p_arr_[i]);
+      typeset_grob (dots_[i]);
     }
-  dot_p_arr_.clear ();
-  
-  note_req_l_arr_.clear ();
+  dots_.clear ();
+  note_reqs_.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.",
+/* descr */       "Generate noteheads.",
 /* creats*/       "NoteHead Dots",
-/* acks  */       "",
+/* accepts */     "note-event busy-playing-event ligature-event abort-event",
+/* acks  */      "",
 /* reads */       "centralCPosition",
 /* write */       "");