update for the lily-wins.py script.

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

diff --git a/lily/drum-note-engraver.cc b/lily/drum-note-engraver.cc
index fd0464e687291a04c542f5cb88259a093b9a701f..8b05bad66561c07aae5a614226cc739168661997 100644 (file)
--- a/lily/drum-note-engraver.cc
+++ b/lily/drum-note-engraver.cc
@@ -62,24 +62,24 @@ Drum_notes_engraver::process_music ()
       if (!tab)
        tab = get_property ("drumStyleTable");
       
-      Item *note = make_item ("NoteHead");
       Music * ev = events_[i];
+      Item *note = make_item ("NoteHead", ev->self_scm ());
       
       Duration dur = *unsmob_duration (ev->get_property ("duration"));
 
-      note->set_property ("duration-log", gh_int2scm (dur.duration_log ()));
+      note->set_property ("duration-log", scm_int2num (dur.duration_log ()));
 
       if (dur.dot_count ())
        {
-         Item * d = make_item ("Dots");
+         Item * d = make_item ("Dots", ev->self_scm ());
          Rhythmic_head::set_dots (note, d);
          
          if (dur.dot_count ()
              != robust_scm2int (d->get_property ("dot-count"), 0))
-           d->set_property ("dot-count", gh_int2scm (dur.dot_count ()));
+           d->set_property ("dot-count", scm_int2num (dur.dot_count ()));
 
          d->set_parent (note, Y_AXIS);
-         announce_grob (d, SCM_EOL);
+         
          dots_.push (d);
        }
 
@@ -90,29 +90,28 @@ Drum_notes_engraver::process_music ()
       if (scm_hash_table_p (tab) == SCM_BOOL_T)
        defn = scm_hashq_ref (tab, drum_type, SCM_EOL);
       
-      if (gh_pair_p (defn))
+      if (ly_c_pair_p (defn))
        {
-         SCM pos = gh_caddr (defn);
-         SCM style =gh_car (defn);
-         SCM script = gh_cadr (defn);
+         SCM pos = ly_caddr (defn);
+         SCM style =ly_car (defn);
+         SCM script = ly_cadr (defn);
          
          if (scm_integer_p (pos) == SCM_BOOL_T)
            note->set_property ("staff-position", pos);
-         if (gh_symbol_p (style))
+         if (ly_c_symbol_p (style))
            note->set_property ("style", style);
 
-         if (gh_string_p (script))
+         if (ly_c_string_p (script))
            {
-             Item *p  = make_item ("Script");
+             Item *p  = make_item ("Script", ev->self_scm ());
              SCM desc  = SCM_EOL;
              make_script_from_event (p, &desc,
-                                     daddy_context_, script,
+                                     context (), script,
                                      0);
 
              if (p->get_property ("follow-into-staff"))
                p->set_property ("staff-padding", SCM_EOL);
              
-             announce_grob (p, ev->self_scm ());
 
              p->set_parent (note, Y_AXIS);
              Side_position_interface::add_support (p, note); 
@@ -120,9 +119,6 @@ Drum_notes_engraver::process_music ()
            }
        }
 
-
-      
-      announce_grob (note,ev->self_scm ());
       notes_.push (note);
     }
 }