* lily/auto-beam-engraver.cc (try_music): accept and process

[lilypond.git] / lily / note-heads-engraver.cc

diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc
index 55e20f8a6e3bd16597e86f5f5013d091fd857e87..6a10e3e4c8907b52a7618477413d66b1afc37d0d 100644 (file)
--- a/lily/note-heads-engraver.cc
+++ b/lily/note-heads-engraver.cc
@@ -1,7 +1,7 @@
 /*
-  head-grav.cc -- part of GNU LilyPond
+  note-heads-engraver.cc -- part of GNU LilyPond
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #include <ctype.h>
 
@@ -15,14 +15,9 @@
 #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<Music> note_reqs_;
 
@@ -30,7 +25,6 @@ public:
   TRANSLATOR_DECLARATIONS(Note_heads_engraver);
 
 protected:
-  virtual void start_translation_timestep ();
   virtual bool try_music (Music *req) ;
   virtual void process_music ();
 
@@ -51,6 +45,8 @@ Note_heads_engraver::try_music (Music *m)
     }
   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;
 }
@@ -61,21 +57,20 @@ Note_heads_engraver::process_music ()
 {
   for (int i=0; i < note_reqs_.size (); i++)
     {
-      Item *note = new Item (get_property ("NoteHead"));
+      Item *note = make_item ("NoteHead");
 
       Music * req = note_reqs_[i];
       
       Duration dur = *unsmob_duration (req->get_mus_property ("duration"));
 
       note->set_grob_property ("duration-log", gh_int2scm (dur.duration_log ()));
-
       if (dur.dot_count ())
        {
-         Item * d = new Item (get_property ("Dots"));
+         Item * d = make_item ("Dots");
          Rhythmic_head::set_dots (note, d);
          
          if (dur.dot_count ()
-             != gh_scm2int (d->get_grob_property ("dot-count")))
+             != robust_scm2int (d->get_grob_property ("dot-count"), 0))
            d->set_grob_property ("dot-count", gh_int2scm (dur.dot_count ()));
 
          d->set_parent (note, Y_AXIS);
@@ -85,7 +80,7 @@ Note_heads_engraver::process_music ()
 
       Pitch *pit =unsmob_pitch (req->get_mus_property ("pitch"));
 
-      int pos = pit->steps ();
+      int pos = pit ? pit->steps () : 0;
       SCM c0 = get_property ("centralCPosition");
       if (gh_number_p (c0))
        pos += gh_scm2int (c0);
@@ -113,16 +108,12 @@ Note_heads_engraver::stop_translation_timestep ()
   note_reqs_.clear ();
 }
 
-void
-Note_heads_engraver::start_translation_timestep ()
-{
-}
 
 
 ENTER_DESCRIPTION(Note_heads_engraver,
 /* descr */       "Generate noteheads.",
 /* creats*/       "NoteHead Dots",
-/* accepts */     "note-event busy-playing-event ligature-event abort-event",
+/* accepts */     "note-event busy-playing-event",
 /* acks  */      "",
 /* reads */       "centralCPosition",
 /* write */       "");