X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-heads-engraver.cc;h=8ec38e34d4d4e7c7a4078a482314dbd955b0511c;hb=3548eacf9da6dddfdd5a9ca2dc15d055a0a9a5e2;hp=97a8b973916672a099570ddab40d1873ea86821d;hpb=baf32731650d510882eeb52d02f4ca0c816c7c29;p=lilypond.git

diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc
index 97a8b97391..8ec38e34d4 100644
--- a/lily/note-heads-engraver.cc
+++ b/lily/note-heads-engraver.cc
@@ -1,13 +1,13 @@
 /*
-  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"
@@ -15,60 +15,36 @@
 #include "engraver.hh"
 #include "warn.hh"
 
-/**
-  make balls and rests
- */
 class Note_heads_engraver : public Engraver
 {
   Link_array<Item> notes_;
-  
   Link_array<Item> dots_;
-  Link_array<Note_req> note_reqs_;
+  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) ;
+  virtual bool try_music (Music *ev) ;
   virtual void process_music ();
 
   virtual void stop_translation_timestep ();
-
-private:
-  bool in_ligature;
 };
 
-Note_heads_engraver::Note_heads_engraver()
+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_reqs_.push (n);
+      note_evs_.push (m);
       return true;
     }
-  else if (dynamic_cast<Busy_playing_req*> (m))
-    {
-      return note_reqs_.size ();
-    }
-  else if (Span_req *req_ = dynamic_cast<Span_req*> (m))
-    {
-      if (scm_equal_p (req_->get_mus_property ("span-type"),
-		       scm_makfrom0str ("abort")) == SCM_BOOL_T)
-	{
-	  in_ligature = 0;
-	}
-      else if (scm_equal_p (req_->get_mus_property ("span-type"),
-			    scm_makfrom0str ("ligature")) == SCM_BOOL_T)
-	{
-	  in_ligature = (req_->get_span_dir () == START);
-	}
-    }
+  else if (m->is_mus_type ("busy-playing-event"))
+    return note_evs_.size ();
   
   return false;
 }
@@ -77,40 +53,37 @@ Note_heads_engraver::try_music (Music *m)
 void
 Note_heads_engraver::process_music ()
 {
-  for (int i=0; i < note_reqs_.size (); i++)
+  for (int i=0; i < note_evs_.size (); i++)
     {
-      Item *note =
-	new Item (get_property ((in_ligature) ? "LigatureHead" : "NoteHead"));
 
-      Music * req = note_reqs_[i];
+      Music * ev = note_evs_[i];
+      Item *note = make_item ("NoteHead", ev->self_scm ());
       
-      Duration dur = *unsmob_duration (req->get_mus_property ("duration"));
-
-      note->set_grob_property ("duration-log", gh_int2scm (dur.duration_log ()));
+      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"));
+	  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, Y_AXIS);
-	  announce_grob (d, SCM_EOL);
+	  
 	  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->set_grob_property ("staff-position",   gh_int2scm (pos));
-      announce_grob (note,req->self_scm());
+      note->set_property ("staff-position",   scm_int2num (pos));
       notes_.push (note);
     }
 }
@@ -118,30 +91,17 @@ Note_heads_engraver::process_music ()
 void
 Note_heads_engraver::stop_translation_timestep ()
 {
-  for (int i=0; i < notes_.size (); i++)
-    {
-      typeset_grob (notes_[i]);
-    }
-
   notes_.clear ();
-  for (int i=0; i < dots_.size (); i++)
-    {
-      typeset_grob (dots_[i]);
-    }
   dots_.clear ();
-  
-  note_reqs_.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.",
+ENTER_DESCRIPTION (Note_heads_engraver,
+/* descr */       "Generate noteheads.",
 /* creats*/       "NoteHead Dots",
-/* acks  */       "",
-/* reads */       "centralCPosition",
+/* accepts */     "note-event busy-playing-event",
+/* acks  */      "",
+/* reads */       "middleCPosition",
 /* write */       "");