X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdrum-note-engraver.cc;h=1721dae62fad0f452d7d1fecfb803c9c6b28fc4c;hb=d2762a4f1add2bb04d6fc34d3c7ae03eeb7d500f;hp=5adc23d7ebf1a81d9debc91af82b2e70279acf39;hpb=c4c0ba811cd526f047de3f4d3c77abcc32a3e076;p=lilypond.git

diff --git a/lily/drum-note-engraver.cc b/lily/drum-note-engraver.cc
index 5adc23d7eb..1721dae62f 100644
--- a/lily/drum-note-engraver.cc
+++ b/lily/drum-note-engraver.cc
@@ -1,12 +1,26 @@
 /*
-  drum-note-engraver.cc
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <cctype>
 using namespace std;
 
+#include "item.hh"
 #include "duration.hh"
 #include "engraver.hh"
 #include "note-column.hh"
@@ -21,10 +35,8 @@ using namespace std;
 
 class Drum_notes_engraver : public Engraver
 {
-  vector<Item*> notes_;
-  vector<Item*> dots_;
-  vector<Item*> scripts_;
-  vector<Stream_event*> events_;
+  vector<Item *> scripts_;
+  vector<Stream_event *> events_;
 
 public:
   TRANSLATOR_DECLARATIONS (Drum_notes_engraver);
@@ -55,60 +67,40 @@ Drum_notes_engraver::process_music ()
   for (vsize i = 0; i < events_.size (); i++)
     {
       if (!tab)
-	tab = get_property ("drumStyleTable");
+        tab = get_property ("drumStyleTable");
 
       Stream_event *ev = events_[i];
       Item *note = make_item ("NoteHead", ev->self_scm ());
 
-      Duration dur = *unsmob_duration (ev->get_property ("duration"));
-
-      note->set_property ("duration-log", scm_from_int (dur.duration_log ()));
-
-      if (dur.dot_count ())
-	{
-	  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", scm_from_int (dur.dot_count ()));
-
-	  d->set_parent (note, Y_AXIS);
-
-	  dots_.push_back (d);
-	}
-
       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);
+        defn = scm_hashq_ref (tab, drum_type, SCM_EOL);
 
       if (scm_is_pair (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 (scm_is_symbol (style))
-	    note->set_property ("style", style);
-
-	  if (scm_is_string (script))
-	    {
-	      Item *p = make_item ("Script", ev->self_scm ());
-	      make_script_from_event (p, context (), script,
-				      0);
-
-	      p->set_parent (note, Y_AXIS);
-	      Side_position_interface::add_support (p, note);
-	      scripts_.push_back (p);
-	    }
-	}
-
-      notes_.push_back (note);
+        {
+          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 (scm_is_symbol (style))
+            note->set_property ("style", style);
+
+          if (scm_is_string (script))
+            {
+              Item *p = make_item ("Script", ev->self_scm ());
+              make_script_from_event (p, context (), script,
+                                      0);
+
+              p->set_parent (note, Y_AXIS);
+              Side_position_interface::add_support (p, note);
+              scripts_.push_back (p);
+            }
+        }
     }
 }
 
@@ -120,7 +112,7 @@ Drum_notes_engraver::acknowledge_stem (Grob_info inf)
       Grob *e = scripts_[i];
 
       if (to_dir (e->get_property ("side-relative-direction")))
-	e->set_object ("direction-source", inf.grob ()->self_scm ());
+        e->set_object ("direction-source", inf.grob ()->self_scm ());
 
       Side_position_interface::add_support (e, inf.grob ());
     }
@@ -134,27 +126,34 @@ Drum_notes_engraver::acknowledge_note_column (Grob_info inf)
       Grob *e = scripts_[i];
 
       if (!e->get_parent (X_AXIS)
-	  && Side_position_interface::get_axis (e) == Y_AXIS)
-	e->set_parent (inf.grob (), X_AXIS);
+          && Side_position_interface::get_axis (e) == Y_AXIS)
+        e->set_parent (inf.grob (), X_AXIS);
+
+      Side_position_interface::add_support (e, inf.grob ());
     }
 }
 
 void
 Drum_notes_engraver::stop_translation_timestep ()
 {
-  notes_.clear ();
-  dots_.clear ();
   scripts_.clear ();
-
   events_.clear ();
 }
 
 ADD_ACKNOWLEDGER (Drum_notes_engraver, stem);
 ADD_ACKNOWLEDGER (Drum_notes_engraver, note_column);
+
 ADD_TRANSLATOR (Drum_notes_engraver,
-		/* doc */ "Generate noteheads.",
-		/* create */ "NoteHead Dots Script",
-		/* accept */ "note-event",
-		/* read */ "drumStyleTable",
-		/* write */ "");
+                /* doc */
+                "Generate drum note heads.",
+
+                /* create */
+                "NoteHead "
+                "Script ",
+
+                /* read */
+                "drumStyleTable ",
 
+                /* write */
+                ""
+               );