Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

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

diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc
index 1d2f32418a2aac5b6da0dcf9513082c80f4acaf1..7d976761dd9fbfdd512ad9d4af025c6b6b01feea 100644 (file)
--- a/lily/note-heads-engraver.cc
+++ b/lily/note-heads-engraver.cc
@@ -9,8 +9,6 @@
 #include <cctype>
 using namespace std;
 
-#include "dots.hh"
-#include "dot-column.hh"
 #include "duration.hh"
 #include "item.hh"
 #include "output-def.hh"
@@ -25,7 +23,6 @@ using namespace std;
 class Note_heads_engraver : public Engraver
 {
   vector<Item*> notes_;
-  vector<Item*> dots_;
   vector<Stream_event*> note_evs_;
 
 public:
@@ -56,23 +53,6 @@ Note_heads_engraver::process_music ()
       Stream_event *ev = note_evs_[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", note->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);
-       }
-
       Pitch *pit = unsmob_pitch (ev->get_property ("pitch"));
 
 #if 0 /* TODO: should have a mechanism to switch off these warnings. */
@@ -117,16 +97,12 @@ void
 Note_heads_engraver::stop_translation_timestep ()
 {
   notes_.clear ();
-  dots_.clear ();
   note_evs_.clear ();
 }
 
 ADD_TRANSLATOR (Note_heads_engraver,
                /* doc */ "Generate noteheads.",
                /* create */
-               "NoteHead "
-               "Dots",
-               /* accept */
-               "note-event",
+               "NoteHead ",
                /* read */ "middleCPosition",
                /* write */ "");