* Documentation/user/notation.itely: fixed 2 typos

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

diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc
index 8c1460b567b718e43d923b5b2988181741f9b154..9bd654b3fb39d1229f979bb2dca707dd1db5fd2e 100644 (file)
--- a/lily/note-heads-engraver.cc
+++ b/lily/note-heads-engraver.cc
@@ -6,7 +6,7 @@
 #include <ctype.h>
 
 #include "rhythmic-head.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "event.hh"
 #include "dots.hh"
 #include "dot-column.hh"
@@ -45,8 +45,6 @@ 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;
 }
@@ -57,16 +55,16 @@ Note_heads_engraver::process_music ()
 {
   for (int i=0; i < note_reqs_.size (); i++)
     {
-      Item *note = make_item ("NoteHead");
 
       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 ())
        {
-         Item * d = make_item ("Dots");
+         Item * d = make_item ("Dots", note->self_scm ());
          Rhythmic_head::set_dots (note, d);
          
          if (dur.dot_count ()
@@ -74,7 +72,7 @@ Note_heads_engraver::process_music ()
            d->set_property ("dot-count", scm_int2num (dur.dot_count ()));
 
          d->set_parent (note, Y_AXIS);
-         announce_grob (d, SCM_EOL);
+         
          dots_.push (d);
        }
 
@@ -82,11 +80,10 @@ Note_heads_engraver::process_music ()
 
       int pos = pit ? pit->steps () : 0;
       SCM c0 = get_property ("middleCPosition");
-      if (ly_number_p (c0))
-       pos += ly_scm2int (c0);
+      if (scm_is_number (c0))
+       pos += scm_to_int (c0);
 
       note->set_property ("staff-position",   scm_int2num (pos));
-      announce_grob (note,req->self_scm ());
       notes_.push (note);
     }
 }
@@ -94,16 +91,8 @@ 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 ();
 }