(convert-to-dvi): redirect output to

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

diff --git a/lily/drum-note-engraver.cc b/lily/drum-note-engraver.cc
index eb48fb48a23e0eb136dbecd7fea9e5b9191e5f97..c66846137cd92aca52475a9af312ce9ed294b410 100644 (file)
--- a/lily/drum-note-engraver.cc
+++ b/lily/drum-note-engraver.cc
@@ -11,7 +11,7 @@
 #include "engraver.hh"
 #include "warn.hh"
 #include "side-position-interface.hh"
-#include "script.hh"
+#include "script-interface.hh"
 #include "stem.hh"
 #include "note-column.hh"
 
@@ -46,8 +46,6 @@ Drum_notes_engraver::try_music (Music *m)
     }
   else if (m->is_mus_type ("busy-playing-event"))
     return events_.size ();
-  else if (m->is_mus_type ("start-playing-event"))
-    return events_.size ();
   
   return false;
 }
@@ -62,8 +60,8 @@ 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"));
 
@@ -71,7 +69,7 @@ Drum_notes_engraver::process_music ()
 
       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 ()
@@ -79,7 +77,7 @@ Drum_notes_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);
        }
 
@@ -90,29 +88,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 (ly_c_pair_p (defn))
+      if (scm_is_pair (defn))
        {
-         SCM pos = ly_caddr (defn);
-         SCM style =ly_car (defn);
-         SCM script = ly_cadr (defn);
+         SCM pos = scm_caddr (defn);
+         SCM style =scm_car (defn);
+         SCM script = scm_cadr (defn);
          
          if (scm_integer_p (pos) == SCM_BOOL_T)
            note->set_property ("staff-position", pos);
-         if (ly_c_symbol_p (style))
+         if (scm_is_symbol (style))
            note->set_property ("style", style);
 
-         if (ly_c_string_p (script))
+         if (scm_is_string (script))
            {
-             Item *p  = make_item ("Script");
-             SCM desc  = SCM_EOL;
-             make_script_from_event (p, &desc,
-                                     get_parent_context (), script,
+             Item *p  = make_item ("Script", ev->self_scm ());
+             bool follow;
+             make_script_from_event (p, &follow,
+                                     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 +117,6 @@ Drum_notes_engraver::process_music ()
            }
        }
 
-
-      
-      announce_grob (note,ev->self_scm ());
       notes_.push (note);
     }
 }
@@ -166,20 +160,8 @@ Drum_notes_engraver::acknowledge_grob (Grob_info inf)
 void
 Drum_notes_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 ();
-  for (int i=0; i < scripts_.size (); i++)
-    {
-      typeset_grob (scripts_[i]);
-    }
   scripts_.clear ();
   
   events_.clear ();