* mf/feta-schrift.mf ("Trill (`tr')"): Fix typo.

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

diff --git a/lily/drum-note-engraver.cc b/lily/drum-note-engraver.cc
index 8b05bad66561c07aae5a614226cc739168661997..4490c31300fb7f841f7b1f08b85891fff8ccf7b2 100644 (file)
--- a/lily/drum-note-engraver.cc
+++ b/lily/drum-note-engraver.cc
@@ -3,15 +3,14 @@
   
   (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
-#include <ctype.h>
+
+#include <cctype>
 
 #include "rhythmic-head.hh"
-#include "event.hh"
-#include "item.hh"
 #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 +45,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;
 }
@@ -57,7 +54,7 @@ void
 Drum_notes_engraver::process_music ()
 {
   SCM tab = 0;
-  for (int i=0; i < events_.size (); i++)
+  for (int i = 0; i < events_.size (); i++)
     {
       if (!tab)
        tab = get_property ("drumStyleTable");
@@ -90,22 +87,22 @@ 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", ev->self_scm ());
-             SCM desc  = SCM_EOL;
-             make_script_from_event (p, &desc,
+             bool follow;
+             make_script_from_event (p, &follow,
                                      context (), script,
                                      0);
 
@@ -128,7 +125,7 @@ Drum_notes_engraver::acknowledge_grob (Grob_info inf)
 {
   if (Stem::has_interface (inf.grob_))
     {
-      for (int i=0; i < scripts_.size (); i++)
+      for (int i = 0; i < scripts_.size (); i++)
        {
          Grob*e = scripts_[i];
 
@@ -144,7 +141,7 @@ Drum_notes_engraver::acknowledge_grob (Grob_info inf)
     }
    else if (Note_column::has_interface (inf.grob_))
     {
-      for (int i=0; i < scripts_.size (); i++)
+      for (int i = 0; i < scripts_.size (); i++)
        {
          Grob *e = scripts_[i];
          
@@ -162,20 +159,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 ();
@@ -183,7 +168,7 @@ Drum_notes_engraver::stop_translation_timestep ()
 
 
 
-ENTER_DESCRIPTION (Drum_notes_engraver,
+ADD_TRANSLATOR (Drum_notes_engraver,
 /* descr */       "Generate noteheads.",
 /* creats*/       "NoteHead Dots Script",
 /* accepts */     "note-event busy-playing-event",