clap

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

diff --git a/lily/completion-note-heads-engraver.cc b/lily/completion-note-heads-engraver.cc
index 6d1157560d9cc98a9a513c93b03d3a127a30c14c..ffb97241275195212fbaa8434e35a22ce0fe6f8e 100644 (file)
--- a/lily/completion-note-heads-engraver.cc
+++ b/lily/completion-note-heads-engraver.cc
@@ -1,7 +1,7 @@
 /*
   head-grav.cc -- part of GNU LilyPond
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include <ctype.h>
@@ -184,9 +184,6 @@ Completion_heads_engraver::process_music ()
            Music * m = note_req_l_arr_[i]->clone ();
            scratch_note_reqs_.push (m);
          }
-
-      for (int i =0; i < scratch_note_reqs_.size (); i++)
-       scratch_note_reqs_[i]->set_mus_property ("duration", note_dur.smobbed_copy ());
     }
 
   
@@ -195,18 +192,18 @@ Completion_heads_engraver::process_music ()
     {
       Item *note_p  = new Item (get_property ("NoteHead"));
       
-      Staff_symbol_referencer::set_interface (note_p);
-      
       Music * req =  note_req_l_arr_[i];
       if (scratch_note_reqs_.size())
        {
          req = scratch_note_reqs_[i];
-         req->set_mus_property ("pitch",
-           note_req_l_arr_[i]->get_mus_property ("pitch"));
+         SCM pits = note_req_l_arr_[i]->get_mus_property ("pitch");
+         req->set_mus_property ("pitch",pits);
        }
+      
+      req->set_mus_property ("duration", note_dur.smobbed_copy ());
       note_p->set_grob_property ("duration-log",
                                 gh_int2scm (note_dur.duration_log ()));
-
+      
       int dots= note_dur.dot_count ();
       if (dots)
        {
@@ -220,7 +217,7 @@ Completion_heads_engraver::process_music ()
            d->set_grob_property ("dot-count", gh_int2scm (dots));
 
          d->set_parent (note_p, Y_AXIS);
-         announce_grob (d,0);
+         announce_grob (d, SCM_EOL);
          dot_p_arr_.push (d);
        }
 
@@ -232,16 +229,7 @@ Completion_heads_engraver::process_music ()
        pos += gh_scm2int (c0);
 
       note_p->set_grob_property ("staff-position",   gh_int2scm (pos));
-      if (to_boolean (get_property ("easyPlay")))
-       {
-         char s[2] = "a";
-         s[0] = (pit->notename_i_ + 2)%7 + 'a';
-
-         s[0] = toupper (s[0]);
-         note_p->set_grob_property ("note-character", ly_str02scm (s));
-       }
-      
-      announce_grob (note_p,req);
+      announce_grob (note_p,req->self_scm ());
       note_p_arr_.push (note_p);
     }
 
@@ -316,5 +304,5 @@ ENTER_DESCRIPTION(Completion_heads_engraver,
 break long notes and automatically tie them into the next measure.",
 /* creats*/       "NoteHead Dots",
 /* acks  */       "",
-/* reads */       "easyPlay centralCPosition measurePosition measureLength",
+/* reads */       "centralCPosition measurePosition measureLength",
 /* write */       "");