/*
note-heads-engraver.cc -- part of GNU LilyPond
- (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "engraver.hh"
#include <cctype>
using namespace std;
-#include "rhythmic-head.hh"
+#include "duration.hh"
+#include "item.hh"
#include "output-def.hh"
-#include "dots.hh"
-#include "dot-column.hh"
+#include "pitch.hh"
+#include "rhythmic-head.hh"
#include "staff-symbol-referencer.hh"
-#include "item.hh"
+#include "stream-event.hh"
#include "warn.hh"
-#include "duration.hh"
+
+#include "translator.icc"
class Note_heads_engraver : public Engraver
{
vector<Item*> notes_;
- vector<Item*> dots_;
- vector<Music*> note_evs_;
+ vector<Stream_event*> note_evs_;
public:
TRANSLATOR_DECLARATIONS (Note_heads_engraver);
protected:
- virtual bool try_music (Music *ev);
+ DECLARE_TRANSLATOR_LISTENER (note);
void process_music ();
void stop_translation_timestep ();
};
{
}
-bool
-Note_heads_engraver::try_music (Music *m)
+IMPLEMENT_TRANSLATOR_LISTENER (Note_heads_engraver, note);
+void
+Note_heads_engraver::listen_note (Stream_event *ev)
{
- if (m->is_mus_type ("note-event"))
- {
- note_evs_.push_back (m);
- return true;
- }
- else if (m->is_mus_type ("busy-playing-event"))
- return note_evs_.size ();
-
- return false;
+ note_evs_.push_back (ev);
}
void
Note_heads_engraver::process_music ()
{
+ SCM c0 = get_property ("middleCPosition");
+ SCM layout_proc = get_property("staffLineLayoutFunction");
+
for (vsize i = 0; i < note_evs_.size (); i++)
{
- Music *ev = note_evs_[i];
+ 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. */
ev->origin ()->warning (_ ("NoteEvent without pitch"));
#endif
- int pos = pit ? pit->steps () : 0;
- SCM c0 = get_property ("middleCPosition");
- if (scm_is_number (c0))
- pos += scm_to_int (c0);
+ int pos;
+ if (pit == 0)
+ pos = 0;
+ else if (ly_is_procedure (layout_proc)){
+ SCM pitch = ev->get_property("pitch");
+ pos = scm_to_int(scm_call_1 (layout_proc, pitch));
+ }
+ else
+ pos = pit->steps ();
+ if (scm_is_number (c0))
+ pos += scm_to_int(c0);
+
note->set_property ("staff-position", scm_from_int (pos));
/*
Note_heads_engraver::stop_translation_timestep ()
{
notes_.clear ();
- dots_.clear ();
note_evs_.clear ();
}
-#include "translator.icc"
-
ADD_TRANSLATOR (Note_heads_engraver,
- /* doc */ "Generate noteheads.",
+ /* doc */
+ "Generate note heads.",
+
/* create */
- "NoteHead "
- "Dots",
- /* accept */
- "note-event "
- "busy-playing-event",
- /* read */ "middleCPosition",
- /* write */ "");
+ "NoteHead ",
+
+ /* read */
+ "middleCPosition "
+ "staffLineLayoutFunction ",
+
+ /* write */
+ ""
+ );