* The grand 2005-2006 replace.

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

diff --git a/lily/drum-note-engraver.cc b/lily/drum-note-engraver.cc
index 02bb19f1d1644827ed7e03c593d2a97463d3bcac..1b95c519ad29b2e8d5c7d99e6799d251e617b468 100644 (file)
--- a/lily/drum-note-engraver.cc
+++ b/lily/drum-note-engraver.cc
@@ -1,10 +1,11 @@
 /*
   drum-note-engraver.cc
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include <cctype>
+using namespace std;
 
 #include "rhythmic-head.hh"
 #include "engraver.hh"
@@ -102,14 +103,9 @@ Drum_notes_engraver::process_music ()
          if (scm_is_string (script))
            {
              Item *p = make_item ("Script", ev->self_scm ());
-             bool follow;
-             make_script_from_event (p, &follow,
-                                     context (), script,
+             make_script_from_event (p, context (), script,
                                      0);
 
-             if (p->get_property ("follow-into-staff"))
-               p->set_property ("staff-padding", SCM_EOL);
-
              p->set_parent (note, Y_AXIS);
              Side_position_interface::add_support (p, note);
              scripts_.push (p);
@@ -130,13 +126,10 @@ Drum_notes_engraver::acknowledge_stem (Grob_info inf)
       if (to_dir (e->get_property ("side-relative-direction")))
        e->set_object ("direction-source", inf.grob ()->self_scm ());
 
-      /*
-       add dep ?
-      */
-      e->add_dependency (inf.grob ());
       Side_position_interface::add_support (e, inf.grob ());
     }
 }
+
 void
 Drum_notes_engraver::acknowledge_note_column (Grob_info inf)
 {