* mf/feta-bolletjes.mf (overdone_heads): cleanup triangle

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

diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc
index b3ab068c3ffb325a44f9f2b5a85d794b0fd852e4..8ec38e34d4d4e7c7a4078a482314dbd955b0511c 100644 (file)
--- a/lily/note-heads-engraver.cc
+++ b/lily/note-heads-engraver.cc
@@ -3,11 +3,11 @@
 
   (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
-#include <ctype.h>
+
+#include <cctype>
 
 #include "rhythmic-head.hh"
-#include "paper-def.hh"
-#include "event.hh"
+#include "output-def.hh"
 #include "dots.hh"
 #include "dot-column.hh"
 #include "staff-symbol-referencer.hh"
@@ -19,19 +19,19 @@ class Note_heads_engraver : public Engraver
 {
   Link_array<Item> notes_;
   Link_array<Item> dots_;
-  Link_array<Music> note_reqs_;
+  Link_array<Music> note_evs_;
 
 public:
-  TRANSLATOR_DECLARATIONS(Note_heads_engraver);
+  TRANSLATOR_DECLARATIONS (Note_heads_engraver);
 
 protected:
-  virtual bool try_music (Music *req) ;
+  virtual bool try_music (Music *ev) ;
   virtual void process_music ();
 
   virtual void stop_translation_timestep ();
 };
 
-Note_heads_engraver::Note_heads_engraver()
+Note_heads_engraver::Note_heads_engraver ()
 {
 }
 
@@ -40,13 +40,11 @@ Note_heads_engraver::try_music (Music *m)
 {
   if (m->is_mus_type ("note-event"))
     {
-      note_reqs_.push (m);
+      note_evs_.push (m);
       return true;
     }
   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 note_evs_.size ();
   
   return false;
 }
@@ -55,39 +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 = make_item ("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 = make_item ("Dots");
+         Item * d = make_item ("Dots", note->self_scm ());
          Rhythmic_head::set_dots (note, d);
          
          if (dur.dot_count ()
-             != robust_scm2int (d->get_grob_property ("dot-count"), 0))
-           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 ? pit->steps () : 0;
-      SCM c0 = get_property ("centralCPosition");
-      if (gh_number_p (c0))
-       pos += gh_scm2int (c0);
+      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);
     }
 }
@@ -95,26 +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 ();
 }
 
 
 
-ENTER_DESCRIPTION(Note_heads_engraver,
+ENTER_DESCRIPTION (Note_heads_engraver,
 /* descr */       "Generate noteheads.",
 /* creats*/       "NoteHead Dots",
 /* accepts */     "note-event busy-playing-event",
 /* acks  */      "",
-/* reads */       "centralCPosition",
+/* reads */       "middleCPosition",
 /* write */       "");