(Paper_column): copy rank_. This fixes

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

diff --git a/lily/drum-note-engraver.cc b/lily/drum-note-engraver.cc
index 834b7fd74a3f3f2de37240234723c1d54453db6e..a1527b237f05b8c341b6ddaeea5b5b96e20e689f 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"
 
@@ -23,7 +22,7 @@ class Drum_notes_engraver : public Engraver
   Link_array<Music> events_;
 
 public:
-  TRANSLATOR_DECLARATIONS(Drum_notes_engraver);
+  TRANSLATOR_DECLARATIONS (Drum_notes_engraver);
 
 protected:
   virtual bool try_music (Music *ev) ;
@@ -32,7 +31,7 @@ protected:
   virtual void stop_translation_timestep ();
 };
 
-Drum_notes_engraver::Drum_notes_engraver()
+Drum_notes_engraver::Drum_notes_engraver ()
 {
 }
 
@@ -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,62 +54,61 @@ 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");
       
-      Item *note = make_item ("NoteHead");
       Music * ev = events_[i];
+      Item *note = make_item ("NoteHead", ev->self_scm ());
       
-      Duration dur = *unsmob_duration (ev->get_mus_property ("duration"));
+      Duration dur = *unsmob_duration (ev->get_property ("duration"));
 
-      note->set_grob_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_grob_property ("dot-count"), 0))
-           d->set_grob_property ("dot-count", gh_int2scm (dur.dot_count ()));
+             != robust_scm2int (d->get_property ("dot-count"), 0))
+           d->set_property ("dot-count", scm_int2num (dur.dot_count ()));
 
          d->set_parent (note, Y_AXIS);
-         announce_grob (d, SCM_EOL);
+         
          dots_.push (d);
        }
 
-      SCM drum_type =  ev->get_mus_property ("drum-type");
+      SCM drum_type =  ev->get_property ("drum-type");
 
       SCM defn = SCM_EOL;
 
       if (scm_hash_table_p (tab) == SCM_BOOL_T)
        defn = scm_hashq_ref (tab, drum_type, SCM_EOL);
       
-      if (gh_pair_p (defn))
+      if (scm_is_pair (defn))
        {
-         SCM pos = gh_caddr (defn);
-         SCM style =gh_car (defn);
-         SCM script = gh_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_grob_property ("staff-position", pos);
-         if (gh_symbol_p (style))
-           note->set_grob_property ("style", style);
+           note->set_property ("staff-position", pos);
+         if (scm_is_symbol (style))
+           note->set_property ("style", style);
 
-         if (gh_string_p (script))
+         if (scm_is_string (script))
            {
-             Item *p  = make_item ("Script");
-             SCM desc  = SCM_EOL;
-             make_script_from_event (p, &desc,
-                                     daddy_context_, script,
+             Item *p  = make_item ("Script", ev->self_scm ());
+             bool follow;
+             make_script_from_event (p, &follow,
+                                     context (), script,
                                      0);
 
-             if (p->get_grob_property ("follow-into-staff"))
-               p->set_grob_property ("staff-padding", SCM_EOL);
+             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 +116,6 @@ Drum_notes_engraver::process_music ()
            }
        }
 
-
-      
-      announce_grob (note,ev->self_scm());
       notes_.push (note);
     }
 }
@@ -132,12 +125,12 @@ 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];
 
-         if (to_dir (e->get_grob_property ("side-relative-direction")))
-           e->set_grob_property ("direction-source", inf.grob_->self_scm ());
+         if (to_dir (e->get_property ("side-relative-direction")))
+           e->set_property ("direction-source", inf.grob_->self_scm ());
 
          /*
            add dep ? 
@@ -148,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];
          
@@ -166,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 ();
@@ -187,7 +168,7 @@ Drum_notes_engraver::stop_translation_timestep ()
 
 
 
-ENTER_DESCRIPTION(Drum_notes_engraver,
+ENTER_DESCRIPTION (Drum_notes_engraver,
 /* descr */       "Generate noteheads.",
 /* creats*/       "NoteHead Dots Script",
 /* accepts */     "note-event busy-playing-event",